fix: resolve PR review issues - inject platform.js, remove duplicate, improve cleanup

github-actions[bot] · gupsammy · github-actions[bot] · commit 4494b680489a · 2025-11-28T08:17:06.000Z
- Add lib/platform.js to popup.js injection list (fixes missing rewriteImagePaths)
- Remove duplicate rewriteImagePaths() from content-script.js (use platform.js version)
- Improve listener cleanup in background.js with clearTimeout

Co-authored-by: Samarth Gupta &lt;gupsammy@users.noreply.github.com&gt;
diff --git a/background.js b/background.js
@@ -100,10 +100,12 @@ function downloadImage(imageUrl, savePath) {
         }
 
         // Listen for download completion to get the actual file path
+        let timeoutId = null;
         const listener = (delta) => {
           if (delta.id !== downloadId) return;
 
           if (delta.state && delta.state.current === 'complete') {
+            clearTimeout(timeoutId);
             chrome.downloads.onChanged.removeListener(listener);
             // Get the actual file path
             chrome.downloads.search({ id: downloadId }, (results) => {
@@ -118,6 +120,7 @@ function downloadImage(imageUrl, savePath) {
               }
             });
           } else if (delta.state && delta.state.current === 'interrupted') {
+            clearTimeout(timeoutId);
             chrome.downloads.onChanged.removeListener(listener);
             resolve({ success: false, originalUrl: imageUrl });
           }
@@ -126,7 +129,7 @@ function downloadImage(imageUrl, savePath) {
         chrome.downloads.onChanged.addListener(listener);
 
         // Timeout after 30 seconds
-        setTimeout(() => {
+        timeoutId = setTimeout(() => {
           chrome.downloads.onChanged.removeListener(listener);
           resolve({ success: false, originalUrl: imageUrl, error: 'timeout' });
         }, 30000);
diff --git a/content-script.js b/content-script.js
@@ -1,20 +1,5 @@
-// This script is injected after the lib scripts (readability, turndown, ezycopy)
-// extractContent(), extractContentWithImages(), and generateFilename() are available from lib/ezycopy.js
-
-/**
- * Rewrite image URLs in markdown with local file paths
- */
-function rewriteImagePaths(markdown, urlToPathMap) {
-  let result = markdown;
-
-  for (const [originalUrl, localPath] of Object.entries(urlToPathMap)) {
-    const escapedUrl = originalUrl.replace(/[.*+?^${}()|[\]\\]/g, '\\$&');
-    const regex = new RegExp(`(!\\[[^\\]]*\\]\\()${escapedUrl}((?:\\s+"[^"]*")?\\))`, 'g');
-    result = result.replace(regex, `$1${localPath}$2`);
-  }
-
-  return result;
-}
+// This script is injected after the lib scripts (readability, turndown, ezycopy, platform)
+// extractContent(), extractContentWithImages(), generateFilename(), and rewriteImagePaths() are available from lib/
 
 /**
  * Build success message based on actions performed
diff --git a/popup.js b/popup.js
@@ -96,6 +96,7 @@ document.addEventListener("DOMContentLoaded", async function () {
           "lib/turndown.js",
           "lib/turndown-plugin-gfm.js",
           "lib/ezycopy.js",
+          "lib/platform.js",
           "content-script.js",
         ],
       });
