From f739fd0900695e2ff312d13985c87d84ae00ea75 Mon Sep 17 00:00:00 2001 From: Mark McDowall Date: Thu, 14 Nov 2024 19:01:38 -0800 Subject: [PATCH] Fixed: Allow files to be moved from Torrent Blackhole even when remove is disabled --- .../Blackhole/TorrentBlackholeFixture.cs | 2 +- .../Download/Clients/Blackhole/TorrentBlackhole.cs | 5 ++--- .../Download/Clients/Blackhole/UsenetBlackhole.cs | 10 ++++++---- 3 files changed, 9 insertions(+), 8 deletions(-) diff --git a/src/NzbDrone.Core.Test/Download/DownloadClientTests/Blackhole/TorrentBlackholeFixture.cs b/src/NzbDrone.Core.Test/Download/DownloadClientTests/Blackhole/TorrentBlackholeFixture.cs index a5642ed29..cd7311505 100644 --- a/src/NzbDrone.Core.Test/Download/DownloadClientTests/Blackhole/TorrentBlackholeFixture.cs +++ b/src/NzbDrone.Core.Test/Download/DownloadClientTests/Blackhole/TorrentBlackholeFixture.cs @@ -118,7 +118,7 @@ public void completed_download_should_have_required_properties() VerifyCompleted(result); - result.CanBeRemoved.Should().BeFalse(); + result.CanBeRemoved.Should().BeTrue(); result.CanMoveFiles.Should().BeFalse(); } diff --git a/src/NzbDrone.Core/Download/Clients/Blackhole/TorrentBlackhole.cs b/src/NzbDrone.Core/Download/Clients/Blackhole/TorrentBlackhole.cs index eca8dc2f2..0e774f9a0 100644 --- a/src/NzbDrone.Core/Download/Clients/Blackhole/TorrentBlackhole.cs +++ b/src/NzbDrone.Core/Download/Clients/Blackhole/TorrentBlackhole.cs @@ -104,9 +104,8 @@ public override IEnumerable GetItems() Status = item.Status }; - queueItem.CanMoveFiles = queueItem.CanBeRemoved = - queueItem.DownloadClientInfo.RemoveCompletedDownloads && - !Settings.ReadOnly; + queueItem.CanMoveFiles = !Settings.ReadOnly; + queueItem.CanBeRemoved = queueItem.DownloadClientInfo.RemoveCompletedDownloads; yield return queueItem; } diff --git a/src/NzbDrone.Core/Download/Clients/Blackhole/UsenetBlackhole.cs b/src/NzbDrone.Core/Download/Clients/Blackhole/UsenetBlackhole.cs index e1eb75905..2e2b316c7 100644 --- a/src/NzbDrone.Core/Download/Clients/Blackhole/UsenetBlackhole.cs +++ b/src/NzbDrone.Core/Download/Clients/Blackhole/UsenetBlackhole.cs @@ -59,7 +59,7 @@ public override IEnumerable GetItems() { foreach (var item in _scanWatchFolder.GetItems(Settings.WatchFolder, ScanGracePeriod)) { - yield return new DownloadClientItem + var queueItem = new DownloadClientItem { DownloadClientInfo = DownloadClientItemClientInfo.FromDownloadClient(this, false), DownloadId = Definition.Name + "_" + item.DownloadId, @@ -72,10 +72,12 @@ public override IEnumerable GetItems() OutputPath = item.OutputPath, Status = item.Status, - - CanBeRemoved = true, - CanMoveFiles = true }; + + queueItem.CanMoveFiles = true; + queueItem.CanBeRemoved = queueItem.DownloadClientInfo.RemoveCompletedDownloads; + + yield return queueItem; } }