mirror
/
Radarr
mirror of https://github.com/Radarr/Radarr
1
0
Fork 0
Code Issues Releases Wiki Activity

Revert "New: Optional 'downloadClientId' for pushed releases" 

This reverts commit 4e01fa57fd.

Closes #9202
This commit is contained in:
Bogdan 2023-09-19 04:07:27 +03:00
parent 450d6c0c80
commit e9e36ae56a
3 changed files with 34 additions and 115 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

122
src/NzbDrone.Core/Download/ProcessDownloadDecisions.cs
View File

@ -14,7 +14,6 @@ namespace NzbDrone.Core.Download
public interface IProcessDownloadDecisions
{
Task<ProcessedDecisions> ProcessDecisions(List<DownloadDecision> decisions);
Task<ProcessedDecisionResult> ProcessDecision(DownloadDecision decision, int? downloadClientId);
}
public class ProcessDownloadDecisions : IProcessDownloadDecisions
@ -50,6 +49,7 @@ namespace NzbDrone.Core.Download
foreach (var report in prioritizedDecisions)
{
var remoteMovie = report.RemoteMovie;
var downloadProtocol = report.RemoteMovie.Release.DownloadProtocol;
// Skip if already grabbed
@ -71,48 +71,37 @@ namespace NzbDrone.Core.Download
continue;
}
var result = await ProcessDecisionInternal(report);
switch (result)
try
{
case ProcessedDecisionResult.Grabbed:
_logger.Trace("Grabbing from Indexer {0} at priority {1}.", remoteMovie.Release.Indexer, remoteMovie.Release.IndexerPriority);
await _downloadService.DownloadReport(remoteMovie, null);
grabbed.Add(report);
}
catch (ReleaseUnavailableException)
{
_logger.Warn("Failed to download release from indexer, no longer available. " + remoteMovie);
rejected.Add(report);
}
catch (Exception ex)
{
if (ex is DownloadClientUnavailableException || ex is DownloadClientAuthenticationException)
{
_logger.Debug(ex, "Failed to send release to download client, storing until later. " + remoteMovie);
PreparePending(pendingAddQueue, grabbed, pending, report, PendingReleaseReason.DownloadClientUnavailable);
if (downloadProtocol == DownloadProtocol.Usenet)
{
grabbed.Add(report);
break;
usenetFailed = true;
}
case ProcessedDecisionResult.Pending:
else if (downloadProtocol == DownloadProtocol.Torrent)
{
PreparePending(pendingAddQueue, grabbed, pending, report, PendingReleaseReason.Delay);
break;
}
case ProcessedDecisionResult.Rejected:
{
rejected.Add(report);
break;
}
case ProcessedDecisionResult.Failed:
{
PreparePending(pendingAddQueue, grabbed, pending, report, PendingReleaseReason.DownloadClientUnavailable);
if (downloadProtocol == DownloadProtocol.Usenet)
{
usenetFailed = true;
}
else if (downloadProtocol == DownloadProtocol.Torrent)
{
torrentFailed = true;
}
break;
}
case ProcessedDecisionResult.Skipped:
{
break;
torrentFailed = true;
}
}
else
{
_logger.Warn(ex, "Couldn't add report to download queue. " + remoteMovie);
}
}
}
@ -124,30 +113,6 @@ namespace NzbDrone.Core.Download
return new ProcessedDecisions(grabbed, pending, rejected);
}
public async Task<ProcessedDecisionResult> ProcessDecision(DownloadDecision decision, int? downloadClientId)
{
if (decision == null)
{
return ProcessedDecisionResult.Skipped;
}
if (decision.TemporarilyRejected)
{
_pendingReleaseService.Add(decision, PendingReleaseReason.Delay);
return ProcessedDecisionResult.Pending;
}
var result = await ProcessDecisionInternal(decision, downloadClientId);
if (result == ProcessedDecisionResult.Failed)
{
_pendingReleaseService.Add(decision, PendingReleaseReason.DownloadClientUnavailable);
}
return result;
}
internal List<DownloadDecision> GetQualifiedReports(IEnumerable<DownloadDecision> decisions)
{
// Process both approved and temporarily rejected
@ -180,38 +145,5 @@ namespace NzbDrone.Core.Download
queue.Add(Tuple.Create(report, reason));
pending.Add(report);
}
private async Task<ProcessedDecisionResult> ProcessDecisionInternal(DownloadDecision decision, int? downloadClientId = null)
{
var remoteMovie = decision.RemoteMovie;
try
{
_logger.Trace("Grabbing from Indexer {0} at priority {1}.", remoteMovie.Release.Indexer, remoteMovie.Release.IndexerPriority);
await _downloadService.DownloadReport(remoteMovie, downloadClientId);
return ProcessedDecisionResult.Grabbed;
}
catch (ReleaseUnavailableException)
{
_logger.Warn("Failed to download release from indexer, no longer available. " + remoteMovie);
return ProcessedDecisionResult.Rejected;
}
catch (Exception ex)
{
if (ex is DownloadClientUnavailableException || ex is DownloadClientAuthenticationException)
{
_logger.Debug(ex,
"Failed to send release to download client, storing until later. " + remoteMovie);
return ProcessedDecisionResult.Failed;
}
else
{
_logger.Warn(ex, "Couldn't add report to download queue. " + remoteMovie);
return ProcessedDecisionResult.Skipped;
}
}
}
}
}

11
src/NzbDrone.Core/Download/ProcessedDecisionResult.cs
View File

@ -1,11 +0,0 @@
namespace NzbDrone.Core.Download
{
public enum ProcessedDecisionResult
{
Grabbed,
Pending,
Rejected,
Failed,
Skipped
}
}

16
src/Radarr.Api.V3/Indexers/ReleasePushController.cs
View File

@ -44,7 +44,6 @@ namespace Radarr.Api.V3.Indexers
}
[HttpPost]
[Consumes("application/json")]
public ActionResult<List<ReleaseResource>> Create(ReleaseResource release)
{
_logger.Info("Release pushed: {0} - {1}", release.Title, release.DownloadUrl);
@ -57,23 +56,22 @@ namespace Radarr.Api.V3.Indexers
ResolveIndexer(info);
DownloadDecision decision;
List<DownloadDecision> decisions;
lock (PushLock)
{
var decisions = _downloadDecisionMaker.GetRssDecision(new List<ReleaseInfo> { info });
decision = decisions.FirstOrDefault();
_downloadDecisionProcessor.ProcessDecision(decision, release.DownloadClientId).GetAwaiter().GetResult();
decisions = _downloadDecisionMaker.GetRssDecision(new List<ReleaseInfo> { info });
_downloadDecisionProcessor.ProcessDecisions(decisions).GetAwaiter().GetResult();
}
if (decision?.RemoteMovie.ParsedMovieInfo == null)
var firstDecision = decisions.FirstOrDefault();
if (firstDecision?.RemoteMovie.ParsedMovieInfo == null)
{
throw new ValidationException(new List<ValidationFailure> { new ValidationFailure("Title", "Unable to parse", release.Title) });
}
return MapDecisions(new[] { decision });
return MapDecisions(new[] { firstDecision });
}
private void ResolveIndexer(ReleaseInfo release)