@gallop.software/studio 1.2.1 → 1.2.3

package/dist/handlers/index.js

@@ -311,6 +311,22 @@ async function deleteFromCdn(imageKey, hasThumbnails) {
 }
 
 // src/handlers/list.ts
+function getExistingThumbnails(originalPath, entry) {
+  const thumbnails = [];
+  if (entry.f) {
+    thumbnails.push({ path: _chunkWOHZ4LYGjs.getThumbnailPath.call(void 0, originalPath, "full"), size: "f" });
+  }
+  if (entry.lg) {
+    thumbnails.push({ path: _chunkWOHZ4LYGjs.getThumbnailPath.call(void 0, originalPath, "lg"), size: "lg" });
+  }
+  if (entry.md) {
+    thumbnails.push({ path: _chunkWOHZ4LYGjs.getThumbnailPath.call(void 0, originalPath, "md"), size: "md" });
+  }
+  if (entry.sm) {
+    thumbnails.push({ path: _chunkWOHZ4LYGjs.getThumbnailPath.call(void 0, originalPath, "sm"), size: "sm" });
+  }
+  return thumbnails;
+}
 async function handleList(request) {
   const searchParams = request.nextUrl.searchParams;
   const requestedPath = searchParams.get("path") || "public";
@@ -325,6 +341,84 @@ async function handleList(request) {
     const seenFolders = /* @__PURE__ */ new Set();
     const metaKeys = fileEntries.map(([key]) => key);
     const isInsideImagesFolder = relativePath === "images" || relativePath.startsWith("images/");
+    if (isInsideImagesFolder) {
+      const imagesSubPath = relativePath.replace(/^images\/?/, "");
+      const imagesPrefix = imagesSubPath ? `/${imagesSubPath}/` : "/";
+      const allThumbnails = [];
+      for (const [key, entry] of fileEntries) {
+        if (_chunkWOHZ4LYGjs.isProcessed.call(void 0, entry)) {
+          const thumbnails = getExistingThumbnails(key, entry);
+          for (const thumb of thumbnails) {
+            allThumbnails.push({ ...thumb, originalKey: key });
+          }
+        }
+      }
+      for (const thumb of allThumbnails) {
+        const thumbRelative = thumb.path.replace(/^\/images\/?/, "");
+        if (imagesSubPath === "") {
+          const slashIndex = thumbRelative.indexOf("/");
+          if (slashIndex === -1) {
+            const fileName = thumbRelative;
+            items.push({
+              name: fileName,
+              path: `public/images/${fileName}`,
+              type: "file",
+              thumbnail: thumb.path,
+              hasThumbnail: false,
+              isProtected: true
+            });
+          } else {
+            const folderName = thumbRelative.slice(0, slashIndex);
+            if (!seenFolders.has(folderName)) {
+              seenFolders.add(folderName);
+              const folderPrefix = `/${folderName}/`;
+              const fileCount = allThumbnails.filter(
+                (t) => t.path.replace(/^\/images/, "").startsWith(folderPrefix)
+              ).length;
+              items.push({
+                name: folderName,
+                path: `public/images/${folderName}`,
+                type: "folder",
+                fileCount,
+                isProtected: true
+              });
+            }
+          }
+        } else {
+          if (!thumbRelative.startsWith(imagesSubPath + "/") && thumbRelative !== imagesSubPath) continue;
+          const remaining = thumbRelative.slice(imagesSubPath.length + 1);
+          if (!remaining) continue;
+          const slashIndex = remaining.indexOf("/");
+          if (slashIndex === -1) {
+            items.push({
+              name: remaining,
+              path: `public/images/${imagesSubPath}/${remaining}`,
+              type: "file",
+              thumbnail: thumb.path,
+              hasThumbnail: false,
+              isProtected: true
+            });
+          } else {
+            const folderName = remaining.slice(0, slashIndex);
+            if (!seenFolders.has(folderName)) {
+              seenFolders.add(folderName);
+              const folderPrefix = `${imagesSubPath}/${folderName}/`;
+              const fileCount = allThumbnails.filter(
+                (t) => t.path.replace(/^\/images\//, "").startsWith(folderPrefix)
+              ).length;
+              items.push({
+                name: folderName,
+                path: `public/images/${imagesSubPath}/${folderName}`,
+                type: "folder",
+                fileCount,
+                isProtected: true
+              });
+            }
+          }
+        }
+      }
+      return _server.NextResponse.json({ items });
+    }
     const absoluteDir = _path2.default.join(process.cwd(), requestedPath);
     try {
       const dirEntries = await _fs.promises.readdir(absoluteDir, { withFileTypes: true });
@@ -336,12 +430,11 @@ async function handleList(request) {
             const isImagesFolder = entry.name === "images" && !relativePath;
             const folderPath = relativePath ? `public/${relativePath}/${entry.name}` : `public/${entry.name}`;
             let fileCount = 0;
-            if (isInsideImagesFolder || isImagesFolder) {
-              const subDir = _path2.default.join(absoluteDir, entry.name);
-              try {
-                const subEntries = await _fs.promises.readdir(subDir);
-                fileCount = subEntries.filter((f) => !f.startsWith(".")).length;
-              } catch (e6) {
+            if (isImagesFolder) {
+              for (const [key, metaEntry] of fileEntries) {
+                if (_chunkWOHZ4LYGjs.isProcessed.call(void 0, metaEntry)) {
+                  fileCount += getExistingThumbnails(key, metaEntry).length;
+                }
               }
             } else {
               const folderPrefix = pathPrefix === "/" ? `/${entry.name}/` : `${pathPrefix}${entry.name}/`;
@@ -354,31 +447,29 @@ async function handleList(request) {
               path: folderPath,
               type: "folder",
               fileCount,
-              isProtected: isImagesFolder || isInsideImagesFolder
+              isProtected: isImagesFolder
             });
           }
-        } else if (isInsideImagesFolder) {
-          const filePath = relativePath ? `public/${relativePath}/${entry.name}` : `public/${entry.name}`;
-          const fullPath = _path2.default.join(absoluteDir, entry.name);
-          let fileSize;
-          try {
-            const stats = await _fs.promises.stat(fullPath);
-            fileSize = stats.size;
-          } catch (e7) {
-          }
-          const isImage = isImageFile(entry.name);
-          items.push({
-            name: entry.name,
-            path: filePath,
-            type: "file",
-            size: fileSize,
-            thumbnail: isImage ? `/${relativePath}/${entry.name}` : void 0,
-            hasThumbnail: false,
-            isProtected: true
-          });
         }
       }
-    } catch (e8) {
+    } catch (e6) {
+    }
+    if (!relativePath && !seenFolders.has("images")) {
+      let thumbnailCount = 0;
+      for (const [key, entry] of fileEntries) {
+        if (_chunkWOHZ4LYGjs.isProcessed.call(void 0, entry)) {
+          thumbnailCount += getExistingThumbnails(key, entry).length;
+        }
+      }
+      if (thumbnailCount > 0) {
+        items.push({
+          name: "images",
+          path: "public/images",
+          type: "folder",
+          fileCount: thumbnailCount,
+          isProtected: true
+        });
+      }
     }
     if (fileEntries.length === 0 && items.length === 0) {
       return _server.NextResponse.json({ items: [], isEmpty: true });
@@ -430,7 +521,7 @@ async function handleList(request) {
               await _fs.promises.access(localThumbPath);
               thumbnail = thumbPath;
               hasThumbnail = true;
-            } catch (e9) {
+            } catch (e7) {
               thumbnail = key;
               hasThumbnail = false;
             }
@@ -449,7 +540,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 (e10) {
+          } catch (e8) {
           }
         }
         items.push({
@@ -511,7 +602,7 @@ async function handleSearch(request) {
             await _fs.promises.access(localThumbPath);
             thumbnail = thumbPath;
             hasThumbnail = true;
-          } catch (e11) {
+          } catch (e9) {
             thumbnail = key;
             hasThumbnail = false;
           }
@@ -567,7 +658,7 @@ async function handleListFolders() {
             await scanDir(_path2.default.join(dir, entry.name), folderRelPath);
           }
         }
-      } catch (e12) {
+      } catch (e10) {
       }
     }
     const publicDir = _path2.default.join(process.cwd(), "public");
@@ -707,7 +798,7 @@ async function handleUpload(request) {
         meta[imageKey] = {
           o: { w: metadata.width || 0, h: metadata.height || 0 }
         };
-      } catch (e13) {
+      } catch (e11) {
         meta[imageKey] = { o: { w: 0, h: 0 } };
       }
     } else {
@@ -757,7 +848,7 @@ async function handleDelete(request) {
                     const absoluteThumbPath = _path2.default.join(process.cwd(), "public", thumbPath);
                     try {
                       await _fs.promises.unlink(absoluteThumbPath);
-                    } catch (e14) {
+                    } catch (e12) {
                     }
                   }
                 }
@@ -773,14 +864,14 @@ async function handleDelete(request) {
                   const absoluteThumbPath = _path2.default.join(process.cwd(), "public", thumbPath);
                   try {
                     await _fs.promises.unlink(absoluteThumbPath);
-                  } catch (e15) {
+                  } catch (e13) {
                   }
                 }
               }
               delete meta[imageKey];
             }
           }
