@gallop.software/studio 1.0.0 → 1.0.2

package/dist/handlers/index.js

@@ -314,15 +314,25 @@ async function handleList(request) {
     try {
       const dirEntries = await _fs.promises.readdir(absoluteDir, { withFileTypes: true });
       for (const entry of dirEntries) {
-        if (entry.isDirectory() && !entry.name.startsWith(".")) {
+        if (entry.name.startsWith(".")) continue;
+        if (entry.isDirectory()) {
           if (!seenFolders.has(entry.name)) {
             seenFolders.add(entry.name);
             const isImagesFolder = entry.name === "images" && !relativePath;
             const folderPath = relativePath ? `public/${relativePath}/${entry.name}` : `public/${entry.name}`;
-            const folderPrefix = pathPrefix === "/" ? `/${entry.name}/` : `${pathPrefix}${entry.name}/`;
             let fileCount = 0;
-            for (const k of metaKeys) {
-              if (k.startsWith(folderPrefix)) fileCount++;
+            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) {
+              }
+            } else {
+              const folderPrefix = pathPrefix === "/" ? `/${entry.name}/` : `${pathPrefix}${entry.name}/`;
+              for (const k of metaKeys) {
+                if (k.startsWith(folderPrefix)) fileCount++;
+              }
             }
             items.push({
               name: entry.name,
@@ -332,9 +342,28 @@ async function handleList(request) {
               isProtected: isImagesFolder || isInsideImagesFolder
             });
           }
+        } 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 (e6) {
+    } catch (e8) {
     }
     if (fileEntries.length === 0 && items.length === 0) {
       return _server.NextResponse.json({ items: [], isEmpty: true });
@@ -385,7 +414,7 @@ async function handleList(request) {
               await _fs.promises.access(localThumbPath);
               thumbnail = thumbPath;
               hasThumbnail = true;
-            } catch (e7) {
+            } catch (e9) {
               thumbnail = key;
               hasThumbnail = false;
             }
@@ -404,7 +433,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 (e8) {
+          } catch (e10) {
           }
         }
         items.push({
@@ -465,7 +494,7 @@ async function handleSearch(request) {
             await _fs.promises.access(localThumbPath);
             thumbnail = thumbPath;
             hasThumbnail = true;
-          } catch (e9) {
+          } catch (e11) {
             thumbnail = key;
             hasThumbnail = false;
           }
@@ -521,7 +550,7 @@ async function handleListFolders() {
             await scanDir(_path2.default.join(dir, entry.name), folderRelPath);
           }
         }
-      } catch (e10) {
+      } catch (e12) {
       }
     }
     const publicDir = _path2.default.join(process.cwd(), "public");
@@ -662,7 +691,7 @@ async function handleUpload(request) {
           w: metadata.width || 0,
           h: metadata.height || 0
         };
-      } catch (e11) {
+      } catch (e13) {
         meta[imageKey] = { w: 0, h: 0 };
       }
     } else {
@@ -711,7 +740,7 @@ async function handleDelete(request) {
                     const absoluteThumbPath = _path2.default.join(process.cwd(), "public", thumbPath);
                     try {
                       await _fs.promises.unlink(absoluteThumbPath);
-                    } catch (e12) {
+                    } catch (e14) {
                     }
                   }
                 }
@@ -727,14 +756,14 @@ async function handleDelete(request) {
                   const absoluteThumbPath = _path2.default.join(process.cwd(), "public", thumbPath);
                   try {
                     await _fs.promises.unlink(absoluteThumbPath);
-                  } catch (e13) {
+                  } catch (e15) {
                   }
                 }
               }
               delete meta[imageKey];
             }
           }
