@gallop.software/studio 1.5.5 → 1.5.7

package/dist/{StudioUI-RRWDEHCI.js → StudioUI-O53YFD6Q.js}

@@ -1752,6 +1752,8 @@ function StudioToolbar() {
   const [syncImageCount, setSyncImageCount] = _react.useState.call(void 0, 0);
   const [syncHasRemote, setSyncHasRemote] = _react.useState.call(void 0, false);
   const [syncHasLocal, setSyncHasLocal] = _react.useState.call(void 0, false);
+  const [showDownloadConfirm, setShowDownloadConfirm] = _react.useState.call(void 0, false);
+  const [downloadImageCount, setDownloadImageCount] = _react.useState.call(void 0, 0);
   const [showProgress, setShowProgress] = _react.useState.call(void 0, false);
   const [progressTitle, setProgressTitle] = _react.useState.call(void 0, "Processing Images");
   const [progressState, setProgressState] = _react.useState.call(void 0, {
@@ -2181,32 +2183,43 @@ function StudioToolbar() {
           status: "processing",
           currentFile: imageKey.replace(/^\//, "")
         });
-        try {
-          const response = await fetch("/api/studio/sync", {
-            method: "POST",
-            headers: { "Content-Type": "application/json" },
-            body: JSON.stringify({ imageKeys: [imageKey] })
-          });
-          const data = await response.json();
-          if (!response.ok) {
-            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;
+        let success = false;
+        let lastError;
+        for (let attempt = 0; attempt < 3 && !success; attempt++) {
+          try {
+            const response = await fetch("/api/studio/sync", {
+              method: "POST",
+              headers: { "Content-Type": "application/json" },
+              body: JSON.stringify({ imageKeys: [imageKey] })
+            });
+            const data = await response.json();
+            if (!response.ok) {
+              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;
+              }
+              lastError = data.error || `Failed: ${imageKey}`;
+            } else if (_optionalChain([data, 'access', _38 => _38.pushed, 'optionalAccess', _39 => _39.length]) > 0) {
+              pushed++;
+              success = true;
+            } else if (_optionalChain([data, 'access', _40 => _40.errors, 'optionalAccess', _41 => _41.length]) > 0) {
+              for (const errMsg of data.errors) {
+                lastError = errMsg;
+              }
+            } else {
+              success = true;
             }
-            errors++;
-            errorMessages.push(data.error || `Failed: ${imageKey}`);
-          } else if (_optionalChain([data, 'access', _38 => _38.pushed, 'optionalAccess', _39 => _39.length]) > 0) {
-            pushed++;
-          } else if (_optionalChain([data, 'access', _40 => _40.errors, 'optionalAccess', _41 => _41.length]) > 0) {
-            errors++;
-            for (const errMsg of data.errors) {
-              errorMessages.push(errMsg);
+          } catch (err) {
+            lastError = `Network error: ${imageKey}`;
+            if (attempt < 2) {
+              await new Promise((resolve) => setTimeout(resolve, 500 * (attempt + 1)));
             }
           }
-        } catch (err) {
+        }
+        if (!success && lastError) {
           errors++;
-          errorMessages.push(`Network error: ${imageKey}`);
+          errorMessages.push(lastError);
         }
       }
       setProgressState({
@@ -2231,6 +2244,106 @@ function StudioToolbar() {
       });
     }
   }, [selectedItems, clearSelection, triggerRefresh]);
+  const handleDownloadClick = _react.useCallback.call(void 0, async () => {
+    if (selectedItems.size === 0) return;
+    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', _42 => _42.split, 'call', _43 => _43("."), 'access', _44 => _44.pop, 'call', _45 => _45(), 'optionalAccess', _46 => _46.toLowerCase, 'call', _47 => _47()]) || "";
+      return imageExtensions.includes(ext);
+    });
+    if (selectedImagePaths.length === 0) {
+      setAlertMessage({
+        title: "No Images Found",
+        message: "No images found in the selected items."
+      });
+      return;
+    }
+    setDownloadImageCount(selectedImagePaths.length);
+    setShowDownloadConfirm(true);
+  }, [selectedItems]);
+  const handleDownloadConfirm = _react.useCallback.call(void 0, async () => {
+    setShowDownloadConfirm(false);
+    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', _48 => _48.split, 'call', _49 => _49("."), 'access', _50 => _50.pop, 'call', _51 => _51(), 'optionalAccess', _52 => _52.toLowerCase, 'call', _53 => _53()]) || "";
+      return imageExtensions.includes(ext);
+    });
+    const imageKeys = selectedImagePaths.map((p) => "/" + p.replace(/^public\//, ""));
+    setProgressTitle("Downloading from CDN");
+    setShowProgress(true);
+    setProgressState({
+      current: 0,
+      total: imageKeys.length,
+      percent: 0,
+      status: "processing"
+    });
+    try {
+      const response = await fetch("/api/studio/download-stream", {
+        method: "POST",
+        headers: { "Content-Type": "application/json" },
+        body: JSON.stringify({ imageKeys })
+      });
+      if (!response.ok || !response.body) {
+        throw new Error("Download request failed");
+      }
+      const reader = response.body.getReader();
+      const decoder = new TextDecoder();
+      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 === "progress") {
+                setProgressState({
+                  current: data.current,
+                  total: data.total,
+                  percent: Math.round(data.current / data.total * 100),
+                  status: "processing",
+                  message: data.message
+                });
+              } else if (data.type === "complete") {
+                setProgressState({
+                  current: data.total || imageKeys.length,
+                  total: data.total || imageKeys.length,
+                  percent: 100,
+                  status: "complete",
+                  message: data.message
+                });
+              } else if (data.type === "error") {
+                setProgressState({
+                  current: 0,
+                  total: 0,
+                  percent: 0,
+                  status: "error",
+                  message: data.message
+                });
+              }
+            } catch (e3) {
+            }
+          }
+        }
+      }
+      clearSelection();
+      triggerRefresh();
+    } catch (error) {
+      console.error("Download error:", error);
+      setProgressState({
+        current: 0,
+        total: 0,
+        percent: 0,
+        status: "error",
+        message: "Failed to download from CDN."
+      });
+    }
+  }, [selectedItems, clearSelection, triggerRefresh]);
   const handleCreateFolder = _react.useCallback.call(void 0, async (folderName) => {
     setShowNewFolderModal(false);
     try {
@@ -2320,7 +2433,7 @@ function StudioToolbar() {
                 errorMessage: data.message
               }));
             }
