From 3b3ebe463ccb4395147a1b22a1dbbef57ceaa6f8 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 #2943 --- .../Download/ProcessDownloadDecisions.cs | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/src/NzbDrone.Core/Download/ProcessDownloadDecisions.cs b/src/NzbDrone.Core/Download/ProcessDownloadDecisions.cs index 83010cad7..dbdd4216b 100644 --- a/src/NzbDrone.Core/Download/ProcessDownloadDecisions.cs +++ b/src/NzbDrone.Core/Download/ProcessDownloadDecisions.cs @@ -131,6 +131,11 @@ public async Task ProcessDecision(DownloadDecision deci return ProcessedDecisionResult.Skipped; } + if (!IsQualifiedReport(decision)) + { + return ProcessedDecisionResult.Rejected; + } + if (decision.TemporarilyRejected) { _pendingReleaseService.Add(decision, PendingReleaseReason.Delay); @@ -150,8 +155,13 @@ public async Task ProcessDecision(DownloadDecision deci internal List GetQualifiedReports(IEnumerable decisions) { - //Process both approved and temporarily rejected - return decisions.Where(c => (c.Approved || c.TemporarilyRejected) && c.RemoteBook.Books.Any()).ToList(); + return decisions.Where(IsQualifiedReport).ToList(); + } + + internal bool IsQualifiedReport(DownloadDecision decision) + { + // Process both approved and temporarily rejected + return (decision.Approved || decision.TemporarilyRejected) && decision.RemoteBook.Books.Any(); } private bool IsBookProcessed(List decisions, DownloadDecision report)