Snapshot from scm.treehouse.uc/fs-v source correlation id:39ea017e-bb…

…e2-45b0-921e-75077c84a5e8; job:38861ad3-768f-43e0-9940-2519ce94f66a
unreadablewxy · May 16, 2020 · d8dd287 · d8dd287
1 parent cb866fa
commit d8dd287
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 10 deletions.
diff --git a/src/main/index.ts b/src/main/index.ts
@@ -40,6 +40,7 @@ function createWindow(): void {
 }
 
 function onReady(): void {
+    registerThumbnailProtocol();
     createWindow();
 }
 
@@ -60,6 +61,4 @@ app.on("activate", () => {
     // dock icon is clicked and there are no other windows open.
     if (mainWindow === null)
         createWindow();
-});
-
-registerThumbnailProtocol();
+});
diff --git a/src/main/thumbnail.linux.ts b/src/main/thumbnail.linux.ts
@@ -92,9 +92,15 @@ function handleThumbnailRequest(
     request: Request,
     callback: RequestCallback,
 ): void {
-    const suffixIndex = request.url.indexOf("?", 8);
-    const size = suffixIndex > 0 && request.url.slice(suffixIndex + 3);
-    const path = request.url.slice(8 /* len("thumb://") */, suffixIndex);
+    const prefixLength = 8; // len("thumb://")
+    let suffixOffset = request.url.indexOf("?", prefixLength);
+    let size: string | undefined;
+    if (suffixOffset > 0)
+        size = request.url.slice(suffixOffset + 3)
+    else
+        suffixOffset = request.url.length;
+
+    const path = request.url.slice(prefixLength, suffixOffset);
     const mimeType = getMimeType(path);
     if (!mimeType) return callback("");
 

diff --git a/src/main/thumbnail.win32.ts b/src/main/thumbnail.win32.ts
@@ -14,10 +14,16 @@ function handleThumbnailRequest(request: Request, complete: ResponseCallback): v
         return;
     }
 
-    const suffixIndex = request.url.indexOf("?", 8);
-    const size = suffixIndex > 0 && request.url.slice(suffixIndex + 3);
-    const resolution = resolutionMapping[size as ThumbnailResolution] || 256;
-    const requestPath = request.url.slice(8 /* len("thumb://") */, suffixIndex)
+    const prefixLength = 8; // len("thumb://")
+    let suffixOffset = request.url.indexOf("?", prefixLength);
+    let size: string | undefined;
+    if (suffixOffset > 0)
+        size = request.url.slice(suffixOffset + 3)
+    else
+        suffixOffset = request.url.length;
+
+    const resolution = resolutionMapping[size as ThumbnailResolution] || resolutionMapping.default;
+    const requestPath = request.url.slice(prefixLength, suffixOffset)
         .replace("/", "\\");
 
     getImageForPath(requestPath, {