@gallop.software/studio 1.4.1 → 1.4.2

package/dist/{StudioUI-DBZLGGPL.js → StudioUI-MAOXE72P.js}

@@ -1741,15 +1741,13 @@ var styles5 = {
   `
 };
 function StudioToolbar() {
-  const { selectedItems, viewMode, setViewMode, clearSelection, currentPath, triggerRefresh, focusedItem, scanRequested, clearScanRequest, fileItems } = useStudio();
+  const { selectedItems, viewMode, setViewMode, clearSelection, currentPath, triggerRefresh, focusedItem, scanRequested, clearScanRequest, fileItems, requestProcess, actionState } = useStudio();
   const fileInputRef = _react.useRef.call(void 0, null);
   const abortControllerRef = _react.useRef.call(void 0, null);
   const [showAddNewModal, setShowAddNewModal] = _react.useState.call(void 0, false);
   const [uploading, setUploading] = _react.useState.call(void 0, false);
   const [scanning, setScanning] = _react.useState.call(void 0, false);
-  const [processing, setProcessing] = _react.useState.call(void 0, false);
   const [showDeleteConfirm, setShowDeleteConfirm] = _react.useState.call(void 0, false);
-  const [showProcessConfirm, setShowProcessConfirm] = _react.useState.call(void 0, false);
   const [showSyncConfirm, setShowSyncConfirm] = _react.useState.call(void 0, false);
   const [syncImageCount, setSyncImageCount] = _react.useState.call(void 0, 0);
   const [syncHasRemote, setSyncHasRemote] = _react.useState.call(void 0, false);
@@ -1762,9 +1760,6 @@ function StudioToolbar() {
     percent: 0,
     status: "processing"
   });
-  const [processCount, setProcessCount] = _react.useState.call(void 0, 0);
-  const [processMode, setProcessMode] = _react.useState.call(void 0, "all");
-  const [imagesToProcess, setImagesToProcess] = _react.useState.call(void 0, []);
   const [alertMessage, setAlertMessage] = _react.useState.call(void 0, null);
   const [showNewFolderModal, setShowNewFolderModal] = _react.useState.call(void 0, false);
   const [showRenameFolderModal, setShowRenameFolderModal] = _react.useState.call(void 0, false);
@@ -1999,234 +1994,29 @@ function StudioToolbar() {
         });
         return;
       }
-      setProcessCount(selectedImagePaths.length);
-      setImagesToProcess(selectedImagePaths);
-      setProcessMode("selected");
-      setShowProcessConfirm(true);
+      requestProcess(selectedImagePaths);
     } else {
       try {
         const response = await fetch("/api/studio/count-images");
         const data = await response.json();
-        if (data.count === 0) {
+        if (!data.images || data.images.length === 0) {
           setAlertMessage({
             title: "No Images Found",
             message: "No images found in the public folder to process."
           });
           return;
         }
-        setProcessCount(data.count);
-        setProcessMode("all");
-        setShowProcessConfirm(true);
+        const allImagePaths = data.images.map((img) => `public/${img}`);
+        requestProcess(allImagePaths);
       } catch (error) {
-        console.error("Failed to count images:", error);
+        console.error("Failed to get images:", error);
         setAlertMessage({
           title: "Error",
-          message: "Failed to count images."
+          message: "Failed to get images."
         });
       }
     }
-  }, [selectedItems]);
-  const handleProcessConfirm = _react.useCallback.call(void 0, async () => {
-    setShowProcessConfirm(false);
-    setProcessing(true);
-    abortControllerRef.current = new AbortController();
-    const signal = abortControllerRef.current.signal;
-    try {
-      if (processMode === "all") {
-        setProgressTitle("Processing Images");
-        setShowProgress(true);
-        setProgressState({
-          current: 0,
-          total: processCount,
-          percent: 0,
-          status: "processing"
-        });
-        const response = await fetch("/api/studio/process-all", {
-          method: "POST",
-          signal
-        });
-        if (!response.body) {
-          throw new Error("No response body");
-        }
-        const reader = response.body.getReader();
-        const decoder = new TextDecoder();
-        try {
-          while (true) {
-            const { done, value } = await reader.read();
-            if (done) break;
-            if (signal.aborted) {
-              reader.cancel();
-              break;
-            }
-            const text = decoder.decode(value);
-            const lines = text.split("\n\n").filter((line) => line.startsWith("data: "));
-            for (const line of lines) {
-              try {
-                const data = JSON.parse(line.replace("data: ", ""));
-                if (data.type === "start") {
-                  setProgressState((prev) => ({
-                    ...prev,
-                    total: data.total
-                  }));
-                } else if (data.type === "progress") {
-                  setProgressState({
-                    current: data.current,
-                    total: data.total,
-                    percent: data.percent,
-                    currentFile: data.currentFile,
-                    status: "processing"
-                  });
-                } else if (data.type === "cleanup") {
-                  setProgressState((prev) => ({
-                    ...prev,
-                    status: "cleanup",
-                    currentFile: void 0
-                  }));
-                } else if (data.type === "complete") {
-                  setProgressState({
-                    current: data.processed,
-                    total: data.processed,
-                    percent: 100,
-                    status: "complete",
-                    processed: data.processed,
-                    alreadyProcessed: data.alreadyProcessed,
-                    orphansRemoved: data.orphansRemoved,
-                    errors: data.errors
-                  });
-                  triggerRefresh();
-                } else if (data.type === "error") {
-                  setProgressState((prev) => ({
-                    ...prev,
-                    status: "error",
-                    message: data.message
-                  }));
-                }
-              } catch (e3) {
-              }
-            }
-          }
-        } catch (err) {
-          if (signal.aborted) {
-            setProgressState((prev) => ({
-              ...prev,
-              status: "stopped",
-              processed: prev.current
-            }));
-            triggerRefresh();
-          } else {
-            throw err;
-          }
-        }
-      } else {
-        setShowProgress(true);
-        setProgressState({
-          current: 0,
-          total: processCount,
-          percent: 0,
-          status: "processing"
-        });
-        const selectedImageKeys = imagesToProcess.map((p) => {
-          const key = p.replace(/^public\//, "");
-          return key.startsWith("/") ? key : `/${key}`;
-        });
-        const response = await fetch("/api/studio/reprocess-stream", {
-          method: "POST",
-          headers: { "Content-Type": "application/json" },
-          body: JSON.stringify({ imageKeys: selectedImageKeys }),
-          signal
-        });
-        if (!response.ok) {
-          const error = await response.json();
-          setProgressState({
-            current: 0,
-            total: 0,
-            percent: 0,
-            status: "error",
-            message: error.error || "Unknown error"
-          });
-        } else {
-          const reader = _optionalChain([response, 'access', _20 => _20.body, 'optionalAccess', _21 => _21.getReader, 'call', _22 => _22()]);
-          const decoder = new TextDecoder();
-          if (reader) {
-            let buffer = "";
-            while (true) {
-              const { done, value } = await reader.read();
-              if (done) break;
-              buffer += decoder.decode(value, { stream: true });
-              const lines = buffer.split("\n");
-              buffer = lines.pop() || "";
-              for (const line of lines) {
-                if (line.startsWith("data: ")) {
-                  try {
-                    const data = JSON.parse(line.slice(6));
-                    if (data.type === "start") {
-                      setProgressState((prev) => ({
-                        ...prev,
-                        total: data.total
-                      }));
-                    } else if (data.type === "progress") {
-                      setProgressState({
-                        current: data.current,
-                        total: data.total,
-                        percent: data.percent,
-                        status: "processing",
-                        message: data.message
-                      });
-                    } else if (data.type === "cleanup") {
-                      setProgressState((prev) => ({
-                        ...prev,
-                        status: "cleanup",
-                        message: data.message
-                      }));
-                    } else if (data.type === "complete") {
-                      setProgressState({
-                        current: data.processed,
-                        total: data.processed,
-                        percent: 100,
-                        status: data.errors > 0 ? "error" : "complete",
-                        processed: data.processed,
-                        message: data.message
-                      });
-                      clearSelection();
-                      triggerRefresh();
-                    } else if (data.type === "error") {
-                      setProgressState((prev) => ({
-                        ...prev,
-                        status: "error",
-                        message: data.message
-                      }));
-                    }
-                  } catch (e4) {
-                  }
-                }
-              }
-            }
-          }
-        }
-      }
-    } catch (error) {
-      if (signal.aborted) {
-        setProgressState((prev) => ({
-          ...prev,
-          status: "stopped",
-          processed: prev.current
-        }));
-        triggerRefresh();
-      } else {
-        console.error("Processing error:", error);
-        setProgressState({
-          current: 0,
-          total: 0,
-          percent: 0,
-          status: "error",
-          message: "Processing failed. Check console for details."
-        });
-      }
-    } finally {
-      setProcessing(false);
-      abortControllerRef.current = null;
-    }
-  }, [processMode, processCount, imagesToProcess, clearSelection, triggerRefresh]);
+  }, [selectedItems, requestProcess]);
   const handleStopProcessing = _react.useCallback.call(void 0, () => {
     if (abortControllerRef.current) {
       abortControllerRef.current.abort();
@@ -2299,7 +2089,7 @@ function StudioToolbar() {
     const selectedPaths2 = Array.from(selectedItems);
     const imageExtensions = ["jpg", "jpeg", "png", "gif", "webp", "svg", "ico", "bmp", "tiff", "tif"];
     const selectedImagePaths = selectedPaths2.filter((p) => {
-      const ext = _optionalChain([p, 'access', _23 => _23.split, 'call', _24 => _24("."), 'access', _25 => _25.pop, 'call', _26 => _26(), 'optionalAccess', _27 => _27.toLowerCase, 'call', _28 => _28()]) || "";
+      const ext = _optionalChain([p, 'access', _20 => _20.split, 'call', _21 => _21("."), 'access', _22 => _22.pop, 'call', _23 => _23(), 'optionalAccess', _24 => _24.toLowerCase, 'call', _25 => _25()]) || "";
       return imageExtensions.includes(ext);
     });
     const selectedFolders = selectedPaths2.filter((p) => !p.includes(".") || p.endsWith("/"));
@@ -2348,7 +2138,7 @@ function StudioToolbar() {
     const selectedPaths2 = Array.from(selectedItems);
     const imageExtensions = ["jpg", "jpeg", "png", "gif", "webp", "svg", "ico", "bmp", "tiff", "tif"];
     const selectedImagePaths = selectedPaths2.filter((p) => {
-      const ext = _optionalChain([p, 'access', _29 => _29.split, 'call', _30 => _30("."), 'access', _31 => _31.pop, 'call', _32 => _32(), 'optionalAccess', _33 => _33.toLowerCase, 'call', _34 => _34()]) || "";
+      const ext = _optionalChain([p, 'access', _26 => _26.split, 'call', _27 => _27("."), 'access', _28 => _28.pop, 'call', _29 => _29(), 'optionalAccess', _30 => _30.toLowerCase, 'call', _31 => _31()]) || "";
       return imageExtensions.includes(ext);
     });
     const selectedFolders = selectedPaths2.filter((p) => !p.includes(".") || p.endsWith("/"));
@@ -2399,16 +2189,16 @@ function StudioToolbar() {
           });
           const data = await response.json();
           if (!response.ok) {
-            if (_optionalChain([data, 'access', _35 => _35.error, 'optionalAccess', _36 => _36.includes, 'call', _37 => _37("R2 not configured")]) || _optionalChain([data, 'access', _38 => _38.error, 'optionalAccess', _39 => _39.includes, 'call', _40 => _40("CLOUDFLARE_R2")])) {
+            if (_optionalChain([data, 'access', _32 => _32.error, 'optionalAccess', _33 => _33.includes, 'call', _34 => _34("R2 not configured")]) || _optionalChain([data, 'access', _35 => _35.error, 'optionalAccess', _36 => _36.includes, 'call', _37 => _37("CLOUDFLARE_R2")])) {
               setShowProgress(false);
               setShowR2SetupModal(true);
               return;
             }
             errors++;
             errorMessages.push(data.error || `Failed: ${imageKey}`);
-          } else if (_optionalChain([data, 'access', _41 => _41.pushed, 'optionalAccess', _42 => _42.length]) > 0) {
+          } else if (_optionalChain([data, 'access', _38 => _38.pushed, 'optionalAccess', _39 => _39.length]) > 0) {
             pushed++;
-          } else if (_optionalChain([data, 'access', _43 => _43.errors, 'optionalAccess', _44 => _44.length]) > 0) {
+          } else if (_optionalChain([data, 'access', _40 => _40.errors, 'optionalAccess', _41 => _41.length]) > 0) {
             errors++;
             for (const errMsg of data.errors) {
               errorMessages.push(errMsg);
@@ -2530,7 +2320,7 @@ function StudioToolbar() {
                 errorMessage: data.message
               }));
             }
-          } catch (e5) {
+          } catch (e3) {
           }
         }
       }
@@ -2605,16 +2395,6 @@ function StudioToolbar() {
         onCancel: () => setShowSyncConfirm(false)
       }
     ),
-    showProcessConfirm && /* @__PURE__ */ _jsxruntime.jsx.call(void 0, 
-      ConfirmModal,
-      {
-        title: "Process Images",
-        message: processMode === "all" ? `Found ${processCount} image${processCount !== 1 ? "s" : ""} in the public folder. This will regenerate all thumbnails and remove any orphaned files from the images folder.` : `Process ${processCount} selected image${processCount !== 1 ? "s" : ""}? This will regenerate thumbnails for these files.`,
-        confirmLabel: processing ? "Processing..." : "Process",
-        onConfirm: handleProcessConfirm,
-        onCancel: () => setShowProcessConfirm(false)
-      }
-    ),
     showProgress && /* @__PURE__ */ _jsxruntime.jsx.call(void 0, 
       ProgressModal,
       {
@@ -2738,11 +2518,11 @@ function StudioToolbar() {
           {
             css: styles5.btn,
             onClick: handleProcessImages,
-            disabled: processing || isInImagesFolder,
+            disabled: actionState.showProgress || isInImagesFolder,
             title: isInImagesFolder ? "Cannot process images folder" : void 0,
             children: [
               /* @__PURE__ */ _jsxruntime.jsx.call(void 0, ImageStackIcon, {}),
-              processing ? "Processing..." : "Process Images"
+              "Process Images"
             ]
           }
         ),
@@ -5434,7 +5214,7 @@ function useStudioActions({
         });
         return;
       }
-      const reader = _optionalChain([response, 'access', _45 => _45.body, 'optionalAccess', _46 => _46.getReader, 'call', _47 => _47()]);
+      const reader = _optionalChain([response, 'access', _42 => _42.body, 'optionalAccess', _43 => _43.getReader, 'call', _44 => _44()]);
       const decoder = new TextDecoder();
       if (reader) {
         let buffer = "";
@@ -5464,7 +5244,7 @@ function useStudioActions({
                     status: "complete",
                     message: `Moved ${data.moved} file${data.moved !== 1 ? "s" : ""}${data.errors > 0 ? `, ${data.errors} error${data.errors !== 1 ? "s" : ""}` : ""}`
                   }));
-                  if (data.errors > 0 && _optionalChain([data, 'access', _48 => _48.errorMessages, 'optionalAccess', _49 => _49.length]) > 0) {
+                  if (data.errors > 0 && _optionalChain([data, 'access', _45 => _45.errorMessages, 'optionalAccess', _46 => _46.length]) > 0) {
                     showError("Move Failed", data.errorMessages.join("\n"));
                   }
                   clearSelection();
@@ -5477,7 +5257,7 @@ function useStudioActions({
                     message: data.message || "Unknown error"
                   }));
                 }
-              } catch (e6) {
+              } catch (e4) {
               }
             }
           }
@@ -5592,7 +5372,7 @@ function useStudioActions({
         });
         return;
       }
-      const reader = _optionalChain([response, 'access', _50 => _50.body, 'optionalAccess', _51 => _51.getReader, 'call', _52 => _52()]);
+      const reader = _optionalChain([response, 'access', _47 => _47.body, 'optionalAccess', _48 => _48.getReader, 'call', _49 => _49()]);
       const decoder = new TextDecoder();
       if (reader) {
         let buffer = "";
@@ -5641,7 +5421,7 @@ function useStudioActions({
                     message: data.message
                   }));
                 }
-              } catch (e7) {
+              } catch (e5) {
               }
             }
           }
@@ -5681,7 +5461,7 @@ function useStudioActions({
         setProgressState((prev) => ({
           ...prev,
           orphanedFiles: void 0,
-          message: _optionalChain([prev, 'access', _53 => _53.message, 'optionalAccess', _54 => _54.replace, 'call', _55 => _55(/Found \d+ orphaned thumbnail\(s\).*/, "Orphaned thumbnails deleted.")])
+          message: _optionalChain([prev, 'access', _50 => _50.message, 'optionalAccess', _51 => _51.replace, 'call', _52 => _52(/Found \d+ orphaned thumbnail\(s\).*/, "Orphaned thumbnails deleted.")])
         }));
         triggerRefresh();
       } else {
@@ -6324,4 +6104,4 @@ var StudioUI_default = StudioUI;
 
 
 exports.StudioUI = StudioUI; exports.default = StudioUI_default;
-//# sourceMappingURL=StudioUI-DBZLGGPL.js.map
+//# sourceMappingURL=StudioUI-MAOXE72P.js.map