tedkulp/Radarr
1
0
Fork 0
mirror of https://github.com/Radarr/Radarr.git synced 2026-04-23 22:25:14 -04:00
Code Issues Projects Releases Wiki Activity

Fixed: some issues around removing completed and failed downloads

Browse Source
This commit is contained in:
Keivan Beigi
2014-12-22 17:17:48 -08:00
parent 4ac9fd939a
commit e79a2c742a
18 changed files with 39 additions and 156 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/NzbDrone.Core/Download/TrackedDownloads/TrackedDownloadService.cs
+7 -17
View File
@@ -1,9 +1,7 @@
using System;
using NLog;
using NzbDrone.Common.Cache;
using NzbDrone.Core.DataAugmentation.Scene;
using NzbDrone.Core.History;
using NzbDrone.Core.Messaging.Events;
using NzbDrone.Core.Parser;
namespace NzbDrone.Core.Download.TrackedDownloads
@@ -14,8 +12,7 @@ namespace NzbDrone.Core.Download.TrackedDownloads
TrackedDownload TrackDownload(DownloadClientDefinition downloadClient, DownloadClientItem downloadItem);
}
public class TrackedDownloadService : ITrackedDownloadService,
IHandle<SceneMappingsUpdatedEvent>
public class TrackedDownloadService : ITrackedDownloadService
{
private readonly IParsingService _parsingService;
private readonly IHistoryService _historyService;
@@ -42,7 +39,7 @@ namespace NzbDrone.Core.Download.TrackedDownloads
{
var existingItem = Find(downloadItem.DownloadId);
if (existingItem != null)
if (existingItem != null && existingItem.State != TrackedDownloadStage.Downloading)
{
existingItem.DownloadItem = downloadItem;
return existingItem;
@@ -56,12 +53,6 @@ namespace NzbDrone.Core.Download.TrackedDownloads
Protocol = downloadClient.Protocol
};
var historyItem = _historyService.MostRecentForDownloadId(downloadItem.DownloadId);
if (historyItem != null)
{
trackedDownload.State = GetStateFromHistory(historyItem.EventType);
}
try
{
var parsedEpisodeInfo = Parser.Parser.ParseTitle(trackedDownload.DownloadItem.Title);
@@ -81,11 +72,14 @@ namespace NzbDrone.Core.Download.TrackedDownloads
return null;
}
if (trackedDownload.State != TrackedDownloadStage.Downloading)
var historyItem = _historyService.MostRecentForDownloadId(downloadItem.DownloadId);
if (historyItem != null)
{
_cache.Set(downloadItem.DownloadId, trackedDownload);
trackedDownload.State = GetStateFromHistory(historyItem.EventType);
}
_cache.Set(downloadItem.DownloadId, trackedDownload);
return trackedDownload;
}
@@ -102,9 +96,5 @@ namespace NzbDrone.Core.Download.TrackedDownloads
}
}
public void Handle(SceneMappingsUpdatedEvent message)
{
_cache.Clear();
}
}
}