tedkulp/Readarr
1
0
Fork 0
mirror of https://github.com/Readarr/Readarr.git synced 2026-04-24 22:35:39 -04:00
Code Issues Projects Releases Wiki Activity

Fixed: Imported downloads not being removed when seeding goals are met

Browse Source 
Fixes #3693
This commit is contained in:
Mark McDowall
2020-04-28 21:37:26 -07:00
committed by ta264
parent 6fb24128f8
commit fc8b6014ec
1 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/NzbDrone.Core/Download/DownloadProcessingService.cs
+12 -12
View File
@@ -32,9 +32,13 @@ namespace NzbDrone.Core.Download
_logger = logger; _logger = logger;
} }
private void RemoveCompletedDownloads(List<TrackedDownload> trackedDownloads) private void RemoveCompletedDownloads()
{ {
foreach (var trackedDownload in trackedDownloads.Where(c => c.DownloadItem.CanBeRemoved && c.State == TrackedDownloadState.Imported)) var trackedDownloads = _trackedDownloadService.GetTrackedDownloads()
.Where(t => !t.DownloadItem.Removed && t.DownloadItem.CanBeRemoved && t.State == TrackedDownloadState.Imported)
.ToList();
foreach (var trackedDownload in trackedDownloads)
{ {
_eventAggregator.PublishEvent(new DownloadCompletedEvent(trackedDownload)); _eventAggregator.PublishEvent(new DownloadCompletedEvent(trackedDownload));
} }
@@ -55,20 +59,10 @@ namespace NzbDrone.Core.Download
if (trackedDownload.State == TrackedDownloadState.DownloadFailedPending) if (trackedDownload.State == TrackedDownloadState.DownloadFailedPending)
{ {
_failedDownloadService.ProcessFailed(trackedDownload); _failedDownloadService.ProcessFailed(trackedDownload);
continue;
} }
else if (enableCompletedDownloadHandling && trackedDownload.State == TrackedDownloadState.ImportPending) else if (enableCompletedDownloadHandling && trackedDownload.State == TrackedDownloadState.ImportPending)
{ {
_completedDownloadService.Import(trackedDownload); _completedDownloadService.Import(trackedDownload);
continue;
}
if (removeCompletedDownloads &&
trackedDownload.DownloadItem.Removed &&
trackedDownload.DownloadItem.CanBeRemoved &&
trackedDownload.State == TrackedDownloadState.Imported)
{
_eventAggregator.PublishEvent(new DownloadCanBeRemovedEvent(trackedDownload));
} }
} }
catch (Exception e) catch (Exception e)
@@ -77,6 +71,12 @@ namespace NzbDrone.Core.Download
} }
} }
// Imported downloads are no longer trackable so process them after processing trackable downloads
if (removeCompletedDownloads)
{
RemoveCompletedDownloads();
}
_eventAggregator.PublishEvent(new DownloadsProcessedEvent()); _eventAggregator.PublishEvent(new DownloadsProcessedEvent());
} }
} }