@gallop.software/studio 0.1.108 → 0.1.110

package/dist/handlers/index.js

@@ -270,14 +270,37 @@ async function handleList(request) {
     const fileEntries = getFileEntries(meta);
     const cdnUrls = getCdnUrls(meta);
     const r2PublicUrl = _optionalChain([process, 'access', _ => _.env, 'access', _2 => _2.CLOUDFLARE_R2_PUBLIC_URL, 'optionalAccess', _3 => _3.replace, 'call', _4 => _4(/\/$/, "")]) || "";
-    if (fileEntries.length === 0) {
-      return _server.NextResponse.json({ items: [], isEmpty: true });
-    }
     const relativePath = requestedPath.replace(/^public\/?/, "");
     const pathPrefix = relativePath ? `/${relativePath}/` : "/";
     const items = [];
     const seenFolders = /* @__PURE__ */ new Set();
     const metaKeys = fileEntries.map(([key]) => key);
+    const absoluteDir = _path2.default.join(process.cwd(), requestedPath);
+    try {
+      const dirEntries = await _fs.promises.readdir(absoluteDir, { withFileTypes: true });
+      for (const entry of dirEntries) {
+        if (entry.isDirectory() && !entry.name.startsWith(".") && entry.name !== "images") {
+          if (!seenFolders.has(entry.name)) {
+            seenFolders.add(entry.name);
+            const folderPrefix = pathPrefix === "/" ? `/${entry.name}/` : `${pathPrefix}${entry.name}/`;
+            let fileCount = 0;
+            for (const k of metaKeys) {
+              if (k.startsWith(folderPrefix)) fileCount++;
+            }
+            items.push({
+              name: entry.name,
+              path: relativePath ? `public/${relativePath}/${entry.name}` : `public/${entry.name}`,
+              type: "folder",
+              fileCount
+            });
+          }
+        }
+      }
+    } catch (e6) {
+    }
+    if (fileEntries.length === 0 && items.length === 0) {
+      return _server.NextResponse.json({ items: [], isEmpty: true });
+    }
     for (const [key, entry] of fileEntries) {
       if (!key.startsWith(pathPrefix) && pathPrefix !== "/") continue;
       if (pathPrefix === "/" && !key.startsWith("/")) continue;
@@ -323,7 +346,7 @@ async function handleList(request) {
               await _fs.promises.access(localThumbPath);
               thumbnail = thumbPath;
               hasThumbnail = true;
-            } catch (e6) {
+            } catch (e7) {
               thumbnail = key;
               hasThumbnail = false;
             }
@@ -342,7 +365,7 @@ async function handleList(request) {
             const filePath = _path2.default.join(process.cwd(), "public", key);
             const stats = await _fs.promises.stat(filePath);
             fileSize = stats.size;
-          } catch (e7) {
+          } catch (e8) {
           }
         }
         items.push({
@@ -402,7 +425,7 @@ async function handleSearch(request) {
             await _fs.promises.access(localThumbPath);
             thumbnail = thumbPath;
             hasThumbnail = true;
-          } catch (e8) {
+          } catch (e9) {
             thumbnail = key;
             hasThumbnail = false;
           }
@@ -448,6 +471,21 @@ async function handleListFolders() {
         folderSet.add(current);
       }
     }
+    async function scanDir(dir, relativePath) {
+      try {
+        const entries = await _fs.promises.readdir(dir, { withFileTypes: true });
+        for (const entry of entries) {
+          if (entry.isDirectory() && !entry.name.startsWith(".") && entry.name !== "images") {
+            const folderRelPath = relativePath ? `${relativePath}/${entry.name}` : entry.name;
+            folderSet.add(folderRelPath);
+            await scanDir(_path2.default.join(dir, entry.name), folderRelPath);
+          }
+        }
+      } catch (e10) {
+      }
+    }
+    const publicDir = _path2.default.join(process.cwd(), "public");
+    await scanDir(publicDir, "");
     const folders = [];
     folders.push({ path: "public", name: "public", depth: 0 });
     const sortedFolders = Array.from(folderSet).sort();
@@ -584,7 +622,7 @@ async function handleUpload(request) {
           w: metadata.width || 0,
           h: metadata.height || 0
         };
-      } catch (e9) {
+      } catch (e11) {
         meta[imageKey] = { w: 0, h: 0 };
       }
     } else {
@@ -633,7 +671,7 @@ async function handleDelete(request) {
                     const absoluteThumbPath = _path2.default.join(process.cwd(), "public", thumbPath);
                     try {
                       await _fs.promises.unlink(absoluteThumbPath);
-                    } catch (e10) {
+                    } catch (e12) {
                     }
                   }
                 }
@@ -649,14 +687,14 @@ async function handleDelete(request) {
                   const absoluteThumbPath = _path2.default.join(process.cwd(), "public", thumbPath);
                   try {
                     await _fs.promises.unlink(absoluteThumbPath);
-                  } catch (e11) {
+                  } catch (e13) {
                   }
                 }
               }
               delete meta[imageKey];
             }
           }
