@gallop.software/studio 2.3.80 → 2.3.82

package/dist/server/index.js

@@ -454,7 +454,10 @@ function streamResponse(stream, init) {
 function getExistingThumbnails(originalPath, entry) {
   const thumbnails = [];
   if (entry.f) {
-    thumbnails.push({ path: getThumbnailPath(originalPath, "full"), size: "f" });
+    thumbnails.push({
+      path: getThumbnailPath(originalPath, "full"),
+      size: "f"
+    });
   }
   if (entry.lg) {
     thumbnails.push({ path: getThumbnailPath(originalPath, "lg"), size: "lg" });
@@ -519,7 +522,9 @@ async function handleList(request) {
       }
       for (const thumb of allThumbnails) {
         const thumbRelative = thumb.path.replace(/^\/images\/?/, "");
-        const originalEntry = fileEntries.find(([k]) => k === thumb.originalKey)?.[1];
+        const originalEntry = fileEntries.find(
+          ([k]) => k === thumb.originalKey
+        )?.[1];
         const cdnIndex = originalEntry?.c;
         const cdnBaseUrl = cdnIndex !== void 0 ? cdnUrls[cdnIndex] : void 0;
         const thumbnailUrl = cdnBaseUrl ? `${cdnBaseUrl}${thumb.path}` : thumb.path;
@@ -582,7 +587,8 @@ async function handleList(request) {
             }
           }
         } else {
-          if (!thumbRelative.startsWith(imagesSubPath + "/") && thumbRelative !== imagesSubPath) continue;
+          if (!thumbRelative.startsWith(imagesSubPath + "/") && thumbRelative !== imagesSubPath)
+            continue;
           const remaining = thumbRelative.slice(imagesSubPath.length + 1);
           if (!remaining) continue;
           const slashIndex = remaining.indexOf("/");
@@ -658,10 +664,16 @@ async function handleList(request) {
             if (isImagesFolder) {
               for (const [key, metaEntry] of fileEntries) {
                 if (isProcessed(metaEntry)) {
-                  const thumbCount = getExistingThumbnails(key, metaEntry).length;
+                  const thumbCount = getExistingThumbnails(
+                    key,
+                    metaEntry
+                  ).length;
                   fileCount += thumbCount;
                   if (metaEntry.c !== void 0) {
-                    const entryCdnUrl = cdnUrls[metaEntry.c]?.replace(/\/?$/, "");
+                    const entryCdnUrl = cdnUrls[metaEntry.c]?.replace(
+                      /\/?$/,
+                      ""
+                    );
                     if (r2PublicUrl && entryCdnUrl === r2PublicUrl) {
                       cloudCount += thumbCount;
                     } else {
@@ -677,7 +689,12 @@ async function handleList(request) {
               for (const k of metaKeys) {
                 if (k.startsWith(folderPrefix)) fileCount++;
               }
-              const counts = countFileTypes(folderPrefix, fileEntries, cdnUrls, r2PublicUrl);
+              const counts = countFileTypes(
+                folderPrefix,
+                fileEntries,
+                cdnUrls,
+                r2PublicUrl
+              );
               cloudCount = counts.cloudCount;
               remoteCount = counts.remoteCount;
               localCount = counts.localCount;
@@ -751,7 +768,12 @@ async function handleList(request) {
           for (const k of metaKeys) {
             if (k.startsWith(folderPrefix)) fileCount++;
           }
-          const counts = countFileTypes(folderPrefix, fileEntries, cdnUrls, r2PublicUrl);
+          const counts = countFileTypes(
+            folderPrefix,
+            fileEntries,
+            cdnUrls,
+            r2PublicUrl
+          );
           items.push({
             name: folderName,
             path: relativePath ? `public/${relativePath}/${folderName}` : `public/${folderName}`,
@@ -776,23 +798,42 @@ async function handleList(request) {
         let fileSize;
         const entryIsProcessed = isProcessed(entry);
         if (isImage && entryIsProcessed) {
-          const thumbPath = getThumbnailPath(key, "sm");
-          if (isPushedToCloud && entry.c !== void 0) {
-            const cdnUrl = cdnUrls[entry.c];
-            if (cdnUrl) {
-              thumbnail = `${cdnUrl}${thumbPath}`;
-              hasThumbnail = true;
+          const hasSm = !!entry.sm;
+          const hasMd = !!entry.md;
+          const hasLg = !!entry.lg;
+          const hasFull = !!entry.f;
+          let thumbSize = null;
+          if (hasSm) thumbSize = "sm";
+          else if (hasMd) thumbSize = "md";
+          else if (hasLg) thumbSize = "lg";
+          else if (hasFull) thumbSize = "full";
+          if (thumbSize) {
+            const thumbPath = getThumbnailPath(key, thumbSize);
+            if (isPushedToCloud && entry.c !== void 0) {
+              const cdnUrl = cdnUrls[entry.c];
+              if (cdnUrl) {
+                thumbnail = `${cdnUrl}${thumbPath}`;
+                hasThumbnail = true;
+              }
+            } else {
+              const localThumbPath = getPublicPath(thumbPath);
+              try {
+                await fs4.access(localThumbPath);
+                thumbnail = thumbPath;
+                hasThumbnail = true;
+              } catch {
+                thumbnail = key;
+                hasThumbnail = false;
+              }
             }
           } else {
-            const localThumbPath = getPublicPath(thumbPath);
-            try {
-              await fs4.access(localThumbPath);
-              thumbnail = thumbPath;
-              hasThumbnail = true;
-            } catch {
+            if (isPushedToCloud && entry.c !== void 0) {
+              const cdnUrl = cdnUrls[entry.c];
+              thumbnail = cdnUrl ? `${cdnUrl}${key}` : key;
+            } else {
               thumbnail = key;
-              hasThumbnail = false;
             }
+            hasThumbnail = false;
           }
         } else if (isImage) {
           if (isPushedToCloud && entry.c !== void 0) {
@@ -868,23 +909,42 @@ async function handleSearch(request) {
       let hasThumbnail = false;
       const entryIsProcessed = isProcessed(entry);
       if (isImage && entryIsProcessed) {
-        const thumbPath = getThumbnailPath(key, "sm");
-        if (isPushedToCloud && entry.c !== void 0) {
-          const cdnUrl = cdnUrls[entry.c];
-          if (cdnUrl) {
-            thumbnail = `${cdnUrl}${thumbPath}`;
-            hasThumbnail = true;
+        const hasSm = !!entry.sm;
+        const hasMd = !!entry.md;
+        const hasLg = !!entry.lg;
+        const hasFull = !!entry.f;
+        let thumbSize = null;
+        if (hasSm) thumbSize = "sm";
+        else if (hasMd) thumbSize = "md";
+        else if (hasLg) thumbSize = "lg";
+        else if (hasFull) thumbSize = "full";
+        if (thumbSize) {
+          const thumbPath = getThumbnailPath(key, thumbSize);
+          if (isPushedToCloud && entry.c !== void 0) {
+            const cdnUrl = cdnUrls[entry.c];
+            if (cdnUrl) {
+              thumbnail = `${cdnUrl}${thumbPath}`;
+              hasThumbnail = true;
+            }
+          } else {
+            const localThumbPath = getPublicPath(thumbPath);
+            try {
+              await fs4.access(localThumbPath);
+              thumbnail = thumbPath;
+              hasThumbnail = true;
+            } catch {
+              thumbnail = key;
+              hasThumbnail = false;
+            }
           }
         } else {
-          const localThumbPath = getPublicPath(thumbPath);
-          try {
-            await fs4.access(localThumbPath);
-            thumbnail = thumbPath;
-            hasThumbnail = true;
-          } catch {
+          if (isPushedToCloud && entry.c !== void 0) {
+            const cdnUrl = cdnUrls[entry.c];
+            thumbnail = cdnUrl ? `${cdnUrl}${key}` : key;
+          } else {
             thumbnail = key;
-            hasThumbnail = false;
           }
+          hasThumbnail = false;
         }
       } else if (isImage) {
         if (isPushedToCloud && entry.c !== void 0) {
@@ -1016,7 +1076,10 @@ async function handleFolderImages(request) {
     });
   } catch (error) {
     console.error("Failed to get folder files:", error);
-    return jsonResponse({ error: "Failed to get folder files" }, { status: 500 });
+    return jsonResponse(
+      { error: "Failed to get folder files" },
+      { status: 500 }
+    );
   }
 }
 
@@ -4015,8 +4078,7 @@ async function handleGenerateFeaturedImage(request) {
           const meta = await loadMeta();
           const metaKey = `/${projectName}.jpg`;
           setMetaEntry(meta, metaKey, {
-            o: { w: width, h: height },
-            f: { w: width, h: height }
+            o: { w: width, h: height }
           });
           await saveMeta(meta);
           sendEvent({