From 8dd8c95f36d8b0e0dfbf653b6e64ad2161ccdac8 Mon Sep 17 00:00:00 2001 From: Bogdan Date: Fri, 19 Jan 2024 09:40:51 +0200 Subject: [PATCH] Fixed: Avoid upgrades for custom formats cut-off already met --- .../Specifications/UpgradableSpecification.cs | 23 +++++++++++++------ 1 file changed, 16 insertions(+), 7 deletions(-) diff --git a/src/NzbDrone.Core/DecisionEngine/Specifications/UpgradableSpecification.cs b/src/NzbDrone.Core/DecisionEngine/Specifications/UpgradableSpecification.cs index 322e5c568..5b16bb046 100644 --- a/src/NzbDrone.Core/DecisionEngine/Specifications/UpgradableSpecification.cs +++ b/src/NzbDrone.Core/DecisionEngine/Specifications/UpgradableSpecification.cs @@ -46,25 +46,34 @@ namespace NzbDrone.Core.DecisionEngine.Specifications return false; } - var qualityRevisionComapre = newQuality?.Revision.CompareTo(currentQuality.Revision); + var qualityRevisionCompare = newQuality?.Revision.CompareTo(currentQuality.Revision); // Accept unless the user doesn't want to prefer propers, optionally they can // use preferred words to prefer propers/repacks over non-propers/repacks. if (downloadPropersAndRepacks != ProperDownloadTypes.DoNotPrefer && - qualityRevisionComapre > 0) + qualityRevisionCompare > 0) { _logger.Debug("New item has a better quality revision, skipping. Existing: {0}. New: {1}", currentQuality, newQuality); return true; } + // Reject unless the user does not prefer propers/repacks and it's a revision downgrade. + if (downloadPropersAndRepacks != ProperDownloadTypes.DoNotPrefer && + qualityRevisionCompare < 0) + { + _logger.Debug("Existing item has a better quality revision, skipping. Existing: {0}. New: {1}", currentQuality, newQuality); + return false; + } + var currentFormatScore = qualityProfile.CalculateCustomFormatScore(currentCustomFormats); var newFormatScore = qualityProfile.CalculateCustomFormatScore(newCustomFormats); - // Reject unless the user does not prefer propers/repacks and it's a revision downgrade. - if (downloadPropersAndRepacks != ProperDownloadTypes.DoNotPrefer && - qualityRevisionComapre < 0) + if (qualityProfile.UpgradeAllowed && currentFormatScore >= qualityProfile.CutoffFormatScore) { - _logger.Debug("Existing item has a better quality revision, skipping. Existing: {0}. New: {1}", currentQuality, newQuality); + _logger.Debug("Existing item meets cut-off for custom formats, skipping. Existing: [{0}] ({1}). Cutoff score: {2}", + currentCustomFormats.ConcatToString(), + currentFormatScore, + qualityProfile.CutoffFormatScore); return false; } @@ -123,7 +132,7 @@ namespace NzbDrone.Core.DecisionEngine.Specifications return true; } - _logger.Debug("Existing item meets cut-off. skipping. Existing: {0}", currentQuality); + _logger.Debug("Existing item meets cut-off, skipping. Existing: {0}", currentQuality); return false; }