@gallop.software/studio 2.3.44 → 2.3.46

package/dist/server/index.js

@@ -1758,7 +1758,21 @@ async function handleMoveStream(request) {
               }
               return count;
             };
-            totalFiles += await countFilesRecursive(absolutePath);
+            const localFileCount = await countFilesRecursive(absolutePath);
+            const folderPrefix = oldKey + "/";
+            let cloudOnlyCount = 0;
+            for (const metaKey of Object.keys(meta)) {
+              if (metaKey.startsWith(folderPrefix)) {
+                const relPath = metaKey.slice(folderPrefix.length);
+                const localPath = path6.join(absolutePath, relPath);
+                try {
+                  await fs6.access(localPath);
+                } catch {
+                  cloudOnlyCount++;
+                }
+              }
+            }
+            totalFiles += localFileCount + cloudOnlyCount;
             expandedItems.push({ itemPath, safePath, itemName, oldKey, newKey, newAbsolutePath, isVirtualFolder: false });
           } else if (!hasLocalItem) {
             const folderPrefix = oldKey + "/";
@@ -1794,6 +1808,7 @@ async function handleMoveStream(request) {
               const itemCdnUrl = isItemInCloud ? cdnUrls[itemEntry.c] : void 0;
               const isItemInR2 = isItemInCloud && itemCdnUrl === r2PublicUrl;
               const itemHasThumbnails = isProcessed(itemEntry);
+              let vItemMoved = false;
               if (isItemInR2) {
                 try {
                   const itemLocalPath = getPublicPath(vItem.newKey);
@@ -1825,12 +1840,16 @@ async function handleMoveStream(request) {
                   if (itemHasThumbnails) {
                     await deleteLocalThumbnails(vItem.newKey);
                   }
+                  vItemMoved = true;
                 } catch (err) {
                   console.error(`Failed to move cloud item ${vItem.oldKey}:`, err);
+                  delete meta[vItem.oldKey];
                 }
               }
-              delete meta[vItem.oldKey];
-              meta[vItem.newKey] = itemEntry;
+              if (vItemMoved) {
+                delete meta[vItem.oldKey];
+                meta[vItem.newKey] = itemEntry;
+              }
               processedFiles++;
               sendEvent({
                 type: "progress",
@@ -2106,6 +2125,7 @@ async function handleMoveStream(request) {
                   const cloudCdnUrl = cloudIsInCloud ? cdnUrls[cloudEntry.c] : void 0;
                   const cloudIsInR2 = cloudIsInCloud && cloudCdnUrl === r2PublicUrl;
                   const cloudHasThumbs = isProcessed(cloudEntry);
+                  let cloudFileMoved = false;
                   if (cloudIsInR2) {
                     try {
                       const cloudLocalPath = getPublicPath(cloudFile.newKey);
@@ -2138,12 +2158,16 @@ async function handleMoveStream(request) {
                         await deleteLocalThumbnails(cloudFile.newKey);
                       }
                       await deleteEmptyFolders(path6.dirname(cloudLocalPath));
+                      cloudFileMoved = true;
                     } catch (err) {
                       console.error(`Failed to move cloud file ${cloudFile.oldKey}:`, err);
+                      delete meta[cloudFile.oldKey];
                     }
                   }
-                  delete meta[cloudFile.oldKey];
-                  meta[cloudFile.newKey] = cloudEntry;
+                  if (cloudFileMoved) {
+                    delete meta[cloudFile.oldKey];
+                    meta[cloudFile.newKey] = cloudEntry;
+                  }
                   processedFiles++;
                   sendEvent({
                     type: "progress",