npm - @gallop.software/studio - Versions diffs - 2.3.48 → 2.3.50 - Mend

@gallop.software/studio 2.3.48 → 2.3.50

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (5) hide show

package/dist/client/assets/index-T4g2jTSf.js +85 -0
package/dist/client/index.html +1 -1
package/dist/server/index.js +42 -116
package/dist/server/index.js.map +1 -1
package/package.json +1 -1

package/dist/client/index.html CHANGED Viewed

@@ -11,7 +11,7 @@
         font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, 'Helvetica Neue', Arial, sans-serif;
       }
     </style>
-    <script type="module" crossorigin src="/assets/index-Cxfnf-5i.js"></script>
+    <script type="module" crossorigin src="/assets/index-T4g2jTSf.js"></script>
   </head>
   <body>
     <div id="root"></div>

package/dist/server/index.js CHANGED Viewed

@@ -1361,34 +1361,7 @@ async function handleRename(request) {
     } catch {
     }
     if (isInOurR2 && !hasLocalFile && isImage) {
-      const buffer = await downloadFromCdn(oldKey);
-      await fs6.mkdir(path6.dirname(absoluteNewPath), { recursive: true });
-      await fs6.writeFile(absoluteNewPath, buffer);
-      if (hasThumbnails) {
-        const newThumbPaths = getAllThumbnailPaths(newKey);
-        const oldThumbPaths = getAllThumbnailPaths(oldKey);
-        for (let i = 0; i < oldThumbPaths.length; i++) {
-          try {
-            const thumbBuffer = await downloadFromCdn(oldThumbPaths[i]);
-            const newThumbLocalPath = getPublicPath(newThumbPaths[i]);
-            await fs6.mkdir(path6.dirname(newThumbLocalPath), { recursive: true });
-            await fs6.writeFile(newThumbLocalPath, thumbBuffer);
-          } catch {
-          }
-        }
-      }
-      await deleteFromCdn(oldKey, hasThumbnails);
-      await uploadOriginalToCdn(newKey);
-      if (hasThumbnails) {
-        await uploadToCdn(newKey);
-      }
-      try {
-        await fs6.unlink(absoluteNewPath);
-      } catch {
-      }
-      if (hasThumbnails) {
-        await deleteLocalThumbnails(newKey);
-      }
+      await moveInCdn(oldKey, newKey, hasThumbnails);
       delete meta[oldKey];
       meta[newKey] = entry;
       await saveMeta(meta);
@@ -1411,13 +1384,7 @@ async function handleRename(request) {
         }
       }
       if (isInOurR2) {
-        const buffer = await fs6.readFile(absoluteNewPath);
-        await fs6.mkdir(path6.dirname(absoluteNewPath), { recursive: true });
-        await deleteFromCdn(oldKey, hasThumbnails);
-        await uploadOriginalToCdn(newKey);
-        if (hasThumbnails) {
-          await uploadToCdn(newKey);
-        }
+        await moveInCdn(oldKey, newKey, hasThumbnails);
         try {
           await fs6.unlink(absoluteNewPath);
         } catch {
@@ -1558,19 +1525,9 @@ async function handleRenameStream(request) {
             const isInOurR22 = isInCloud2 && fileCdnUrl2 === publicUrl;
             const hasThumbnails2 = isProcessed(entry2);
             if (isInOurR22) {
-              const localFilePath = getPublicPath(newKey2);
-              let hasLocalFile = false;
               try {
-                await fs6.access(localFilePath);
-                hasLocalFile = true;
-              } catch {
-              }
-              if (hasLocalFile) {
-                await deleteFromCdn(oldKey2, hasThumbnails2);
-                await uploadOriginalToCdn(newKey2);
-                if (hasThumbnails2) {
-                  await uploadToCdn(newKey2);
-                }
+                await moveInCdn(oldKey2, newKey2, hasThumbnails2);
+                const localFilePath = getPublicPath(newKey2);
                 try {
                   await fs6.unlink(localFilePath);
                 } catch {
@@ -1578,39 +1535,8 @@ async function handleRenameStream(request) {
                 if (hasThumbnails2) {
                   await deleteLocalThumbnails(newKey2);
                 }
-              } else {
-                try {
-                  const buffer = await downloadFromCdn(oldKey2);
-                  await fs6.mkdir(path6.dirname(localFilePath), { recursive: true });
-                  await fs6.writeFile(localFilePath, buffer);
-                  if (hasThumbnails2) {
-                    const oldThumbPaths = getAllThumbnailPaths(oldKey2);
-                    const newThumbPaths = getAllThumbnailPaths(newKey2);
-                    for (let i = 0; i < oldThumbPaths.length; i++) {
-                      try {
-                        const thumbBuffer = await downloadFromCdn(oldThumbPaths[i]);
-                        const newThumbLocalPath = getPublicPath(newThumbPaths[i]);
-                        await fs6.mkdir(path6.dirname(newThumbLocalPath), { recursive: true });
-                        await fs6.writeFile(newThumbLocalPath, thumbBuffer);
-                      } catch {
-                      }
-                    }
-                  }
-                  await deleteFromCdn(oldKey2, hasThumbnails2);
-                  await uploadOriginalToCdn(newKey2);
-                  if (hasThumbnails2) {
-                    await uploadToCdn(newKey2);
-                  }
-                  try {
-                    await fs6.unlink(localFilePath);
-                  } catch {
-                  }
-                  if (hasThumbnails2) {
-                    await deleteLocalThumbnails(newKey2);
-                  }
-                } catch (err) {
-                  console.error(`Failed to re-upload ${oldKey2}:`, err);
-                }
+              } catch (err) {
+                console.error(`Failed to rename in CDN ${oldKey2}:`, err);
               }
             }
             delete meta[oldKey2];
@@ -1641,34 +1567,7 @@ async function handleRenameStream(request) {
         const hasThumbnails = entry ? isProcessed(entry) : false;
         sendEvent({ type: "start", total: 1, message: "Renaming file..." });
         if (isInOurR2 && !hasLocalItem && isImagePath) {
-          const buffer = await downloadFromCdn(oldKey);
-          await fs6.mkdir(path6.dirname(absoluteNewPath), { recursive: true });
-          await fs6.writeFile(absoluteNewPath, buffer);
-          if (hasThumbnails) {
-            const newThumbPaths = getAllThumbnailPaths(newKey);
-            const oldThumbPaths = getAllThumbnailPaths(oldKey);
-            for (let i = 0; i < oldThumbPaths.length; i++) {
-              try {
-                const thumbBuffer = await downloadFromCdn(oldThumbPaths[i]);
-                const newThumbLocalPath = getPublicPath(newThumbPaths[i]);
-                await fs6.mkdir(path6.dirname(newThumbLocalPath), { recursive: true });
-                await fs6.writeFile(newThumbLocalPath, thumbBuffer);
-              } catch {
-              }
-            }
-          }
-          await deleteFromCdn(oldKey, hasThumbnails);
-          await uploadOriginalToCdn(newKey);
-          if (hasThumbnails) {
-            await uploadToCdn(newKey);
-          }
-          try {
-            await fs6.unlink(absoluteNewPath);
-          } catch {
-          }
-          if (hasThumbnails) {
-            await deleteLocalThumbnails(newKey);
-          }
+          await moveInCdn(oldKey, newKey, hasThumbnails);
           delete meta[oldKey];
           if (entry) meta[newKey] = entry;
           await saveMeta(meta);
@@ -1692,11 +1591,7 @@ async function handleRenameStream(request) {
             }
           }
           if (isInOurR2) {
-            await deleteFromCdn(oldKey, hasThumbnails);
-            await uploadOriginalToCdn(newKey);
-            if (hasThumbnails) {
-              await uploadToCdn(newKey);
-            }
+            await moveInCdn(oldKey, newKey, hasThumbnails);
             try {
               await fs6.unlink(absoluteNewPath);
             } catch {
@@ -3087,6 +2982,7 @@ async function handleScanStream() {
         } catch {
         }
         sendEvent({ type: "cleanup", message: "Cleaning up empty folders..." });
+        let emptyFoldersDeleted = 0;
         async function cleanEmptyFolders(dir) {
           try {
             const entries = await fs8.readdir(dir, { withFileTypes: true });
@@ -3096,14 +2992,43 @@ async function handleScanStream() {
               const fullPath = path8.join(dir, entry.name);
               if (fullPath === imagesDir) continue;
               await cleanEmptyFolders(fullPath);
-              await deleteEmptyFolders(fullPath);
+              try {
+                const subEntries = await fs8.readdir(fullPath);
+                const meaningfulEntries = subEntries.filter((e) => !e.startsWith("."));
+                if (meaningfulEntries.length === 0) {
+                  await fs8.rm(fullPath, { recursive: true });
+                  emptyFoldersDeleted++;
+                }
+              } catch {
+              }
             }
           } catch {
           }
         }
         await cleanEmptyFolders(getPublicPath());
+        async function cleanImagesEmptyFolders(dir) {
+          try {
+            const entries = await fs8.readdir(dir, { withFileTypes: true });
+            let isEmpty = true;
+            for (const entry of entries) {
+              if (entry.isDirectory()) {
+                const subDirEmpty = await cleanImagesEmptyFolders(path8.join(dir, entry.name));
+                if (!subDirEmpty) isEmpty = false;
+              } else if (!entry.name.startsWith(".")) {
+                isEmpty = false;
+              }
+            }
+            if (isEmpty && dir !== imagesDir) {
+              await fs8.rm(dir, { recursive: true });
+              emptyFoldersDeleted++;
+            }
+            return isEmpty;
+          } catch {
+            return true;
+          }
+        }
         try {
-          await cleanupEmptyFoldersRecursive(imagesDir);
+          await cleanImagesEmptyFolders(imagesDir);
         } catch {
         }
         sendEvent({ type: "cleanup", message: "Checking for orphaned entries..." });
@@ -3146,7 +3071,8 @@ async function handleScanStream() {
           renamedFiles: renamed,
           orphanedFiles: orphanedFiles.length > 0 ? orphanedFiles : void 0,
           pendingUpdates: pendingUpdates.length,
-          orphanedEntries: orphanedEntries.length
+          orphanedEntries: orphanedEntries.length,
+          emptyFoldersDeleted: emptyFoldersDeleted > 0 ? emptyFoldersDeleted : void 0
         });
       } catch (error) {
         console.error("Scan failed:", error);