fix(Downloader): content-type was taking the precedence over http

content-disposition header (Fixes #2664)
edrlab · Nov 18, 2024 · def34e9 · def34e9
1 parent b5d1e74
commit def34e9
Showing 1 changed file with 16 additions and 6 deletions.
diff --git a/src/main/redux/sagas/downloader.ts b/src/main/redux/sagas/downloader.ts
@@ -286,29 +286,39 @@ function downloadCreateFilename(contentType: string | undefined, contentDisposit
 
     const defExt = "unknown-ext";
 
-    let filename = "file." + defExt;
+    const filename = "file." + defExt;
 
+    let contentTypeFilename = "";
+    // type href link from opds feed take precedence on http header content-type !?!
     if (type) {
         contentType = type;
     }
     if (contentType) {
         const typeValues = contentType.replace(/\s/g, "").split(";");
         const [ext] = typeValues.map((v) => findExtWithMimeType(v)).filter((v) => v);
         if (ext) {
-            filename = "file." + ext;
-            return filename;
+            contentTypeFilename = "file." + ext;
         }
     }
+
+    let contentDispositionFilename = "";
     if (contentDisposition) {
         const res = /filename=(\"(.*)\"|(.*))/g.exec(contentDisposition);
         const filenameInCD = res ? res[2] || res[3] || "" : "";
         if (acceptedExtension(path.extname(filenameInCD))) {
-            filename = filenameInCD;
-            return filename;
+            contentDispositionFilename = filenameInCD;
         }
     }
 
-    return filename;
+    if (contentDispositionFilename && contentDispositionFilename &&
+        path.extname(contentDispositionFilename) === path.extname(contentTypeFilename)
+    ) {
+        debug("contentType and contentDisposition have the same extension ! Good catch !");
+    } else {
+        debug("contentType and contentDisposition does not have the same extension ! Server stream !?!");
+    }
+
+    return contentDispositionFilename || contentTypeFilename || filename;
 }
 
 interface IDownloadProgression {