@gallop.software/studio 2.3.36 → 2.3.38

package/dist/server/index.js

@@ -1435,6 +1435,7 @@ async function handleRenameStream(request) {
         const isImagePath = isImageFile(path6.basename(oldPath));
         let hasLocalItem = false;
         let isFile = true;
+        let isVirtualFolder = false;
         try {
           const stats = await fs6.stat(absoluteOldPath);
           hasLocalItem = true;
@@ -1443,12 +1444,20 @@ async function handleRenameStream(request) {
           const meta2 = await loadMeta();
           const oldKey2 = "/" + oldRelativePath;
           const entry2 = meta2[oldKey2];
-          if (!entry2) {
-            sendEvent({ type: "error", message: "File or folder not found" });
-            controller.close();
-            return;
+          if (entry2) {
+            isFile = true;
+          } else {
+            const folderPrefix = oldKey2 + "/";
+            const hasChildrenInMeta = Object.keys(meta2).some((key) => key.startsWith(folderPrefix));
+            if (hasChildrenInMeta) {
+              isFile = false;
+              isVirtualFolder = true;
+            } else {
+              sendEvent({ type: "error", message: "File or folder not found" });
+              controller.close();
+              return;
+            }
           }
-          isFile = true;
         }
         const sanitizedName = isFile ? slugifyFilename(newName) : slugifyFolderName(newName);
         if (!sanitizedName) {
@@ -1470,12 +1479,23 @@ async function handleRenameStream(request) {
             return;
           }
         }
-        try {
-          await fs6.access(absoluteNewPath);
-          sendEvent({ type: "error", message: "An item with this name already exists" });
-          controller.close();
-          return;
-        } catch {
+        if (!isVirtualFolder) {
+          try {
+            await fs6.access(absoluteNewPath);
+            sendEvent({ type: "error", message: "An item with this name already exists" });
+            controller.close();
+            return;
+          } catch {
+          }
+        }
+        if (isVirtualFolder) {
+          const newPrefix = "/" + newRelativePath + "/";
+          const hasConflict = Object.keys(meta).some((key) => key.startsWith(newPrefix));
+          if (hasConflict) {
+            sendEvent({ type: "error", message: "A folder with this name already exists" });
+            controller.close();
+            return;
+          }
         }
         if (!isFile) {
           const oldPrefix = "/" + oldRelativePath + "/";
@@ -1491,6 +1511,15 @@ async function handleRenameStream(request) {
           sendEvent({ type: "start", total, message: `Renaming folder with ${itemsToUpdate.length} item(s)...` });
           if (hasLocalItem) {
             await fs6.rename(absoluteOldPath, absoluteNewPath);
+            const imagesDir = getPublicPath("/images");
+            const oldThumbFolder = path6.join(imagesDir, oldRelativePath);
+            const newThumbFolder = path6.join(imagesDir, newRelativePath);
+            try {
+              await fs6.access(oldThumbFolder);
+              await fs6.mkdir(path6.dirname(newThumbFolder), { recursive: true });
+              await fs6.rename(oldThumbFolder, newThumbFolder);
+            } catch {
+            }
           }
           sendEvent({ type: "progress", current: 1, total, renamed: 1, message: "Renamed folder" });
           let renamed = 1;