From abe0090f94380a3dcda39077ebf65f968d6a6fd8 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 (cherry picked from commit f739fd0900695e2ff312d13985c87d84ae00ea75) --- .../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 6b09201cf..36bb07540 100644 --- a/src/NzbDrone.Core.Test/Download/DownloadClientTests/Blackhole/TorrentBlackholeFixture.cs +++ b/src/NzbDrone.Core.Test/Download/DownloadClientTests/Blackhole/TorrentBlackholeFixture.cs @@ -123,7 +123,7 @@ namespace NzbDrone.Core.Test.Download.DownloadClientTests.Blackhole 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 22ed44a40..27e2560ec 100644 --- a/src/NzbDrone.Core/Download/Clients/Blackhole/TorrentBlackhole.cs +++ b/src/NzbDrone.Core/Download/Clients/Blackhole/TorrentBlackhole.cs @@ -102,9 +102,8 @@ namespace NzbDrone.Core.Download.Clients.Blackhole 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 aedbc03c1..279ef6fcd 100644 --- a/src/NzbDrone.Core/Download/Clients/Blackhole/UsenetBlackhole.cs +++ b/src/NzbDrone.Core/Download/Clients/Blackhole/UsenetBlackhole.cs @@ -57,7 +57,7 @@ namespace NzbDrone.Core.Download.Clients.Blackhole { 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, @@ -70,10 +70,12 @@ namespace NzbDrone.Core.Download.Clients.Blackhole OutputPath = item.OutputPath, Status = item.Status, - - CanBeRemoved = true, - CanMoveFiles = true }; + + queueItem.CanMoveFiles = true; + queueItem.CanBeRemoved = queueItem.DownloadClientInfo.RemoveCompletedDownloads; + + yield return queueItem; } }