Fixed a bunch of specs that handled propers and cutoffs

NzbDrone.Core/DecisionEngine/QualityUpgradableSpecification.cs

@@ -10,16 +10,15 @@ namespace NzbDrone.Core.DecisionEngine
     {
         bool IsUpgradable(QualityModel currentQuality, QualityModel newQuality = null);
         bool CutoffNotMet(QualityProfile profile, QualityModel currentQuality, QualityModel newQuality = null);
+        bool IsProperUpgrade(QualityModel currentQuality, QualityModel newQuality);
     }
 
     public class QualityUpgradableSpecification : IQualityUpgradableSpecification
     {
-        private readonly IConfigService _configService;
         private readonly Logger _logger;
 
-        public QualityUpgradableSpecification(IConfigService configService, Logger logger)
+        public QualityUpgradableSpecification(Logger logger)
         {
-            _configService = configService;
             _logger = logger;
         }
 
@@ -33,9 +32,8 @@ namespace NzbDrone.Core.DecisionEngine
                     return false;
                 }
 
-                if (currentQuality.Quality == newQuality.Quality && newQuality.Proper && _configService.AutoDownloadPropers)
+                if (IsProperUpgrade(currentQuality, newQuality))
                 {
-                    _logger.Trace("Upgrading existing item to proper.");
                     return true;
                 }
             }
@@ -47,11 +45,27 @@ namespace NzbDrone.Core.DecisionEngine
         {
             if (currentQuality.Quality >= profile.Cutoff)
             {
+                if (newQuality != null && IsProperUpgrade(currentQuality, newQuality))
+                {
+                    return true;
+                }
+
                 _logger.Trace("Existing item meets cut-off. skipping.");
                 return false;
             }
 
             return true;
         }
+
+        public bool IsProperUpgrade(QualityModel currentQuality, QualityModel newQuality)
+        {
+            if (currentQuality.Quality == newQuality.Quality && newQuality > currentQuality)
+            {
+                _logger.Trace("New quality is a proper for existing quality");
+                return true;
+            }
+
+            return false;
+        }
     }
 }

NzbDrone.Core/DecisionEngine/Specifications/RssSync/ProperSpecification.cs

@@ -0,0 +1,59 @@
+using System;
+using System.Linq;
+using NLog;
+using NzbDrone.Core.Configuration;
+using NzbDrone.Core.IndexerSearch.Definitions;
+using NzbDrone.Core.Parser.Model;
+
+namespace NzbDrone.Core.DecisionEngine.Specifications.RssSync
+{
+    public class ProperSpecification : IDecisionEngineSpecification
+    {
+        private readonly QualityUpgradableSpecification _qualityUpgradableSpecification;
+        private readonly IConfigService _configService;
+        private readonly Logger _logger;
+
+        public ProperSpecification(QualityUpgradableSpecification qualityUpgradableSpecification, IConfigService configService, Logger logger)
+        {
+            _qualityUpgradableSpecification = qualityUpgradableSpecification;
+            _configService = configService;
+            _logger = logger;
+        }
+
+        public string RejectionReason
+        {
+            get
+            {
+                return "Proper for old episode";
+            }
+        }
+
+        public virtual bool IsSatisfiedBy(RemoteEpisode subject, SearchCriteriaBase searchCriteria)
+        {
+            if (searchCriteria != null)
+            {
+                return true;
+            }
+
+            foreach (var file in subject.Episodes.Where(c => c.EpisodeFileId != 0).Select(c => c.EpisodeFile.Value))
+            {
+                if (_qualityUpgradableSpecification.IsProperUpgrade(file.Quality, subject.ParsedEpisodeInfo.Quality))
+                {
+                    if (file.DateAdded < DateTime.Today.AddDays(-7))
+                    {
+                        _logger.Trace("Proper for old file, skipping: {0}", subject);
+                        return false;
+                    }
+
+                    if (!_configService.AutoDownloadPropers)
+                    {
+                        _logger.Trace("Auto downloading of propers is disabled");
+                        return false;
+                    }
+                }
+            }
+
+            return true;
+        }
+    }
+}

NzbDrone.Core/DecisionEngine/Specifications/UpgradeDiskSpecification.cs

@@ -35,15 +35,6 @@ namespace NzbDrone.Core.DecisionEngine.Specifications
                 {
                     return false;
                 }
-
-                if (searchCriteria == null &&
-                    subject.ParsedEpisodeInfo.Quality.Quality == file.Quality.Quality &&
-                    subject.ParsedEpisodeInfo.Quality.Proper &&
-                    file.DateAdded < DateTime.Today.AddDays(-7))
-                {
-                    _logger.Trace("Proper for old file, skipping: {0}", subject);
-                    return false;
-                }
             }
 
             return true;