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

pull/7376/head
Mark McDowall 3 months ago committed by GitHub
parent 88f4016fe0
commit f739fd0900
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194

@ -118,7 +118,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();
} }

@ -104,9 +104,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;
} }

@ -59,7 +59,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,
@ -72,10 +72,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