-        } catch (e16) {
+        } catch (e14) {
           if (entry) {
             delete meta[imageKey];
           } else {
@@ -833,7 +924,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 (e17) {
+    } catch (e15) {
     }
     await _fs.promises.mkdir(folderPath, { recursive: true });
     return _server.NextResponse.json({ success: true, path: _path2.default.join(safePath, sanitizedName) });
@@ -861,13 +952,13 @@ async function handleRename(request) {
     }
     try {
       await _fs.promises.access(absoluteOldPath);
-    } catch (e18) {
+    } 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 (e19) {
+    } catch (e17) {
     }
     const stats = await _fs.promises.stat(absoluteOldPath);
     const isFile = stats.isFile();
@@ -889,7 +980,7 @@ async function handleRename(request) {
           await _fs.promises.mkdir(_path2.default.dirname(newThumbPath), { recursive: true });
           try {
             await _fs.promises.rename(oldThumbPath, newThumbPath);
-          } catch (e20) {
+          } catch (e18) {
           }
         }
         delete meta[oldKey];
@@ -999,7 +1090,7 @@ async function handleMoveStream(request) {
               await deleteFromCdn(oldKey, hasProcessedThumbnails);
               try {
                 await _fs.promises.unlink(newAbsolutePath);
-              } catch (e21) {
+              } catch (e19) {
               }
               if (hasProcessedThumbnails) {
                 await deleteLocalThumbnails(newKey);
@@ -1016,7 +1107,7 @@ async function handleMoveStream(request) {
               }
               try {
                 await _fs.promises.access(absolutePath);
-              } catch (e22) {
+              } catch (e20) {
                 errors.push(`${itemName} not found`);
                 continue;
               }
@@ -1024,7 +1115,7 @@ async function handleMoveStream(request) {
                 await _fs.promises.access(newAbsolutePath);
                 errors.push(`${itemName} already exists in destination`);
                 continue;
-              } catch (e23) {
+              } catch (e21) {
               }
               await _fs.promises.rename(absolutePath, newAbsolutePath);
               const stats = await _fs.promises.stat(newAbsolutePath);
@@ -1037,7 +1128,7 @@ async function handleMoveStream(request) {
                   await _fs.promises.mkdir(_path2.default.dirname(newThumbPath), { recursive: true });
                   try {
                     await _fs.promises.rename(oldThumbPath, newThumbPath);
-                  } catch (e24) {
+                  } catch (e22) {
                   }
                 }
                 delete meta[oldKey];
@@ -1142,7 +1233,7 @@ async function handleSync(request) {
           const originalLocalPath = _path2.default.join(process.cwd(), "public", imageKey);
           try {
             originalBuffer = await _fs.promises.readFile(originalLocalPath);
-          } catch (e25) {
+          } catch (e23) {
             errors.push(`Original file not found: ${imageKey}`);
             continue;
           }
@@ -1170,7 +1261,7 @@ async function handleSync(request) {
                 })
               );
               urlsToPurge.push(`${publicUrl}${thumbPath}`);
-            } catch (e26) {
+            } catch (e24) {
             }
           }
         }
