self-hosted/Sonarr
1
0
Fork 0
mirror of https://github.com/Sonarr/Sonarr.git synced 2024-12-23 02:05:27 +02:00
Code Issues Releases Activity

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

Browse Source
This commit is contained in:
Mark McDowall 2024-11-14 19:01:38 -08:00 committed by GitHub
parent 88f4016fe0
commit f739fd0900
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/NzbDrone.Core.Test/Download/DownloadClientTests/Blackhole/TorrentBlackholeFixture.cs
View File

@ -118,7 +118,7 @@ public void completed_download_should_have_required_properties()
VerifyCompleted(result); VerifyCompleted(result);
result.CanBeRemoved.Should().BeFalse(); result.CanBeRemoved.Should().BeTrue();
result.CanMoveFiles.Should().BeFalse(); result.CanMoveFiles.Should().BeFalse();
} }

5
src/NzbDrone.Core/Download/Clients/Blackhole/TorrentBlackhole.cs
View File

@ -104,9 +104,8 @@ public override IEnumerable<DownloadClientItem> GetItems()
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;
} }

10
src/NzbDrone.Core/Download/Clients/Blackhole/UsenetBlackhole.cs
View File

@ -59,7 +59,7 @@ public override IEnumerable<DownloadClientItem> GetItems()
{ {
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 @@ public override IEnumerable<DownloadClientItem> GetItems()
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;
} }
} }