@gallop.software/studio 2.1.15 → 2.1.16

package/dist/server/index.js

@@ -1000,6 +1000,34 @@ async function deleteEmptyFolders(folderPath) {
   } catch {
   }
 }
+async function cleanupEmptyFoldersRecursive(dir) {
+  try {
+    const entries = await fs5.readdir(dir, { withFileTypes: true });
+    let isEmpty = true;
+    for (const entry of entries) {
+      if (entry.isDirectory()) {
+        const subDirEmpty = await cleanupEmptyFoldersRecursive(path5.join(dir, entry.name));
+        if (!subDirEmpty) isEmpty = false;
+      } else if (!isHiddenOrSystemFile(entry.name)) {
+        isEmpty = false;
+      }
+    }
+    if (isEmpty) {
+      for (const entry of entries) {
+        if (!entry.isDirectory() && isHiddenOrSystemFile(entry.name)) {
+          try {
+            await fs5.unlink(path5.join(dir, entry.name));
+          } catch {
+          }
+        }
+      }
+      await fs5.rmdir(dir);
+    }
+    return isEmpty;
+  } catch {
+    return true;
+  }
+}
 
 // src/handlers/files.ts
 async function handleUpload(request) {
@@ -1599,13 +1627,6 @@ async function handleUnprocessStream(request) {
 `));
       };
       try {
-        let isHiddenOrSystemFile3 = function(filename) {
-          if (filename.startsWith(".")) return true;
-          const windowsFiles = ["thumbs.db", "desktop.ini", "ehthumbs.db", "ehthumbs_vista.db"];
-          if (windowsFiles.includes(filename.toLowerCase())) return true;
-          return false;
-        };
-        var isHiddenOrSystemFile2 = isHiddenOrSystemFile3;
         const meta = await loadMeta();
         const cdnUrls = getCdnUrls(meta);
         const removed = [];
@@ -1665,37 +1686,9 @@ async function handleUnprocessStream(request) {
           await purgeCloudflareCache(urlsToPurge);
         }
         sendEvent({ type: "cleanup", message: "Cleaning up empty folders..." });
-        async function cleanEmptyFolders(dir) {
-          try {
-            const entries = await fs7.readdir(dir, { withFileTypes: true });
-            let isEmpty = true;
-            for (const entry of entries) {
-              if (entry.isDirectory()) {
-                const subDirEmpty = await cleanEmptyFolders(path7.join(dir, entry.name));
-                if (!subDirEmpty) isEmpty = false;
-              } else if (!isHiddenOrSystemFile3(entry.name)) {
-                isEmpty = false;
-              }
-            }
-            if (isEmpty) {
-              for (const entry of entries) {
-                if (!entry.isDirectory() && isHiddenOrSystemFile3(entry.name)) {
-                  try {
-                    await fs7.unlink(path7.join(dir, entry.name));
-                  } catch {
-                  }
-                }
-              }
-              await fs7.rmdir(dir);
-            }
-            return isEmpty;
-          } catch {
-            return true;
-          }
-        }
         const imagesDir = getPublicPath("images");
         try {
-          await cleanEmptyFolders(imagesDir);
+          await cleanupEmptyFoldersRecursive(imagesDir);
         } catch {
         }
         let message = `Removed thumbnails from ${removed.length} image${removed.length !== 1 ? "s" : ""}.`;
@@ -1978,13 +1971,6 @@ async function handleScanStream() {
 `));
       };
       try {
-        let isHiddenOrSystemFile3 = function(filename) {
-          if (filename.startsWith(".")) return true;
-          const windowsFiles = ["thumbs.db", "desktop.ini", "ehthumbs.db", "ehthumbs_vista.db"];
-          if (windowsFiles.includes(filename.toLowerCase())) return true;
-          return false;
-        };
-        var isHiddenOrSystemFile2 = isHiddenOrSystemFile3;
         const meta = await loadMeta();
         const existingCount = Object.keys(meta).filter((k) => !k.startsWith("_")).length;
         const existingKeys = new Set(Object.keys(meta));
@@ -2130,36 +2116,8 @@ async function handleScanStream() {
           }
         }
         await cleanEmptyFolders(getPublicPath());
-        async function cleanImagesFolders(dir) {
-          try {
-            const entries = await fs8.readdir(dir, { withFileTypes: true });
-            let isEmpty = true;
-            for (const entry of entries) {
-              if (entry.isDirectory()) {
-                const subDirEmpty = await cleanImagesFolders(path8.join(dir, entry.name));
-                if (!subDirEmpty) isEmpty = false;
-              } else if (!isHiddenOrSystemFile3(entry.name)) {
-                isEmpty = false;
-              }
-            }
-            if (isEmpty) {
-              for (const entry of entries) {
-                if (!entry.isDirectory() && isHiddenOrSystemFile3(entry.name)) {
-                  try {
-                    await fs8.unlink(path8.join(dir, entry.name));
-                  } catch {
-                  }
-                }
-              }
-              await fs8.rmdir(dir);
-            }
-            return isEmpty;
-          } catch {
-            return true;
-          }
-        }
         try {
-          await cleanImagesFolders(imagesDir);
+          await cleanupEmptyFoldersRecursive(imagesDir);
         } catch {
         }
         await saveMeta(meta);
@@ -2190,13 +2148,6 @@ async function handleScanStream() {
 }
 async function handleDeleteOrphans(request) {
   try {
-    let isHiddenOrSystemFile3 = function(filename) {
-      if (filename.startsWith(".")) return true;
-      const windowsFiles = ["thumbs.db", "desktop.ini", "ehthumbs.db", "ehthumbs_vista.db"];
-      if (windowsFiles.includes(filename.toLowerCase())) return true;
-      return false;
-    };
-    var isHiddenOrSystemFile2 = isHiddenOrSystemFile3;
     const { paths } = await request.json();
     if (!paths || !Array.isArray(paths) || paths.length === 0) {
       return jsonResponse({ error: "No paths provided" }, { status: 400 });
@@ -2218,36 +2169,8 @@ async function handleDeleteOrphans(request) {
       }
     }
     const imagesDir = getPublicPath("images");
-    async function removeEmptyDirs(dir) {
-      try {
-        const entries = await fs8.readdir(dir, { withFileTypes: true });
-        let isEmpty = true;
-        for (const entry of entries) {
-          if (entry.isDirectory()) {
-            const subDirEmpty = await removeEmptyDirs(path8.join(dir, entry.name));
-            if (!subDirEmpty) isEmpty = false;
-          } else if (!isHiddenOrSystemFile3(entry.name)) {
-            isEmpty = false;
-          }
-        }
-        if (isEmpty) {
-          for (const entry of entries) {
-            if (!entry.isDirectory() && isHiddenOrSystemFile3(entry.name)) {
-              try {
-                await fs8.unlink(path8.join(dir, entry.name));
-              } catch {
-              }
-            }
-          }
-          await fs8.rmdir(dir);
-        }
-        return isEmpty;
-      } catch {
-        return true;
-      }
-    }
     try {
-      await removeEmptyDirs(imagesDir);
+      await cleanupEmptyFoldersRecursive(imagesDir);
     } catch {
     }
     return jsonResponse({