@gallop.software/studio 1.5.5 → 1.5.7

package/dist/{StudioUI-VIYONKHA.mjs → StudioUI-6Q7GX6IY.mjs}

@@ -1752,6 +1752,8 @@ function StudioToolbar() {
   const [syncImageCount, setSyncImageCount] = useState4(0);
   const [syncHasRemote, setSyncHasRemote] = useState4(false);
   const [syncHasLocal, setSyncHasLocal] = useState4(false);
+  const [showDownloadConfirm, setShowDownloadConfirm] = useState4(false);
+  const [downloadImageCount, setDownloadImageCount] = useState4(0);
   const [showProgress, setShowProgress] = useState4(false);
   const [progressTitle, setProgressTitle] = useState4("Processing Images");
   const [progressState, setProgressState] = useState4({
@@ -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 (data.error?.includes("R2 not configured") || data.error?.includes("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 (data.error?.includes("R2 not configured") || data.error?.includes("CLOUDFLARE_R2")) {
+                setShowProgress(false);
+                setShowR2SetupModal(true);
+                return;
+              }
+              lastError = data.error || `Failed: ${imageKey}`;
+            } else if (data.pushed?.length > 0) {
+              pushed++;
+              success = true;
+            } else if (data.errors?.length > 0) {
+              for (const errMsg of data.errors) {
+                lastError = errMsg;
+              }
+            } else {
+              success = true;
             }
-            errors++;
-            errorMessages.push(data.error || `Failed: ${imageKey}`);
-          } else if (data.pushed?.length > 0) {
-            pushed++;
-          } else if (data.errors?.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 = useCallback2(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 = p.split(".").pop()?.toLowerCase() || "";
+      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 = useCallback2(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 = p.split(".").pop()?.toLowerCase() || "";
+      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 {
+            }
+          }
+        }
+      }
+      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 = useCallback2(async (folderName) => {
     setShowNewFolderModal(false);
     try {
@@ -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__ */ jsx5(
+      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__ */ jsx5(
       ProgressModal,
       {
@@ -2550,7 +2677,18 @@ function StudioToolbar() {
             ]
           }
         ),
-        /* @__PURE__ */ jsxs5(
+        allR2Selection ? /* @__PURE__ */ jsxs5(
+          "button",
+          {
+            css: styles5.btn,
+            onClick: handleDownloadClick,
+            disabled: !hasSelection,
+            children: [
+              /* @__PURE__ */ jsx5(CloudDownloadIcon, {}),
+              "Download"
+            ]
+          }
+        ) : /* @__PURE__ */ jsxs5(
           "button",
           {
             css: styles5.btn,
@@ -2649,6 +2787,9 @@ function MoveIcon() {
 function CloudIcon() {
   return /* @__PURE__ */ jsx5("svg", { css: styles5.icon, fill: "none", stroke: "currentColor", viewBox: "0 0 24 24", children: /* @__PURE__ */ jsx5("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__ */ jsx5("svg", { css: styles5.icon, fill: "none", stroke: "currentColor", viewBox: "0 0 24 24", children: /* @__PURE__ */ jsx5("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__ */ jsx5("svg", { css: styles5.icon, fill: "none", stroke: "currentColor", viewBox: "0 0 24 24", children: /* @__PURE__ */ jsx5("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" }) });
 }
@@ -6352,4 +6493,4 @@ export {
   StudioUI,
   StudioUI_default as default
 };
-//# sourceMappingURL=StudioUI-VIYONKHA.mjs.map
+//# sourceMappingURL=StudioUI-6Q7GX6IY.mjs.map