Fixed: Allow files to be moved from Torrent Blackhole even when remove is disabled

(cherry picked from commit f739fd0900695e2ff312d13985c87d84ae00ea75)
develop
Mark McDowall 1 week ago committed by Bogdan
parent 8d32a532e4
commit abe0090f94

@ -123,7 +123,7 @@ namespace NzbDrone.Core.Test.Download.DownloadClientTests.Blackhole
VerifyCompleted(result); VerifyCompleted(result);
result.CanBeRemoved.Should().BeFalse(); result.CanBeRemoved.Should().BeTrue();
result.CanMoveFiles.Should().BeFalse(); result.CanMoveFiles.Should().BeFalse();
} }

@ -102,9 +102,8 @@ namespace NzbDrone.Core.Download.Clients.Blackhole
Status = item.Status Status = item.Status
}; };
queueItem.CanMoveFiles = queueItem.CanBeRemoved = queueItem.CanMoveFiles = !Settings.ReadOnly;
queueItem.DownloadClientInfo.RemoveCompletedDownloads && queueItem.CanBeRemoved = queueItem.DownloadClientInfo.RemoveCompletedDownloads;
!Settings.ReadOnly;
yield return queueItem; yield return queueItem;
} }

@ -57,7 +57,7 @@ namespace NzbDrone.Core.Download.Clients.Blackhole
{ {
foreach (var item in _scanWatchFolder.GetItems(Settings.WatchFolder, ScanGracePeriod)) foreach (var item in _scanWatchFolder.GetItems(Settings.WatchFolder, ScanGracePeriod))
{ {
yield return new DownloadClientItem var queueItem = new DownloadClientItem
{ {
DownloadClientInfo = DownloadClientItemClientInfo.FromDownloadClient(this, false), DownloadClientInfo = DownloadClientItemClientInfo.FromDownloadClient(this, false),
DownloadId = Definition.Name + "_" + item.DownloadId, DownloadId = Definition.Name + "_" + item.DownloadId,
@ -70,10 +70,12 @@ namespace NzbDrone.Core.Download.Clients.Blackhole
OutputPath = item.OutputPath, OutputPath = item.OutputPath,
Status = item.Status, Status = item.Status,
CanBeRemoved = true,
CanMoveFiles = true
}; };
queueItem.CanMoveFiles = true;
queueItem.CanBeRemoved = queueItem.DownloadClientInfo.RemoveCompletedDownloads;
yield return queueItem;
} }
} }

Loading…
Cancel
Save