Use macOS download folder instead of caches for downloads (#3659)

Author: bgoncal

Sources/App/WebView/DownloadManager/DownloadManagerView.swift

@@ -20,7 +20,11 @@ struct DownloadManagerView: View {
         }
         .onDisappear {
             viewModel.cancelDownload()
-            viewModel.deleteFile()
+
+            // For mac the file should remain in the download folder to keep expected behavior
+            if !Current.isCatalyst {
+                viewModel.deleteFile()
+            }
         }
         .onChange(of: viewModel.finished) { _, newValue in
             if newValue, Current.isCatalyst {

Sources/Shared/Environment/AppConstants.swift

@@ -229,16 +229,28 @@ public enum AppConstants {
     }
 
     public static var DownloadsDirectory: URL {
-        let fileManager = FileManager.default
-        let directoryURL = FileManager.default.urls(for: .cachesDirectory, in: .allDomainsMask).first!
-            .appendingPathComponent(
+        var directoryURL: URL = FileManager.default.urls(for: .cachesDirectory, in: .allDomainsMask).first!
+
+        // Save directly in macOS Downloads folder if running on Catalyst and allowed access to download folder when
+        // prompted.
+        if Current.isCatalyst, let macDownloadFolder = FileManager.default.urls(
+            for: .downloadsDirectory,
+            in: .userDomainMask
+        ).first {
+            directoryURL = macDownloadFolder
+        } else {
+            directoryURL = directoryURL.appendingPathComponent(
                 "Downloads",
                 isDirectory: true
             )
-
-        if !fileManager.fileExists(atPath: directoryURL.path) {
+        }
+        if !FileManager.default.fileExists(atPath: directoryURL.path) {
             do {
-                try fileManager.createDirectory(at: directoryURL, withIntermediateDirectories: true, attributes: nil)
+                try FileManager.default.createDirectory(
+                    at: directoryURL,
+                    withIntermediateDirectories: true,
+                    attributes: nil
+                )
             } catch {
                 fatalError("Error while attempting to create downloads path URL: \(error)")
             }