Fixed: Don't Import Files with lower CF Score

src/NzbDrone.Core/MediaFiles/MovieImport/Specifications/UpgradeSpecification.cs

@@ -1,4 +1,7 @@
+using System.Collections.Generic;
+using System.Linq;
 using NLog;
+using NzbDrone.Core.CustomFormats;
 using NzbDrone.Core.DecisionEngine;
 using NzbDrone.Core.Download;
 using NzbDrone.Core.Parser.Model;
@@ -8,16 +11,19 @@ namespace NzbDrone.Core.MediaFiles.MovieImport.Specifications
 {
     public class UpgradeSpecification : IImportDecisionEngineSpecification
     {
+        private readonly ICustomFormatCalculationService _customFormatCalculationService;
         private readonly Logger _logger;
 
-        public UpgradeSpecification(Logger logger)
+        public UpgradeSpecification(ICustomFormatCalculationService customFormatCalculationService, Logger logger)
         {
+            _customFormatCalculationService = customFormatCalculationService;
             _logger = logger;
         }
 
         public Decision IsSatisfiedBy(LocalMovie localMovie, DownloadClientItem downloadClientItem)
         {
             var qualityComparer = new QualityModelComparer(localMovie.Movie.Profile);
+            var preferredWordScore = GetCustomFormatScore(localMovie);
 
             if (localMovie.Movie.MovieFileId > 0)
             {
@@ -34,11 +40,47 @@ namespace NzbDrone.Core.MediaFiles.MovieImport.Specifications
                 if (qualityCompare < 0)
                 {
                     _logger.Debug("This file isn't a quality upgrade for movie. Skipping {0}", localMovie.Path);
-                    return Decision.Reject("Not an upgrade for existing movie file(s)");
+                    return Decision.Reject("Not a quality upgrade for existing movie file(s)");
+                }
+
+                var customFormats = _customFormatCalculationService.ParseCustomFormat(movieFile);
+                var movieFileCustomFormatScore = localMovie.Movie.Profile.CalculateCustomFormatScore(customFormats);
+
+                if (qualityCompare == 0 && preferredWordScore < movieFileCustomFormatScore)
+                {
+                    _logger.Debug("This file isn't a custom format upgrade for movie. Skipping {0}", localMovie.Path);
+                    return Decision.Reject("Not a custom format upgrade for existing movie file(s)");
                 }
             }
 
             return Decision.Accept();
         }
+
+        private int GetCustomFormatScore(LocalMovie localMovie)
+        {
+            var movie = localMovie.Movie;
+            var fileFormats = new List<CustomFormat>();
+            var folderFormats = new List<CustomFormat>();
+            var clientFormats = new List<CustomFormat>();
+
+            if (localMovie.FileMovieInfo != null)
+            {
+                fileFormats = _customFormatCalculationService.ParseCustomFormat(localMovie.FileMovieInfo, movie);
+            }
+
+            if (localMovie.FolderMovieInfo != null)
+            {
+                folderFormats = _customFormatCalculationService.ParseCustomFormat(localMovie.FolderMovieInfo, movie);
+            }
+
+            if (localMovie.DownloadClientMovieInfo != null)
+            {
+                clientFormats = _customFormatCalculationService.ParseCustomFormat(localMovie.DownloadClientMovieInfo, movie);
+            }
+
+            var formats = fileFormats.Union(folderFormats.Union(clientFormats)).ToList();
+
+            return movie.Profile.CalculateCustomFormatScore(formats);
+        }
     }
 }