Fix only one server-rendered thumbnail working in submission menu

ajayyy · Oct 24, 2024 · 7e77404 · 7e77404
1 parent e118700
commit 7e77404
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 2 deletions.
diff --git a/src/dataFetching.ts b/src/dataFetching.ts
@@ -455,6 +455,10 @@ export async function waitForThumbnailCache(videoID: VideoID): Promise<void> {
     await activeRequest.currentRequest;
 }
 
+export function isActiveThumbnailCacheRequest(videoID: VideoID): boolean {
+    return !!activeThumbnailCacheRequests[videoID];
+}
+
 export function getNumberOfThumbnailCacheRequests(): number {
     return Object.keys(activeThumbnailCacheRequests).length;
 }

diff --git a/src/thumbnails/thumbnailRenderer.ts b/src/thumbnails/thumbnailRenderer.ts
@@ -1,6 +1,6 @@
 import { Format, fetchChannelnfo, fetchVideoMetadata, getPlaybackFormats, isLiveOrUpcoming } from "./thumbnailData";
 import { VideoID } from "../../maze-utils/src/video";
-import { getNumberOfThumbnailCacheRequests, getThumbnailUrl, getVideoThumbnailIncludingUnsubmitted, isFetchingFromThumbnailCache, queueThumbnailCacheRequest, waitForThumbnailCache } from "../dataFetching";
+import { getNumberOfThumbnailCacheRequests, getThumbnailUrl, getVideoThumbnailIncludingUnsubmitted, isActiveThumbnailCacheRequest, isFetchingFromThumbnailCache, queueThumbnailCacheRequest, waitForThumbnailCache } from "../dataFetching";
 import { log, logError } from "../utils/logger";
 import { BrandingLocation, ShowCustomBrandingInfo, getActualShowCustomBranding } from "../videoBranding/videoBranding";
 import { isFirefoxOrSafari, timeoutPomise, waitFor } from "../../maze-utils/src";
@@ -310,7 +310,16 @@ function handleThumbnailRenderFailure(videoID: VideoID, width: number, height: n
 
     if (!thumbnailFailed && Config.config!.thumbnailCacheUse !== ThumbnailCacheOption.Disable && !CompileConfig.debug) {
         // Force the thumbnail to be generated by the server
-        queueThumbnailCacheRequest(videoID, timestamp, undefined, false, true);
+        // Generate it one-by-one because of how callbacks are handled
+        (async () => {
+            let tries = 0;
+            while (isActiveThumbnailCacheRequest(videoID) && tries < 10) {
+                await waitForThumbnailCache(videoID);
+                tries++;
+            }
+
+            queueThumbnailCacheRequest(videoID, timestamp, undefined, false, true)
+        })().catch(logError);
 
         videoCache.failures.push({
             timestamp,