@gallop.software/studio 2.3.38 → 2.3.40

package/dist/server/index.js

@@ -1512,12 +1512,12 @@ async function handleRenameStream(request) {
           if (hasLocalItem) {
             await fs6.rename(absoluteOldPath, absoluteNewPath);
             const imagesDir = getPublicPath("/images");
-            const oldThumbFolder = path6.join(imagesDir, oldRelativePath);
+            const oldThumbFolder2 = path6.join(imagesDir, oldRelativePath);
             const newThumbFolder = path6.join(imagesDir, newRelativePath);
             try {
-              await fs6.access(oldThumbFolder);
+              await fs6.access(oldThumbFolder2);
               await fs6.mkdir(path6.dirname(newThumbFolder), { recursive: true });
-              await fs6.rename(oldThumbFolder, newThumbFolder);
+              await fs6.rename(oldThumbFolder2, newThumbFolder);
             } catch {
             }
           }
@@ -1597,7 +1597,9 @@ async function handleRenameStream(request) {
             });
           }
           await saveMeta(meta);
-          await deleteEmptyFolders(getPublicPath());
+          await deleteEmptyFolders(absoluteOldPath);
+          const oldThumbFolder = path6.join(getPublicPath("/images"), oldRelativePath);
+          await deleteEmptyFolders(oldThumbFolder);
           sendEvent({ type: "complete", renamed, newPath });
           controller.close();
           return;
@@ -1827,9 +1829,77 @@ async function handleMoveStream(request) {
                 });
                 continue;
               }
+              let hasLocalItem = false;
               try {
                 await fs6.access(absolutePath);
+                hasLocalItem = true;
               } catch {
+                const folderPrefix = oldKey + "/";
+                const hasChildrenInMeta = Object.keys(meta).some((key) => key.startsWith(folderPrefix));
+                if (hasChildrenInMeta) {
+                  const itemsToMove = [];
+                  for (const [key, metaEntry] of Object.entries(meta)) {
+                    if (key.startsWith(folderPrefix) && metaEntry && typeof metaEntry === "object") {
+                      const relativePath = key.slice(folderPrefix.length);
+                      const destNewKey = newKey + "/" + relativePath;
+                      itemsToMove.push({ oldKey: key, newKey: destNewKey, entry: metaEntry });
+                    }
+                  }
+                  for (const item of itemsToMove) {
+                    const itemEntry = item.entry;
+                    const isItemInCloud = itemEntry.c !== void 0;
+                    const itemCdnUrl = isItemInCloud ? cdnUrls[itemEntry.c] : void 0;
+                    const isItemInR2 = isItemInCloud && itemCdnUrl === r2PublicUrl;
+                    const itemHasThumbnails = isProcessed(itemEntry);
+                    if (isItemInR2) {
+                      try {
+                        const itemLocalPath = getPublicPath(item.newKey);
+                        const buffer = await downloadFromCdn(item.oldKey);
+                        await fs6.mkdir(path6.dirname(itemLocalPath), { recursive: true });
+                        await fs6.writeFile(itemLocalPath, buffer);
+                        if (itemHasThumbnails) {
+                          const oldThumbPaths = getAllThumbnailPaths(item.oldKey);
+                          const newThumbPaths = getAllThumbnailPaths(item.newKey);
+                          for (let t = 0; t < oldThumbPaths.length; t++) {
+                            try {
+                              const thumbBuffer = await downloadFromCdn(oldThumbPaths[t]);
+                              const newThumbLocalPath = getPublicPath(newThumbPaths[t]);
+                              await fs6.mkdir(path6.dirname(newThumbLocalPath), { recursive: true });
+                              await fs6.writeFile(newThumbLocalPath, thumbBuffer);
+                            } catch {
+                            }
+                          }
+                        }
+                        await deleteFromCdn(item.oldKey, itemHasThumbnails);
+                        await uploadOriginalToCdn(item.newKey);
+                        if (itemHasThumbnails) {
+                          await uploadToCdn(item.newKey);
+                        }
+                        try {
+                          await fs6.unlink(itemLocalPath);
+                        } catch {
+                        }
+                        if (itemHasThumbnails) {
+                          await deleteLocalThumbnails(item.newKey);
+                        }
+                      } catch (err) {
+                        console.error(`Failed to move cloud item ${item.oldKey}:`, err);
+                      }
+                    }
+                    delete meta[item.oldKey];
+                    meta[item.newKey] = itemEntry;
+                  }
+                  moved.push(itemPath);
+                  sendEvent({
+                    type: "progress",
+                    current: i + 1,
+                    total,
+                    moved: moved.length,
+                    percent: Math.round((i + 1) / total * 100),
+                    currentFile: itemName
+                  });
+                  continue;
+                }
                 errors.push(`${itemName} not found`);
                 sendEvent({
                   type: "progress",