New: Limit grabs to 1 per second to reduce rapid API calls

pull/3113/head
Mark McDowall 10 years ago
parent 0c6ca6971d
commit 1275d8098d

@ -2,8 +2,10 @@
using System.Collections.Generic; using System.Collections.Generic;
using System.Linq; using System.Linq;
using NLog; using NLog;
using NzbDrone.Common;
using NzbDrone.Core.DecisionEngine; using NzbDrone.Core.DecisionEngine;
using NzbDrone.Core.Download.Pending; using NzbDrone.Core.Download.Pending;
using NzbDrone.Core.Parser.Model;
namespace NzbDrone.Core.Download namespace NzbDrone.Core.Download
{ {
@ -37,50 +39,55 @@ namespace NzbDrone.Core.Download
var grabbed = new List<DownloadDecision>(); var grabbed = new List<DownloadDecision>();
var pending = new List<DownloadDecision>(); var pending = new List<DownloadDecision>();
foreach (var report in prioritizedDecisions) //Limits to 1 grab every 1 second to reduce rapid API hits
using (var rateGate = new RateGate(1, TimeSpan.FromSeconds(1)))
{ {
var remoteEpisode = report.RemoteEpisode; foreach (var report in prioritizedDecisions)
{
var remoteEpisode = report.RemoteEpisode;
var episodeIds = remoteEpisode.Episodes.Select(e => e.Id).ToList(); var episodeIds = remoteEpisode.Episodes.Select(e => e.Id).ToList();
//Skip if already grabbed //Skip if already grabbed
if (grabbed.SelectMany(r => r.RemoteEpisode.Episodes) if (grabbed.SelectMany(r => r.RemoteEpisode.Episodes)
.Select(e => e.Id) .Select(e => e.Id)
.ToList() .ToList()
.Intersect(episodeIds) .Intersect(episodeIds)
.Any()) .Any())
{ {
continue; continue;
} }
if (report.TemporarilyRejected) if (report.TemporarilyRejected)
{ {
_pendingReleaseService.Add(report); _pendingReleaseService.Add(report);
pending.Add(report); pending.Add(report);
continue; continue;
} }
if (pending.SelectMany(r => r.RemoteEpisode.Episodes) if (pending.SelectMany(r => r.RemoteEpisode.Episodes)
.Select(e => e.Id) .Select(e => e.Id)
.ToList() .ToList()
.Intersect(episodeIds) .Intersect(episodeIds)
.Any()) .Any())
{ {
continue; continue;
} }
try try
{ {
_downloadService.DownloadReport(remoteEpisode); rateGate.WaitToProceed();
grabbed.Add(report); _downloadService.DownloadReport(remoteEpisode);
} grabbed.Add(report);
catch (Exception e) }
{ catch (Exception e)
//TODO: support for store & forward {
//We'll need to differentiate between a download client error and an indexer error //TODO: support for store & forward
_logger.WarnException("Couldn't add report to download queue. " + remoteEpisode, e); //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(grabbed, pending, decisions.Where(d => d.Rejected).ToList()); return new ProcessedDecisions(grabbed, pending, decisions.Where(d => d.Rejected).ToList());
} }

Loading…
Cancel
Save