@gallop.software/studio 1.5.2 → 1.5.4

package/dist/handlers/index.mjs

@@ -2,7 +2,7 @@ import {
   getAllThumbnailPaths,
   getThumbnailPath,
   isProcessed
-} from "../chunk-FOKLOMKO.mjs";
+} from "../chunk-TRYWHLJ2.mjs";
 
 // src/handlers/index.ts
 import { NextResponse as NextResponse6 } from "next/server";
@@ -343,19 +343,25 @@ function getExistingThumbnails(originalPath, entry) {
   }
   return thumbnails;
 }
-function countCloudAndLocal(folderPrefix, fileEntries) {
+function countFileTypes(folderPrefix, fileEntries, cdnUrls, r2PublicUrl) {
   let cloudCount = 0;
+  let remoteCount = 0;
   let localCount = 0;
   for (const [key, entry] of fileEntries) {
     if (key.startsWith(folderPrefix)) {
       if (entry.c !== void 0) {
-        cloudCount++;
+        const cdnUrl = cdnUrls[entry.c];
+        if (cdnUrl === r2PublicUrl) {
+          cloudCount++;
+        } else {
+          remoteCount++;
+        }
       } else {
         localCount++;
       }
     }
   }
-  return { cloudCount, localCount };
+  return { cloudCount, remoteCount, localCount };
 }
 async function handleList(request) {
   const searchParams = request.nextUrl.searchParams;
@@ -477,6 +483,7 @@ async function handleList(request) {
             const folderPath = relativePath ? `public/${relativePath}/${entry.name}` : `public/${entry.name}`;
             let fileCount = 0;
             let cloudCount = 0;
+            let remoteCount = 0;
             let localCount = 0;
             if (isImagesFolder) {
               for (const [key, metaEntry] of fileEntries) {
@@ -489,8 +496,9 @@ async function handleList(request) {
               for (const k of metaKeys) {
                 if (k.startsWith(folderPrefix)) fileCount++;
               }
-              const counts = countCloudAndLocal(folderPrefix, fileEntries);
+              const counts = countFileTypes(folderPrefix, fileEntries, cdnUrls, r2PublicUrl);
               cloudCount = counts.cloudCount;
+              remoteCount = counts.remoteCount;
               localCount = counts.localCount;
             }
             items.push({
@@ -499,6 +507,7 @@ async function handleList(request) {
               type: "folder",
               fileCount,
               cloudCount,
+              remoteCount,
               localCount,
               isProtected: isImagesFolder
             });
@@ -542,13 +551,14 @@ async function handleList(request) {
           for (const k of metaKeys) {
             if (k.startsWith(folderPrefix)) fileCount++;
           }
-          const counts = countCloudAndLocal(folderPrefix, fileEntries);
+          const counts = countFileTypes(folderPrefix, fileEntries, cdnUrls, r2PublicUrl);
           items.push({
             name: folderName,
             path: relativePath ? `public/${relativePath}/${folderName}` : `public/${folderName}`,
             type: "folder",
             fileCount,
             cloudCount: counts.cloudCount,
+            remoteCount: counts.remoteCount,
             localCount: counts.localCount,
             isProtected: isInsideImagesFolder
           });