-        } catch (e12) {
+        } catch (e14) {
           if (entry) {
             delete meta[imageKey];
           } else {
@@ -709,7 +747,7 @@ async function handleCreateFolder(request) {
     try {
       await _fs.promises.access(folderPath);
       return _server.NextResponse.json({ error: "A folder with this name already exists" }, { status: 400 });
-    } catch (e13) {
+    } catch (e15) {
     }
     await _fs.promises.mkdir(folderPath, { recursive: true });
     return _server.NextResponse.json({ success: true, path: _path2.default.join(safePath, sanitizedName) });
@@ -737,13 +775,13 @@ async function handleRename(request) {
     }
     try {
       await _fs.promises.access(absoluteOldPath);
-    } catch (e14) {
+    } catch (e16) {
       return _server.NextResponse.json({ error: "File or folder not found" }, { status: 404 });
     }
     try {
       await _fs.promises.access(absoluteNewPath);
       return _server.NextResponse.json({ error: "An item with this name already exists" }, { status: 400 });
-    } catch (e15) {
+    } catch (e17) {
     }
     const stats = await _fs.promises.stat(absoluteOldPath);
     const isFile = stats.isFile();
@@ -765,7 +803,7 @@ async function handleRename(request) {
           await _fs.promises.mkdir(_path2.default.dirname(newThumbPath), { recursive: true });
           try {
             await _fs.promises.rename(oldThumbPath, newThumbPath);
-          } catch (e16) {
+          } catch (e18) {
           }
         }
         delete meta[oldKey];
@@ -880,7 +918,7 @@ async function handleMoveStream(request) {
               await deleteFromCdn(oldKey, hasProcessedThumbnails);
               try {
                 await _fs.promises.unlink(newAbsolutePath);
-              } catch (e17) {
+              } catch (e19) {
               }
               if (hasProcessedThumbnails) {
                 await deleteLocalThumbnails(newKey);
@@ -897,7 +935,7 @@ async function handleMoveStream(request) {
               }
               try {
                 await _fs.promises.access(absolutePath);
-              } catch (e18) {
+              } catch (e20) {
                 errors.push(`${itemName} not found`);
                 continue;
               }
@@ -905,7 +943,7 @@ async function handleMoveStream(request) {
                 await _fs.promises.access(newAbsolutePath);
                 errors.push(`${itemName} already exists in destination`);
                 continue;
-              } catch (e19) {
+              } catch (e21) {
               }
               await _fs.promises.rename(absolutePath, newAbsolutePath);
               const stats = await _fs.promises.stat(newAbsolutePath);
@@ -918,7 +956,7 @@ async function handleMoveStream(request) {
                   await _fs.promises.mkdir(_path2.default.dirname(newThumbPath), { recursive: true });
                   try {
                     await _fs.promises.rename(oldThumbPath, newThumbPath);
-                  } catch (e20) {
+                  } catch (e22) {
                   }
                 }
                 delete meta[oldKey];
@@ -1038,7 +1076,7 @@ async function handleSync(request) {
                 ContentType: getContentType(thumbPath)
               })
             );
-          } catch (e21) {
+          } catch (e23) {
           }
         }
         entry.c = cdnIndex;
@@ -1046,12 +1084,12 @@ async function handleSync(request) {
           const localPath = _path2.default.join(process.cwd(), "public", thumbPath);
           try {
             await _fs.promises.unlink(localPath);
-          } catch (e22) {
+          } catch (e24) {
           }
         }
         try {
           await _fs.promises.unlink(originalLocalPath);
-        } catch (e23) {
+        } catch (e25) {
         }
         pushed.push(imageKey);
       } catch (error) {
@@ -1088,7 +1126,7 @@ async function handleReprocess(request) {
         const originalPath = _path2.default.join(process.cwd(), "public", imageKey);
         try {
           buffer = await _fs.promises.readFile(originalPath);
-        } catch (e24) {
+        } catch (e26) {
           if (isPushedToCloud) {
             buffer = await downloadFromCdn(imageKey);
             const dir = _path2.default.dirname(originalPath);
@@ -1105,7 +1143,7 @@ async function handleReprocess(request) {
           await deleteLocalThumbnails(imageKey);
           try {
             await _fs.promises.unlink(originalPath);
-          } catch (e25) {
+          } catch (e27) {
           }
         }
         meta[imageKey] = updatedEntry;
@@ -1205,7 +1243,7 @@ async function handleProcessAllStream() {
               await deleteLocalThumbnails(key);
               try {
                 await _fs.promises.unlink(fullPath);
-              } catch (e26) {
+              } catch (e28) {
               }
             }
             processed.push(key.slice(1));
@@ -1244,13 +1282,13 @@ async function handleProcessAllStream() {
                 }
               }
             }
-          } catch (e27) {
+          } catch (e29) {
           }
         }
         const imagesDir = _path2.default.join(process.cwd(), "public", "images");
         try {
           await findOrphans(imagesDir);
-        } catch (e28) {
+        } catch (e30) {
         }
         async function removeEmptyDirs(dir) {
           try {
@@ -1268,13 +1306,13 @@ async function handleProcessAllStream() {
               await _fs.promises.rmdir(dir);
             }
             return isEmpty;
-          } catch (e29) {
+          } catch (e31) {
             return true;
           }
         }
         try {
           await removeEmptyDirs(imagesDir);
-        } catch (e30) {
+        } catch (e32) {
         }
         await saveMeta(meta);
         sendEvent({
@@ -1337,7 +1375,7 @@ async function handleScanStream() {
                 allFiles.push({ relativePath: relPath, fullPath });
               }
             }
-          } catch (e31) {
+          } catch (e33) {
           }
         }
         const publicDir = _path2.default.join(process.cwd(), "public");
@@ -1397,7 +1435,7 @@ async function handleScanStream() {
                     h: metadata.height || 0,
                     b: blurhash
                   };
-                } catch (e32) {
+                } catch (e34) {
                   meta[imageKey] = { w: 0, h: 0 };
                 }
               }