Extend logic to resolve download MIMEtype by also looking at file ext…

…ension
duckduckgo · Oct 16, 2024 · 8a359fb · 8a359fb
1 parent 83cdecf
commit 8a359fb
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 4 deletions.
diff --git a/DuckDuckGo/DownloadMetadata.swift b/DuckDuckGo/DownloadMetadata.swift
@@ -32,7 +32,7 @@ struct DownloadMetadata {
         self.filename = filename
         self.expectedContentLength = response.expectedContentLength
         self.mimeTypeSource = response.mimeType ?? ""
-        self.mimeType = MIMEType(from: response.mimeType)
+        self.mimeType = MIMEType(from: response.mimeType, fileExtension: filename.pathExtension)
         self.url = url
     }
 }
diff --git a/DuckDuckGo/MIMEType.swift b/DuckDuckGo/MIMEType.swift
@@ -33,7 +33,17 @@ enum MIMEType: String {
     init(from string: String?) {
         self = MIMEType(rawValue: string ?? "") ?? .unknown
     }
-
+
+    init(from string: String?, fileExtension: String?) {
+        let initialMIMEType = MIMEType(from: string)
+
+        switch (initialMIMEType, fileExtension) {
+        case (.octetStream, "pkpass"): self = .passbook
+        case (.octetStream, "pkpasses"): self = .multipass
+        default: self = initialMIMEType
+        }
+    }
+
     var isHTML: Bool {
         switch self {
         case .html, .xhtml:

diff --git a/DuckDuckGo/TabViewController.swift b/DuckDuckGo/TabViewController.swift
@@ -1309,7 +1309,7 @@ extension TabViewController: WKNavigationDelegate {
                  decidePolicyFor navigationResponse: WKNavigationResponse,
                  decisionHandler: @escaping (WKNavigationResponsePolicy) -> Void) {
 
-        let mimeType = MIMEType(from: navigationResponse.response.mimeType)
+        let mimeType = MIMEType(from: navigationResponse.response.mimeType, fileExtension: navigationResponse.response.url?.pathExtension)
         let urlSchemeType = navigationResponse.response.url.map { SchemeHandler.schemeType(for: $0) } ?? .unknown
 
         let httpResponse = navigationResponse.response as? HTTPURLResponse
@@ -1369,7 +1369,7 @@ extension TabViewController: WKNavigationDelegate {
     }
 
     private func shouldTriggerDownloadAction(for navigationResponse: WKNavigationResponse) -> Bool {
-        let mimeType = MIMEType(from: navigationResponse.response.mimeType)
+        let mimeType = MIMEType(from: navigationResponse.response.mimeType, fileExtension: navigationResponse.response.url?.pathExtension)
         let httpResponse = navigationResponse.response as? HTTPURLResponse
 
         // HTTP response has "Content-Disposition: attachment" header