-        } catch (e14) {
+        } catch (e16) {
           if (entry) {
             delete meta[imageKey];
           } else {
@@ -787,7 +816,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 (e15) {
+    } catch (e17) {
     }
     await _fs.promises.mkdir(folderPath, { recursive: true });
     return _server.NextResponse.json({ success: true, path: _path2.default.join(safePath, sanitizedName) });
@@ -815,13 +844,13 @@ async function handleRename(request) {
     }
     try {
       await _fs.promises.access(absoluteOldPath);
-    } catch (e16) {
+    } catch (e18) {
       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 (e17) {
+    } catch (e19) {
     }
     const stats = await _fs.promises.stat(absoluteOldPath);
     const isFile = stats.isFile();
@@ -843,7 +872,7 @@ async function handleRename(request) {
           await _fs.promises.mkdir(_path2.default.dirname(newThumbPath), { recursive: true });
           try {
             await _fs.promises.rename(oldThumbPath, newThumbPath);
-          } catch (e18) {
+          } catch (e20) {
           }
         }
         delete meta[oldKey];
@@ -958,7 +987,7 @@ async function handleMoveStream(request) {
               await deleteFromCdn(oldKey, hasProcessedThumbnails);
               try {
                 await _fs.promises.unlink(newAbsolutePath);
-              } catch (e19) {
+              } catch (e21) {
               }
               if (hasProcessedThumbnails) {
                 await deleteLocalThumbnails(newKey);
@@ -975,7 +1004,7 @@ async function handleMoveStream(request) {
               }
               try {
                 await _fs.promises.access(absolutePath);
-              } catch (e20) {
+              } catch (e22) {
                 errors.push(`${itemName} not found`);
                 continue;
               }
@@ -983,7 +1012,7 @@ async function handleMoveStream(request) {
                 await _fs.promises.access(newAbsolutePath);
                 errors.push(`${itemName} already exists in destination`);
                 continue;
-              } catch (e21) {
+              } catch (e23) {
               }
               await _fs.promises.rename(absolutePath, newAbsolutePath);
               const stats = await _fs.promises.stat(newAbsolutePath);
@@ -996,7 +1025,7 @@ async function handleMoveStream(request) {
                   await _fs.promises.mkdir(_path2.default.dirname(newThumbPath), { recursive: true });
                   try {
                     await _fs.promises.rename(oldThumbPath, newThumbPath);
-                  } catch (e22) {
+                  } catch (e24) {
                   }
                 }
                 delete meta[oldKey];
@@ -1098,7 +1127,7 @@ async function handleSync(request) {
           const originalLocalPath = _path2.default.join(process.cwd(), "public", imageKey);
           try {
             originalBuffer = await _fs.promises.readFile(originalLocalPath);
-          } catch (e23) {
+          } catch (e25) {
             errors.push(`Original file not found: ${imageKey}`);
             continue;
           }
@@ -1126,7 +1155,7 @@ async function handleSync(request) {
                 })
               );
               urlsToPurge.push(`${publicUrl}${thumbPath}`);
-            } catch (e24) {
+            } catch (e26) {
             }
           }
         }
@@ -1137,12 +1166,12 @@ async function handleSync(request) {
             const localPath = _path2.default.join(process.cwd(), "public", thumbPath);
             try {
               await _fs.promises.unlink(localPath);
-            } catch (e25) {
+            } catch (e27) {
             }
           }
           try {
             await _fs.promises.unlink(originalLocalPath);
-          } catch (e26) {
+          } catch (e28) {
           }
         }
         pushed.push(imageKey);
@@ -1188,7 +1217,7 @@ async function handleReprocess(request) {
         const originalPath = _path2.default.join(process.cwd(), "public", imageKey);
         try {
           buffer = await _fs.promises.readFile(originalPath);
-        } catch (e27) {
+        } catch (e29) {
           if (isInOurR2) {
             buffer = await downloadFromCdn(imageKey);
             const dir = _path2.default.dirname(originalPath);
@@ -1205,6 +1234,7 @@ async function handleReprocess(request) {
           }
         }
         const updatedEntry = await processImage(buffer, imageKey);
+        updatedEntry.p = 1;
         if (isInOurR2) {
           updatedEntry.c = existingCdnIndex;
           await uploadToCdn(imageKey);
@@ -1214,7 +1244,7 @@ async function handleReprocess(request) {
           await deleteLocalThumbnails(imageKey);
           try {
             await _fs.promises.unlink(originalPath);
-          } catch (e28) {
+          } catch (e30) {
           }
         } else if (isRemote) {
         }
@@ -1335,7 +1365,7 @@ async function handleProcessAllStream() {
               await deleteLocalThumbnails(key);
               try {
                 await _fs.promises.unlink(fullPath);
-              } catch (e29) {
+              } catch (e31) {
               }
             }
             processed.push(key.slice(1));
@@ -1374,13 +1404,13 @@ async function handleProcessAllStream() {
                 }
               }
             }
-          } catch (e30) {
+          } catch (e32) {
           }
         }
         const imagesDir = _path2.default.join(process.cwd(), "public", "images");
         try {
           await findOrphans(imagesDir);
-        } catch (e31) {
+        } catch (e33) {
         }
         async function removeEmptyDirs(dir) {
           try {
@@ -1398,13 +1428,13 @@ async function handleProcessAllStream() {
               await _fs.promises.rmdir(dir);
             }
             return isEmpty;
-          } catch (e32) {
+          } catch (e34) {
             return true;
           }
         }
         try {
           await removeEmptyDirs(imagesDir);
-        } catch (e33) {
+        } catch (e35) {
         }
         await saveMeta(meta);
         if (urlsToPurge.length > 0) {
@@ -1472,7 +1502,7 @@ async function handleScanStream() {
                 allFiles.push({ relativePath: relPath, fullPath });
               }
             }
-          } catch (e34) {
+          } catch (e36) {
           }
         }
         const publicDir = _path2.default.join(process.cwd(), "public");
@@ -1532,7 +1562,7 @@ async function handleScanStream() {
                     h: metadata.height || 0,
                     b: blurhash
                   };
-                } catch (e35) {
+                } catch (e37) {
                   meta[imageKey] = { w: 0, h: 0 };
                 }
               }
@@ -1572,13 +1602,13 @@ async function handleScanStream() {
                 }
               }
             }
-          } catch (e36) {
+          } catch (e38) {
           }
         }
         const imagesDir = _path2.default.join(process.cwd(), "public", "images");
         try {
           await findOrphans(imagesDir);
-        } catch (e37) {
+        } catch (e39) {
         }
         await saveMeta(meta);
         sendEvent({
@@ -1645,13 +1675,13 @@ async function handleDeleteOrphans(request) {
           await _fs.promises.rmdir(dir);
         }
         return isEmpty;
-      } catch (e38) {
+      } catch (e40) {
         return true;
       }
     }
     try {
       await removeEmptyDirs(imagesDir);
-    } catch (e39) {
+    } catch (e41) {
     }
     return _server.NextResponse.json({
       success: true,