@@ -1181,12 +1272,12 @@ async function handleSync(request) {
             const localPath = _path2.default.join(process.cwd(), "public", thumbPath);
             try {
               await _fs.promises.unlink(localPath);
-            } catch (e27) {
+            } catch (e25) {
             }
           }
           try {
             await _fs.promises.unlink(originalLocalPath);
-          } catch (e28) {
+          } catch (e26) {
           }
         }
         pushed.push(imageKey);
@@ -1235,7 +1326,7 @@ async function handleReprocess(request) {
         const originalPath = _path2.default.join(process.cwd(), "public", imageKey);
         try {
           buffer = await _fs.promises.readFile(originalPath);
-        } catch (e29) {
+        } catch (e27) {
           if (isInOurR2) {
             buffer = await downloadFromCdn(imageKey);
             const dir = _path2.default.dirname(originalPath);
@@ -1261,7 +1352,7 @@ async function handleReprocess(request) {
           await deleteLocalThumbnails(imageKey);
           try {
             await _fs.promises.unlink(originalPath);
-          } catch (e30) {
+          } catch (e28) {
           }
         } else if (isRemote) {
         }
@@ -1381,7 +1472,7 @@ async function handleProcessAllStream() {
               await deleteLocalThumbnails(key);
               try {
                 await _fs.promises.unlink(fullPath);
-              } catch (e31) {
+              } catch (e29) {
               }
             }
             processed.push(key.slice(1));
@@ -1420,13 +1511,13 @@ async function handleProcessAllStream() {
                 }
               }
             }
-          } catch (e32) {
+          } catch (e30) {
           }
         }
         const imagesDir = _path2.default.join(process.cwd(), "public", "images");
         try {
           await findOrphans(imagesDir);
-        } catch (e33) {
+        } catch (e31) {
         }
         async function removeEmptyDirs(dir) {
           try {
@@ -1444,13 +1535,13 @@ async function handleProcessAllStream() {
               await _fs.promises.rmdir(dir);
             }
             return isEmpty;
-          } catch (e34) {
+          } catch (e32) {
             return true;
           }
         }
         try {
           await removeEmptyDirs(imagesDir);
-        } catch (e35) {
+        } catch (e33) {
         }
         await saveMeta(meta);
         if (urlsToPurge.length > 0) {
@@ -1518,7 +1609,7 @@ async function handleScanStream() {
                 allFiles.push({ relativePath: relPath, fullPath });
               }
             }
-          } catch (e36) {
+          } catch (e34) {
           }
         }
         const publicDir = _path2.default.join(process.cwd(), "public");
@@ -1577,7 +1668,7 @@ async function handleScanStream() {
                     o: { w: metadata.width || 0, h: metadata.height || 0 },
                     b: blurhash
                   };
-                } catch (e37) {
+                } catch (e35) {
                   meta[imageKey] = { o: { w: 0, h: 0 } };
                 }
               }
@@ -1617,13 +1708,13 @@ async function handleScanStream() {
                 }
               }
             }
-          } catch (e38) {
+          } catch (e36) {
           }
         }
         const imagesDir = _path2.default.join(process.cwd(), "public", "images");
         try {
           await findOrphans(imagesDir);
-        } catch (e39) {
+        } catch (e37) {
         }
         await saveMeta(meta);
         sendEvent({
@@ -1690,13 +1781,13 @@ async function handleDeleteOrphans(request) {
           await _fs.promises.rmdir(dir);
         }
         return isEmpty;
-      } catch (e40) {
+      } catch (e38) {
         return true;
       }
     }
     try {
       await removeEmptyDirs(imagesDir);
-    } catch (e41) {
+    } catch (e39) {
     }
     return _server.NextResponse.json({
       success: true,