@gallop.software/studio 2.3.16 → 2.3.18

package/dist/server/index.js

@@ -1119,6 +1119,7 @@ async function handleDelete(request) {
         sourceFolders.add(path6.dirname(absolutePath));
         const entry = meta[imageKey];
         const isPushedToCloud = entry?.c !== void 0;
+        const hasThumbnails = entry ? isProcessed(entry) : false;
         try {
           const stats = await fs6.stat(absolutePath);
           if (stats.isDirectory()) {
@@ -1127,7 +1128,13 @@ async function handleDelete(request) {
             for (const key of Object.keys(meta)) {
               if (key.startsWith(prefix) || key === imageKey) {
                 const keyEntry = meta[key];
-                if (keyEntry && keyEntry.c === void 0) {
+                const keyHasThumbnails = keyEntry ? isProcessed(keyEntry) : false;
+                if (keyEntry?.c !== void 0) {
+                  try {
+                    await deleteFromCdn(key, keyHasThumbnails);
+                  } catch {
+                  }
+                } else {
                   for (const thumbPath of getAllThumbnailPaths(key)) {
                     const absoluteThumbPath = getPublicPath(thumbPath);
                     try {
@@ -1143,7 +1150,12 @@ async function handleDelete(request) {
             await fs6.unlink(absolutePath);
             const isInImagesFolder = itemPath.startsWith("public/images/");
             if (!isInImagesFolder && entry) {
-              if (!isPushedToCloud) {
+              if (isPushedToCloud) {
+                try {
+                  await deleteFromCdn(imageKey, hasThumbnails);
+                } catch {
+                }
+              } else {
                 for (const thumbPath of getAllThumbnailPaths(imageKey)) {
                   const absoluteThumbPath = getPublicPath(thumbPath);
                   try {
@@ -1157,12 +1169,26 @@ async function handleDelete(request) {
           }
         } catch {
           if (entry) {
+            if (isPushedToCloud) {
+              try {
+                await deleteFromCdn(imageKey, hasThumbnails);
+              } catch {
+              }
+            }
             delete meta[imageKey];
           } else {
             const prefix = imageKey + "/";
             let foundAny = false;
             for (const key of Object.keys(meta)) {
               if (key.startsWith(prefix)) {
+                const keyEntry = meta[key];
+                const keyHasThumbnails = keyEntry ? isProcessed(keyEntry) : false;
+                if (keyEntry?.c !== void 0) {
+                  try {
+                    await deleteFromCdn(key, keyHasThumbnails);
+                  } catch {
+                  }
+                }
                 delete meta[key];
                 foundAny = true;
               }
@@ -1840,13 +1866,17 @@ async function handleDownloadStream(request) {
   if (!imageKeys || !Array.isArray(imageKeys) || imageKeys.length === 0) {
     return jsonResponse({ error: "No image keys provided" }, { status: 400 });
   }
+  const abortSignal = request.signal;
   const stream = new ReadableStream({
     async start(controller) {
       const encoder = new TextEncoder();
       const sendEvent = (data) => {
-        controller.enqueue(encoder.encode(`data: ${JSON.stringify(data)}
+        try {
+          controller.enqueue(encoder.encode(`data: ${JSON.stringify(data)}
 
 `));
+        } catch {
+        }
       };
       sendEvent({ type: "start", total: imageKeys.length });
       const downloaded = [];
@@ -1855,6 +1885,16 @@ async function handleDownloadStream(request) {
       try {
         const meta = await loadMeta();
         for (let i = 0; i < imageKeys.length; i++) {
+          if (abortSignal?.aborted) {
+            await saveMeta(meta);
+            sendEvent({
+              type: "stopped",
+              downloaded: downloaded.length,
+              message: `Stopped. ${downloaded.length} image${downloaded.length !== 1 ? "s" : ""} downloaded.`
+            });
+            controller.close();
+            return;
+          }
           const imageKey = imageKeys[i];
           const entry = getMetaEntry(meta, imageKey);
           if (!entry || entry.c === void 0) {
@@ -1869,6 +1909,16 @@ async function handleDownloadStream(request) {
           }
           try {
             const imageBuffer = await downloadFromCdn(imageKey);
+            if (abortSignal?.aborted) {
+              await saveMeta(meta);
+              sendEvent({
+                type: "stopped",
+                downloaded: downloaded.length,
+                message: `Stopped. ${downloaded.length} image${downloaded.length !== 1 ? "s" : ""} downloaded.`
+              });
+              controller.close();
+              return;
+            }
             const localPath = getPublicPath(imageKey.replace(/^\//, ""));
             await fs7.mkdir(path7.dirname(localPath), { recursive: true });
             await fs7.writeFile(localPath, imageBuffer);