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

Fixed: Previously imported downloads reappear in queue

Browse Source 
Fixes #3496
This commit is contained in:
Mark McDowall 2020-01-07 16:55:13 -08:00
parent 29117fc222
commit fa4060b7fe
1 changed files with 18 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/NzbDrone.Core/Download/TrackedDownloads/TrackedDownloadService.cs
View File

@ -110,19 +110,27 @@ public TrackedDownload TrackDownload(DownloadClientDefinition downloadClient, Do
var firstHistoryItem = historyItems.First(); var firstHistoryItem = historyItems.First();
var state = GetStateFromHistory(firstHistoryItem.EventType); var state = GetStateFromHistory(firstHistoryItem.EventType);
trackedDownload.State = state;
// TODO: Restore check to confirm all files were imported
// This will treat partially imported downloads as imported (as it was before), which means a partially imported download after a
// restart will get marked as imported without importing the restart of the files.
// One potential issue here is if the latest is imported, but other episodes are ignored or never imported. // One potential issue here is if the latest is imported, but other episodes are ignored or never imported.
// It's unlikely that will happen, but could happen if additional episodes are added to season after it's already imported. // It's unlikely that will happen, but could happen if additional episodes are added to season after it's already imported.
if (state == TrackedDownloadState.Imported)
{
var allImported = _trackedDownloadAlreadyImported.IsImported(trackedDownload, historyItems);
trackedDownload.State = allImported ? TrackedDownloadState.Imported : TrackedDownloadState.Downloading; // if (state == TrackedDownloadState.Imported)
} // {
else // trackedDownload.State = TrackedDownloadState.Imported;
{ //
trackedDownload.State = state; // var allImported = _trackedDownloadAlreadyImported.IsImported(trackedDownload, historyItems);
} //
// trackedDownload.State = allImported ? TrackedDownloadState.Imported : TrackedDownloadState.Downloading;
// }
// else
// {
// trackedDownload.State = state;
// }
var grabbedEvent = historyItems.FirstOrDefault(v => v.EventType == HistoryEventType.Grabbed); var grabbedEvent = historyItems.FirstOrDefault(v => v.EventType == HistoryEventType.Grabbed);
trackedDownload.Indexer = grabbedEvent?.Data["indexer"]; trackedDownload.Indexer = grabbedEvent?.Data["indexer"];