github/lidarr
1
0
Fork 0
mirror of https://github.com/lidarr/lidarr.git synced 2025-07-16 10:03:51 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Improve decision processing and deleting of pending releases

Browse source
This commit is contained in:
Mark McDowall 2014-07-26 17:39:28 -07:00
parent 5450170718
commit 9410e01c92
7 changed files with 389 additions and 40 deletions
Download patch file Download diff file Expand all files Collapse all files

54
src/NzbDrone.Core/Download/ProcessDownloadDecisions.cs
View file

@ -35,14 +35,21 @@ namespace NzbDrone.Core.Download
{
var qualifiedReports = GetQualifiedReports(decisions);
var prioritizedDecisions = _prioritizeDownloadDecision.PrioritizeDecisions(qualifiedReports);
var downloadedReports = new List<DownloadDecision>();
var pendingReports = new List<DownloadDecision>();
var grabbed = new List<DownloadDecision>();
var pending = new List<DownloadDecision>();
foreach (var report in prioritizedDecisions)
{
var remoteEpisode = report.RemoteEpisode;
if (DownloadingOrPending(downloadedReports, pendingReports, remoteEpisode))
var episodeIds = remoteEpisode.Episodes.Select(e => e.Id).ToList();
//Skip if already grabbed
if (grabbed.SelectMany(r => r.RemoteEpisode.Episodes)
.Select(e => e.Id)
.ToList()
.Intersect(episodeIds)
.Any())
{
continue;
}
@ -50,23 +57,33 @@ namespace NzbDrone.Core.Download
if (report.TemporarilyRejected)
{
_pendingReleaseService.Add(report);
pendingReports.Add(report);
pending.Add(report);
continue;
}
if (pending.SelectMany(r => r.RemoteEpisode.Episodes)
.Select(e => e.Id)
.ToList()
.Intersect(episodeIds)
.Any())
{
continue;
}
try
{
_downloadService.DownloadReport(remoteEpisode);
downloadedReports.Add(report);
grabbed.Add(report);
}
catch (Exception e)
{
//TODO: support for store & forward
//We'll need to differentiate between a download client error and an indexer error
_logger.WarnException("Couldn't add report to download queue. " + remoteEpisode, e);
}
}
return new ProcessedDecisions(downloadedReports, pendingReports);
return new ProcessedDecisions(grabbed, pending);
}
internal List<DownloadDecision> GetQualifiedReports(IEnumerable<DownloadDecision> decisions)
@ -74,30 +91,5 @@ namespace NzbDrone.Core.Download
//Process both approved and temporarily rejected
return decisions.Where(c => (c.Approved || c.TemporarilyRejected) && c.RemoteEpisode.Episodes.Any()).ToList();
}
private bool DownloadingOrPending(List<DownloadDecision> downloading, List<DownloadDecision> pending, RemoteEpisode remoteEpisode)
{
var episodeIds = remoteEpisode.Episodes.Select(e => e.Id).ToList();
if (downloading.SelectMany(r => r.RemoteEpisode.Episodes)
.Select(e => e.Id)
.ToList()
.Intersect(episodeIds)
.Any())
{
return true;
}
if (pending.SelectMany(r => r.RemoteEpisode.Episodes)
.Select(e => e.Id)
.ToList()
.Intersect(episodeIds)
.Any())
{
return true;
}
return false;
}
}
}