thumbnailer: use single process + load original

1 files changed, 25 insertions, 29 deletions

diff --git a/services/Thumbnailer.qml b/services/Thumbnailer.qml
index 3b22ada..3d7a6c1 100644
--- a/services/Thumbnailer.qml
+++ b/services/Thumbnailer.qml
@@ -11,11 +11,12 @@ Singleton {
 
     readonly property string thumbDir: `${StandardPaths.standardLocations(StandardPaths.GenericCacheLocation)[0]}/caelestia/thumbnails`.slice(7)
 
-    function go(path: string, width: int, height: int): var {
-        return thumbComp.createObject(root, {
-            originalPath: path,
-            width: width,
-            height: height
+    function go(obj: var): var {
+        return thumbComp.createObject(obj, {
+            originalPath: obj.path,
+            width: obj.width,
+            height: obj.height,
+            loadOriginal: obj.loadOriginal
         });
     }
 
@@ -25,46 +26,41 @@ Singleton {
         required property string originalPath
         required property int width
         required property int height
+        required property bool loadOriginal
 
         property string path
 
-        readonly property Process shaProc: Process {
+        readonly property Process proc: Process {
             running: true
-            command: ["sha1sum", obj.originalPath]
-            stdout: SplitParser {
-                onRead: data => {
-                    const sha = data.split(" ")[0];
-                    obj.path = `${root.thumbDir}/${sha}@${obj.width}x${obj.height}-exact.png`;
-                    obj.thumbProc.signal(9);
-                    obj.thumbProc.running = true;
-                }
-            }
-        }
-
-        readonly property Process thumbProc: Process {
             command: ["fish", "-c", `
-if test -f ${obj.path}
-    exit 1
+set -l path "${root.thumbDir}/$(sha1sum ${obj.originalPath} | cut -d ' ' -f 1)@${obj.width}x${obj.height}-exact.png"
+if test -f $path
+    echo $path
 else
+    echo 'start'
     set -l size (identify -ping -format '%w\n%h' ${obj.originalPath})
     if test $size[1] -gt ${obj.width} -o $size[2] -gt ${obj.height}
-        magick ${obj.originalPath} -${obj.width > 1024 || obj.height > 1024 ? "resize" : "thumbnail"} ${obj.width}x${obj.height}^ -background none -gravity center -extent ${obj.width}x${obj.height} -unsharp 0x.5 ${obj.path}
+        magick ${obj.originalPath} -${obj.width > 1024 || obj.height > 1024 ? "resize" : "thumbnail"} ${obj.width}x${obj.height}^ -background none -gravity center -extent ${obj.width}x${obj.height} -unsharp 0x.5 $path
     else
-        cp ${obj.originalPath} ${obj.path}
+        cp ${obj.originalPath} $path
     end
+    echo $path
 end`]
-            onExited: code => {
-                if (code === 0) {
-                    const path = obj.path;
-                    obj.path = "";
-                    obj.path = path;
+            stdout: SplitParser {
+                onRead: data => {
+                    if (data === "start") {
+                        if (obj.loadOriginal)
+                            obj.path = obj.originalPath;
+                    } else {
+                        obj.path = data;
+                    }
                 }
             }
         }
 
         function reload(): void {
-            shaProc.signal(9);
-            shaProc.running = true;
+            proc.signal(9);
+            proc.running = true;
         }
     }