@gallop.software/studio 2.3.22 → 2.3.23

package/dist/server/index.js

@@ -1355,15 +1355,16 @@ async function handleMoveStream(request) {
           const newRelativePath = destWithoutPublic ? path6.join(destWithoutPublic, itemName) : itemName;
           const oldKey = "/" + oldRelativePath;
           const newKey = "/" + newRelativePath;
-          sendEvent({
-            type: "progress",
-            current: i + 1,
-            total,
-            percent: Math.round((i + 1) / total * 100),
-            currentFile: itemName
-          });
           if (meta[newKey]) {
             errors.push(`${itemName} already exists in destination`);
+            sendEvent({
+              type: "progress",
+              current: i + 1,
+              total,
+              moved: moved.length,
+              percent: Math.round((i + 1) / total * 100),
+              currentFile: itemName
+            });
             continue;
           }
           const entry = meta[oldKey];
@@ -1388,6 +1389,14 @@ async function handleMoveStream(request) {
               delete meta[oldKey];
               meta[newKey] = newEntry;
               moved.push(itemPath);
+              sendEvent({
+                type: "progress",
+                current: i + 1,
+                total,
+                moved: moved.length,
+                percent: Math.round((i + 1) / total * 100),
+                currentFile: itemName
+              });
             } else if (isPushedToR2 && isImage) {
               const buffer = await downloadFromCdn(oldKey);
               await fs6.mkdir(path6.dirname(newAbsolutePath), { recursive: true });
@@ -1416,21 +1425,53 @@ async function handleMoveStream(request) {
               delete meta[oldKey];
               meta[newKey] = newEntry;
               moved.push(itemPath);
+              sendEvent({
+                type: "progress",
+                current: i + 1,
+                total,
+                moved: moved.length,
+                percent: Math.round((i + 1) / total * 100),
+                currentFile: itemName
+              });
             } else {
               const absolutePath = getWorkspacePath(safePath);
               if (absoluteDestination.startsWith(absolutePath + path6.sep)) {
                 errors.push(`Cannot move ${itemName} into itself`);
+                sendEvent({
+                  type: "progress",
+                  current: i + 1,
+                  total,
+                  moved: moved.length,
+                  percent: Math.round((i + 1) / total * 100),
+                  currentFile: itemName
+                });
                 continue;
               }
               try {
                 await fs6.access(absolutePath);
               } catch {
                 errors.push(`${itemName} not found`);
+                sendEvent({
+                  type: "progress",
+                  current: i + 1,
+                  total,
+                  moved: moved.length,
+                  percent: Math.round((i + 1) / total * 100),
+                  currentFile: itemName
+                });
                 continue;
               }
               try {
                 await fs6.access(newAbsolutePath);
                 errors.push(`${itemName} already exists in destination`);
+                sendEvent({
+                  type: "progress",
+                  current: i + 1,
+                  total,
+                  moved: moved.length,
+                  percent: Math.round((i + 1) / total * 100),
+                  currentFile: itemName
+                });
                 continue;
               } catch {
               }
@@ -1464,10 +1505,26 @@ async function handleMoveStream(request) {
                 }
               }
               moved.push(itemPath);
+              sendEvent({
+                type: "progress",
+                current: i + 1,
+                total,
+                moved: moved.length,
+                percent: Math.round((i + 1) / total * 100),
+                currentFile: itemName
+              });
             }
           } catch (err) {
             console.error(`Failed to move ${itemName}:`, err);
             errors.push(`Failed to move ${itemName}`);
+            sendEvent({
+              type: "progress",
+              current: i + 1,
+              total,
+              moved: moved.length,
+              percent: Math.round((i + 1) / total * 100),
+              currentFile: itemName
+            });
           }
         }
         await saveMeta(meta);
@@ -2557,18 +2614,19 @@ async function handleImportUrls(request) {
         for (let i = 0; i < urls.length; i++) {
           const url = urls[i].trim();
           if (!url) continue;
-          sendEvent({
-            type: "progress",
-            current: i + 1,
-            total,
-            percent: Math.round((i + 1) / total * 100),
-            currentFile: url
-          });
           try {
             const { base, path: path10 } = parseImageUrl(url);
             const existingEntry = getMetaEntry(meta, path10);
             if (existingEntry) {
               skipped.push(path10);
+              sendEvent({
+                type: "progress",
+                current: i + 1,
+                total,
+                imported: added.length,
+                percent: Math.round((i + 1) / total * 100),
+                currentFile: url
+              });
               continue;
             }
             const cdnIndex = getOrAddCdnIndex(meta, base);
@@ -2579,9 +2637,25 @@ async function handleImportUrls(request) {
               c: cdnIndex
             });
             added.push(path10);
+            sendEvent({
+              type: "progress",
+              current: i + 1,
+              total,
+              imported: added.length,
+              percent: Math.round((i + 1) / total * 100),
+              currentFile: url
+            });
           } catch (error) {
             console.error(`Failed to import ${url}:`, error);
             errors.push(url);
+            sendEvent({
+              type: "progress",
+              current: i + 1,
+              total,
+              imported: added.length,
+              percent: Math.round((i + 1) / total * 100),
+              currentFile: url
+            });
           }
         }
         await saveMeta(meta);
@@ -2698,13 +2772,6 @@ async function handleGenerateFavicon(request) {
         });
         for (let i = 0; i < FAVICON_CONFIGS.length; i++) {
           const config = FAVICON_CONFIGS[i];
-          sendEvent({
-            type: "progress",
-            current: i + 1,
-            total,
-            percent: Math.round((i + 1) / total * 100),
-            message: `Generating ${config.name} (${config.size}x${config.size})...`
-          });
           try {
             const outputPath = path9.join(outputDir, config.name);
             await sharp5(sourcePath).resize(config.size, config.size, {
@@ -2712,9 +2779,25 @@ async function handleGenerateFavicon(request) {
               position: "center"
             }).png({ quality: 100 }).toFile(outputPath);
             generated.push(config.name);
+            sendEvent({
+              type: "progress",
+              current: i + 1,
+              total,
+              processed: generated.length,
+              percent: Math.round((i + 1) / total * 100),
+              message: `Generated ${config.name}`
+            });
           } catch (error) {
             console.error(`Failed to generate ${config.name}:`, error);
             errors.push(config.name);
+            sendEvent({
+              type: "progress",
+              current: i + 1,
+              total,
+              processed: generated.length,
+              percent: Math.round((i + 1) / total * 100),
+              message: `Failed: ${config.name}`
+            });
           }
         }
         let message = `Generated ${generated.length} favicon${generated.length !== 1 ? "s" : ""} to src/app/.`;