From a82a1d46aed0bd596597b6356c79955584fce704 Mon Sep 17 00:00:00 2001 From: Mark McDowall Date: Mon, 18 Sep 2023 20:58:47 -0700 Subject: [PATCH] Fixed: Pushed releases not being properly rejected (cherry picked from commit 07f816ffb18ac34090c2f8ba25147737299b361d) Closes #4144 --- .../Download/ProcessDownloadDecisions.cs | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/src/NzbDrone.Core/Download/ProcessDownloadDecisions.cs b/src/NzbDrone.Core/Download/ProcessDownloadDecisions.cs index 680f1134f..e9eb025c2 100644 --- a/src/NzbDrone.Core/Download/ProcessDownloadDecisions.cs +++ b/src/NzbDrone.Core/Download/ProcessDownloadDecisions.cs @@ -131,6 +131,11 @@ namespace NzbDrone.Core.Download return ProcessedDecisionResult.Skipped; } + if (!IsQualifiedReport(decision)) + { + return ProcessedDecisionResult.Rejected; + } + if (decision.TemporarilyRejected) { _pendingReleaseService.Add(decision, PendingReleaseReason.Delay); @@ -149,9 +154,14 @@ namespace NzbDrone.Core.Download } internal List GetQualifiedReports(IEnumerable decisions) + { + return decisions.Where(IsQualifiedReport).ToList(); + } + + internal bool IsQualifiedReport(DownloadDecision decision) { // Process both approved and temporarily rejected - return decisions.Where(c => (c.Approved || c.TemporarilyRejected) && c.RemoteAlbum.Albums.Any()).ToList(); + return (decision.Approved || decision.TemporarilyRejected) && decision.RemoteAlbum.Albums.Any(); } private bool IsAlbumProcessed(List decisions, DownloadDecision report)