-          } catch (e3) {
+          } catch (e4) {
           }
         }
       }
@@ -2349,6 +2462,10 @@ function StudioToolbar() {
     const item = fileItems.find((f) => f.path === path);
     return item && item.cdnPushed && !item.isRemote;
   });
+  const allR2Selection = hasSelection && Array.from(selectedItems).every((path) => {
+    const item = fileItems.find((f) => f.path === path);
+    return item && item.type === "file" && item.cdnPushed && !item.isRemote;
+  });
   const selectedPaths = Array.from(selectedItems);
   const singleFolderSelected = selectedPaths.length === 1 && !selectedPaths[0].includes(".");
   const selectedFolderPath = singleFolderSelected ? selectedPaths[0] : null;
@@ -2395,6 +2512,16 @@ function StudioToolbar() {
         onCancel: () => setShowSyncConfirm(false)
       }
     ),
+    showDownloadConfirm && /* @__PURE__ */ _jsxruntime.jsx.call(void 0, 
+      ConfirmModal,
+      {
+        title: "Download from CDN",
+        message: `Download ${downloadImageCount} image${downloadImageCount !== 1 ? "s" : ""} from Cloudflare R2 to local storage? Images will be removed from the CDN.`,
+        confirmLabel: "Download",
+        onConfirm: handleDownloadConfirm,
+        onCancel: () => setShowDownloadConfirm(false)
+      }
+    ),
     showProgress && /* @__PURE__ */ _jsxruntime.jsx.call(void 0, 
       ProgressModal,
       {
@@ -2550,7 +2677,18 @@ function StudioToolbar() {
             ]
           }
         ),
