Don't save extraneous torrent files if download script is enabled

mipstian · Apr 1, 2021 · 5b68087 · 5b68087
1 parent 448edc0
commit 5b68087
Show file tree

Hide file tree

Showing 7 changed files with 23 additions and 7 deletions.
diff --git a/Catch.xcodeproj/project.pbxproj b/Catch.xcodeproj/project.pbxproj
@@ -761,7 +761,7 @@
 				CODE_SIGN_IDENTITY = "";
 				COMBINE_HIDPI_IMAGES = YES;
 				COPY_PHASE_STRIP = NO;
-				CURRENT_PROJECT_VERSION = 709;
+				CURRENT_PROJECT_VERSION = 711;
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
 				ENABLE_TESTABILITY = YES;
 				FRAMEWORK_SEARCH_PATHS = (
@@ -826,7 +826,7 @@
 				CODE_SIGN_IDENTITY = "Mac Developer";
 				COMBINE_HIDPI_IMAGES = YES;
 				COPY_PHASE_STRIP = NO;
-				CURRENT_PROJECT_VERSION = 709;
+				CURRENT_PROJECT_VERSION = 711;
 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
 				ENABLE_NS_ASSERTIONS = NO;
 				ENABLE_STRICT_OBJC_MSGSEND = YES;

diff --git a/Sources/App/Defaults.swift b/Sources/App/Defaults.swift
@@ -148,10 +148,12 @@ final class Defaults: NSObject {
   var downloadOptions: DownloadOptions? {
     guard let torrentsSavePath = torrentsSavePath else { return nil }
 
+    // Disable downloading any files if the download script is enabled.
     return DownloadOptions(
       containerDirectory: torrentsSavePath,
       shouldOrganizeByShow: shouldOrganizeTorrentsByShow,
-      shouldSaveMagnetLinks: !shouldOpenTorrentsAutomatically
+      shouldSaveMagnetLinks: !shouldOpenTorrentsAutomatically && !isDownloadScriptEnabled,
+      shouldSaveTorrentFiles: !isDownloadScriptEnabled
     )
   }
 

diff --git a/Sources/App/FeedHelperProxy.swift b/Sources/App/FeedHelperProxy.swift
@@ -44,6 +44,7 @@ final class FeedHelperProxy {
       downloadingToBookmark: downloadOptions.containerDirectoryBookmark,
       organizingByShow: downloadOptions.shouldOrganizeByShow,
       savingMagnetLinks: downloadOptions.shouldSaveMagnetLinks,
+      savingTorrentFiles: downloadOptions.shouldSaveTorrentFiles,
       skippingURLs: previouslyDownloadedURLs.map { $0.absoluteString },
       withReply: { downloadedEpisodes, error in
         DispatchQueue.main.async {
@@ -87,6 +88,7 @@ final class FeedHelperProxy {
       toBookmark: downloadOptions.containerDirectoryBookmark,
       organizingByShow: downloadOptions.shouldOrganizeByShow,
       savingMagnetLinks: downloadOptions.shouldSaveMagnetLinks,
+      savingTorrentFiles: downloadOptions.shouldSaveTorrentFiles,
       withReply: { downloadedFile, error in
         DispatchQueue.main.async {
           switch (downloadedFile, error) {

diff --git a/Sources/Feed Helper/EpisodeDownloader.swift b/Sources/Feed Helper/EpisodeDownloader.swift
@@ -22,7 +22,8 @@ struct EpisodeDownloader {
 
       // Return the magnet link, if needed the main app will open it on the fly
       return DownloadedEpisode(episode: episode, localURL: nil)
-    } else {
+    } else if downloadOptions.shouldSaveTorrentFiles {
+      // Treat episode url as torrent file and download
       let downloadedTorrentFile: URL
       do {
         downloadedTorrentFile = try downloadTorrentFile(for: episode)
@@ -32,6 +33,9 @@ struct EpisodeDownloader {
       }
 
       return DownloadedEpisode(episode: episode, localURL: downloadedTorrentFile)
+    } else {
+      // Treat episode url agnostically, just return it
+      return DownloadedEpisode(episode: episode, localURL: nil)
     }
   }
 

diff --git a/Sources/Feed Helper/Service.swift b/Sources/Feed Helper/Service.swift
@@ -11,6 +11,7 @@ extension Service: FeedHelperService {
     downloadingToBookmark downloadDirectoryBookmark: Data,
     organizingByShow shouldOrganizeByShow: Bool,
     savingMagnetLinks shouldSaveMagnetLinks: Bool,
+    savingTorrentFiles shouldSaveTorrentFiles: Bool,
     skippingURLs previouslyDownloadedURLs: [String],
     withReply reply: @escaping (_ downloadedFeedFiles: [[AnyHashable:Any]]?, _ error: Error?) -> Void) {
     let downloadedEpisodes: [DownloadedEpisode]
@@ -19,7 +20,8 @@ extension Service: FeedHelperService {
       let downloadOptions = try DownloadOptions(
         containerDirectoryBookmark: downloadDirectoryBookmark,
         shouldOrganizeByShow: shouldOrganizeByShow,
-        shouldSaveMagnetLinks: shouldSaveMagnetLinks
+        shouldSaveMagnetLinks: shouldSaveMagnetLinks,
+        shouldSaveTorrentFiles: shouldSaveTorrentFiles
       )
 
       downloadedEpisodes = try FeedHelper.checkFeeds(
@@ -55,14 +57,16 @@ extension Service: FeedHelperService {
     toBookmark downloadDirectoryBookmark: Data,
     organizingByShow shouldOrganizeByShow: Bool,
     savingMagnetLinks shouldSaveMagnetLinks: Bool,
+    savingTorrentFiles shouldSaveTorrentFiles: Bool,
     withReply reply: @escaping (_ downloadedFile: [AnyHashable:Any]?, _ error: Error?) -> Void) {
     let downloadedFile: DownloadedEpisode
 
     do {
       let downloadOptions = try DownloadOptions(
         containerDirectoryBookmark: downloadDirectoryBookmark,
         shouldOrganizeByShow: shouldOrganizeByShow,
-        shouldSaveMagnetLinks: shouldSaveMagnetLinks
+        shouldSaveMagnetLinks: shouldSaveMagnetLinks,
+        shouldSaveTorrentFiles: shouldSaveTorrentFiles
       )
 
       downloadedFile = try FeedHelper.download(

diff --git a/Sources/Shared/DownloadOptions.swift b/Sources/Shared/DownloadOptions.swift
@@ -5,6 +5,7 @@ struct DownloadOptions {
   var containerDirectory: URL
   var shouldOrganizeByShow: Bool
   var shouldSaveMagnetLinks: Bool
+  var shouldSaveTorrentFiles: Bool
 }
 
 
@@ -18,10 +19,11 @@ extension DownloadOptions {
 
 // Deserialization
 extension DownloadOptions {
-  init(containerDirectoryBookmark: Data, shouldOrganizeByShow: Bool, shouldSaveMagnetLinks: Bool) throws {
+  init(containerDirectoryBookmark: Data, shouldOrganizeByShow: Bool, shouldSaveMagnetLinks: Bool, shouldSaveTorrentFiles: Bool) throws {
     containerDirectory = try URL(sandboxBookmark: containerDirectoryBookmark)
 
     self.shouldOrganizeByShow = shouldOrganizeByShow
     self.shouldSaveMagnetLinks = shouldSaveMagnetLinks
+    self.shouldSaveTorrentFiles = shouldSaveTorrentFiles
   }
 }
diff --git a/Sources/Shared/FeedHelperService.swift b/Sources/Shared/FeedHelperService.swift
@@ -10,6 +10,7 @@ let feedHelperErrorDomain = "com.giorgiocalderolla.Catch.CatchFeedHelper"
     downloadingToBookmark downloadDirectoryBookmark: Data,
     organizingByShow shouldOrganizeByShow: Bool,
     savingMagnetLinks shouldSaveMagnetLinks: Bool,
+    savingTorrentFiles shouldSaveTorrentFiles: Bool,
     skippingURLs previouslyDownloadedURLs: [String],
     withReply reply: @escaping (_ downloadedFeedFiles: [[AnyHashable:Any]]?, _ error: Error?) -> Void
   )
@@ -24,6 +25,7 @@ let feedHelperErrorDomain = "com.giorgiocalderolla.Catch.CatchFeedHelper"
     toBookmark downloadDirectoryBookmark: Data,
     organizingByShow shouldOrganizeByShow: Bool,
     savingMagnetLinks shouldSaveMagnetLinks: Bool,
+    savingTorrentFiles shouldSaveTorrentFiles: Bool,
     withReply reply: @escaping (_ downloadedFile: [AnyHashable:Any]?, _ error: Error?) -> Void
   )
 }