-        /* @__PURE__ */ _jsxruntime.jsxs.call(void 0, 
+        allR2Selection ? /* @__PURE__ */ _jsxruntime.jsxs.call(void 0, 
+          "button",
+          {
+            css: styles5.btn,
+            onClick: handleDownloadClick,
+            disabled: !hasSelection,
+            children: [
+              /* @__PURE__ */ _jsxruntime.jsx.call(void 0, CloudDownloadIcon, {}),
+              "Download"
+            ]
+          }
+        ) : /* @__PURE__ */ _jsxruntime.jsxs.call(void 0, 
           "button",
           {
             css: styles5.btn,
@@ -2649,6 +2787,9 @@ function MoveIcon() {
 function CloudIcon() {
   return /* @__PURE__ */ _jsxruntime.jsx.call(void 0, "svg", { css: styles5.icon, fill: "none", stroke: "currentColor", viewBox: "0 0 24 24", children: /* @__PURE__ */ _jsxruntime.jsx.call(void 0, "path", { strokeLinecap: "round", strokeLinejoin: "round", strokeWidth: 2, d: "M7 16a4 4 0 01-.88-7.903A5 5 0 1115.9 6L16 6a5 5 0 011 9.9M15 13l-3-3m0 0l-3 3m3-3v12" }) });
 }
+function CloudDownloadIcon() {
+  return /* @__PURE__ */ _jsxruntime.jsx.call(void 0, "svg", { css: styles5.icon, fill: "none", stroke: "currentColor", viewBox: "0 0 24 24", children: /* @__PURE__ */ _jsxruntime.jsx.call(void 0, "path", { strokeLinecap: "round", strokeLinejoin: "round", strokeWidth: 2, d: "M7 16a4 4 0 01-.88-7.903A5 5 0 1115.9 6L16 6a5 5 0 011 9.9M9 19l3 3m0 0l3-3m-3 3V10" }) });
+}
 function GridIcon() {
   return /* @__PURE__ */ _jsxruntime.jsx.call(void 0, "svg", { css: styles5.icon, fill: "none", stroke: "currentColor", viewBox: "0 0 24 24", children: /* @__PURE__ */ _jsxruntime.jsx.call(void 0, "path", { strokeLinecap: "round", strokeLinejoin: "round", strokeWidth: 2, d: "M4 6a2 2 0 012-2h2a2 2 0 012 2v2a2 2 0 01-2 2H6a2 2 0 01-2-2V6zM14 6a2 2 0 012-2h2a2 2 0 012 2v2a2 2 0 01-2 2h-2a2 2 0 01-2-2V6zM4 16a2 2 0 012-2h2a2 2 0 012 2v2a2 2 0 01-2 2H6a2 2 0 01-2-2v-2zM14 16a2 2 0 012-2h2a2 2 0 012 2v2a2 2 0 01-2 2h-2a2 2 0 01-2-2v-2z" }) });
 }
@@ -4498,7 +4639,7 @@ function StudioDetailView() {
         });
         return;
       }
-      const reader = _optionalChain([response, 'access', _42 => _42.body, 'optionalAccess', _43 => _43.getReader, 'call', _44 => _44()]);
+      const reader = _optionalChain([response, 'access', _54 => _54.body, 'optionalAccess', _55 => _55.getReader, 'call', _56 => _56()]);
       const decoder = new TextDecoder();
       if (reader) {
         let buffer = "";
@@ -4540,7 +4681,7 @@ function StudioDetailView() {
                     message: data.message
                   }));
                 }
-              } catch (e4) {
+              } catch (e5) {
               }
             }
           }
@@ -5462,7 +5603,7 @@ function useStudioActions({
         });
         return;
       }
-      const reader = _optionalChain([response, 'access', _45 => _45.body, 'optionalAccess', _46 => _46.getReader, 'call', _47 => _47()]);
+      const reader = _optionalChain([response, 'access', _57 => _57.body, 'optionalAccess', _58 => _58.getReader, 'call', _59 => _59()]);
       const decoder = new TextDecoder();
       if (reader) {
         let buffer = "";
@@ -5492,7 +5633,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', _60 => _60.errorMessages, 'optionalAccess', _61 => _61.length]) > 0) {
                     showError("Move Failed", data.errorMessages.join("\n"));
                   }
                   clearSelection();
@@ -5505,7 +5646,7 @@ function useStudioActions({
                     message: data.message || "Unknown error"
                   }));
                 }
-              } catch (e5) {
+              } catch (e6) {
               }
             }
           }
@@ -5620,7 +5761,7 @@ function useStudioActions({
         });
         return;
       }
-      const reader = _optionalChain([response, 'access', _50 => _50.body, 'optionalAccess', _51 => _51.getReader, 'call', _52 => _52()]);
+      const reader = _optionalChain([response, 'access', _62 => _62.body, 'optionalAccess', _63 => _63.getReader, 'call', _64 => _64()]);
       const decoder = new TextDecoder();
       if (reader) {
         let buffer = "";
@@ -5669,7 +5810,7 @@ function useStudioActions({
                     message: data.message
                   }));
                 }
-              } catch (e6) {
+              } catch (e7) {
               }
             }
           }
@@ -5709,7 +5850,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', _65 => _65.message, 'optionalAccess', _66 => _66.replace, 'call', _67 => _67(/Found \d+ orphaned thumbnail\(s\).*/, "Orphaned thumbnails deleted.")])
         }));
         triggerRefresh();
       } else {
@@ -6352,4 +6493,4 @@ var StudioUI_default = StudioUI;
 
 
 exports.StudioUI = StudioUI; exports.default = StudioUI_default;
-//# sourceMappingURL=StudioUI-RRWDEHCI.js.map
+//# sourceMappingURL=StudioUI-O53YFD6Q.js.map