Fixed: Use Modifier in Quality Aggregation

src/NzbDrone.Core.Test/MediaFiles/MovieImport/Aggregation/Aggregators/AggregateQualityFixture.cs

@@ -32,10 +32,10 @@ namespace NzbDrone.Core.Test.MediaFiles.MovieImport.Aggregation.Aggregators
                                .Returns(AugmentQualityResult.ResolutionOnly(Resolution.R1080P, Confidence.MediaInfo));
 
             _fileExtensionAugmenter.Setup(s => s.AugmentQuality(It.IsAny<LocalMovie>()))
-                                   .Returns(new AugmentQualityResult(Source.TV, Confidence.Fallback, Resolution.R720P, Confidence.Fallback, new Revision()));
+                                   .Returns(new AugmentQualityResult(Source.TV, Confidence.Fallback, Resolution.R720P, Confidence.Fallback, Modifier.NONE, Confidence.Fallback, new Revision()));
 
             _nameAugmenter.Setup(s => s.AugmentQuality(It.IsAny<LocalMovie>()))
-                          .Returns(new AugmentQualityResult(Source.TV, Confidence.Default, Resolution.R480P, Confidence.Default, new Revision()));
+                          .Returns(new AugmentQualityResult(Source.TV, Confidence.Default, Resolution.R480P, Confidence.Default, Modifier.NONE, Confidence.Default, new Revision()));
         }
 
         private void GivenAugmenters(params Mock<IAugmentQuality>[] mocks)

src/NzbDrone.Core/MediaFiles/MovieImport/Aggregation/Aggregators/AggregateQuality.cs

@@ -30,6 +30,8 @@ namespace NzbDrone.Core.MediaFiles.MovieImport.Aggregation.Aggregators
             var sourceConfidence = Confidence.Default;
             var resolution = Resolution.Unknown;
             var resolutionConfidence = Confidence.Default;
+            var modifier = Modifier.NONE;
+            var modifierConfidence = Confidence.Default;
             var revison = new Revision();
 
             foreach (var augmentedQuality in augmentedQualities)
@@ -48,6 +50,13 @@ namespace NzbDrone.Core.MediaFiles.MovieImport.Aggregation.Aggregators
                     resolutionConfidence = augmentedQuality.ResolutionConfidence;
                 }
 
+                if (augmentedQuality.Modifier > modifier ||
+                    augmentedQuality.ModifierConfidence > modifierConfidence && augmentedQuality.Modifier != Modifier.NONE)
+                {
+                    modifier = augmentedQuality.Modifier;
+                    modifierConfidence = augmentedQuality.ModifierConfidence;
+                }
+
                 if (augmentedQuality.Revision != null && augmentedQuality.Revision > revison)
                 {
                     revison = augmentedQuality.Revision;
@@ -56,7 +65,7 @@ namespace NzbDrone.Core.MediaFiles.MovieImport.Aggregation.Aggregators
 
             _logger.Trace("Finding quality. Source: {0}. Resolution: {1}", source, resolution);
 
-            var quality = new QualityModel(QualityFinder.FindBySourceAndResolution(source, resolution), revison);
+            var quality = new QualityModel(QualityFinder.FindBySourceAndResolution(source, resolution, modifier), revison);
 
             if (resolutionConfidence == Confidence.MediaInfo)
             {

src/NzbDrone.Core/MediaFiles/MovieImport/Aggregation/Aggregators/Augmenters/Quality/AugmentQualityFromDownloadClientItem.cs

@@ -17,6 +17,8 @@ namespace NzbDrone.Core.MediaFiles.MovieImport.Aggregation.Aggregators.Augmenter
                                             Confidence.Tag,
                                             quality.Quality.Resolution,
                                             Confidence.Tag,
+                                            quality.Quality.Modifier,
+                                            Confidence.Tag,
                                             quality.Revision);
         }
     }

src/NzbDrone.Core/MediaFiles/MovieImport/Aggregation/Aggregators/Augmenters/Quality/AugmentQualityFromFileName.cs

@@ -22,6 +22,8 @@ namespace NzbDrone.Core.MediaFiles.MovieImport.Aggregation.Aggregators.Augmenter
                                             confidence,
                                             quality.Quality.Resolution,
                                             confidence,
+                                            quality.Quality.Modifier,
+                                            confidence,
                                             quality.Revision);
         }
     }

src/NzbDrone.Core/MediaFiles/MovieImport/Aggregation/Aggregators/Augmenters/Quality/AugmentQualityFromFolder.cs

@@ -17,6 +17,8 @@ namespace NzbDrone.Core.MediaFiles.MovieImport.Aggregation.Aggregators.Augmenter
                                             Confidence.Tag,
                                             quality.Quality.Resolution,
                                             Confidence.Tag,
+                                            quality.Quality.Modifier,
+                                            Confidence.Tag,
                                             quality.Revision);
         }
     }

src/NzbDrone.Core/MediaFiles/MovieImport/Aggregation/Aggregators/Augmenters/Quality/AugmentQualityResult.cs

@@ -9,29 +9,40 @@ namespace NzbDrone.Core.MediaFiles.MovieImport.Aggregation.Aggregators.Augmenter
         public Confidence SourceConfidence { get; set; }
         public Resolution Resolution { get; set; }
         public Confidence ResolutionConfidence { get; set; }
+        public Modifier Modifier { get; set; }
+        public Confidence ModifierConfidence { get; set; }
         public Revision Revision { get; set; }
 
         public AugmentQualityResult(Source source,
                                     Confidence sourceConfidence,
                                     Resolution resolution,
                                     Confidence resolutionConfidence,
+                                    Modifier modifier,
+                                    Confidence modifierConfidence,
                                     Revision revision)
         {
             Source = source;
             SourceConfidence = sourceConfidence;
             Resolution = resolution;
             ResolutionConfidence = resolutionConfidence;
+            Modifier = modifier;
+            ModifierConfidence = modifierConfidence;
             Revision = revision;
         }
 
         public static AugmentQualityResult SourceOnly(Source source, Confidence sourceConfidence)
         {
-            return new AugmentQualityResult(source, sourceConfidence, 0, Confidence.Default, null);
+            return new AugmentQualityResult(source, sourceConfidence, 0, Confidence.Default, Modifier.NONE, Confidence.Default, null);
         }
 
         public static AugmentQualityResult ResolutionOnly(Resolution resolution, Confidence resolutionConfidence)
         {
-            return new AugmentQualityResult(Source.UNKNOWN, Confidence.Default, resolution, resolutionConfidence, null);
+            return new AugmentQualityResult(Source.UNKNOWN, Confidence.Default, resolution, resolutionConfidence, Modifier.NONE, Confidence.Default, null);
+        }
+
+        public static AugmentQualityResult ModifierOnly(Modifier modifier, Confidence modifierConfidence)
+        {
+            return new AugmentQualityResult(Source.UNKNOWN, Confidence.Default, 0, Confidence.Default, modifier, modifierConfidence, null);
         }
     }
 }

src/NzbDrone.Core/Parser/ParsingService.cs

@@ -97,7 +97,7 @@ namespace NzbDrone.Core.Parser
             minimalInfo.Languages =
                 LanguageParser.EnhanceLanguages(minimalInfo.SimpleReleaseTitle, minimalInfo.Languages);
 
-            minimalInfo.Quality.Quality = Quality.FindByInfo(minimalInfo.Quality.Source, minimalInfo.Quality.Resolution,
+            minimalInfo.Quality.Quality = QualityFinder.FindBySourceAndResolution(minimalInfo.Quality.Source, minimalInfo.Quality.Resolution,
                 minimalInfo.Quality.Modifier);
 
             minimalInfo.Quality.CustomFormats = ParseCustomFormat(minimalInfo);

src/NzbDrone.Core/Qualities/Quality.cs

@@ -213,16 +213,5 @@ namespace NzbDrone.Core.Qualities
         {
             return quality.Id;
         }
-
-        //TODO: Go back to fully parsing the quality from the start!
-        public static Quality FindByInfo(Source source, Resolution resolution, Modifier modifier)
-        {
-            return All.SingleOrDefault(q =>
-                       q.Source == source && ((q.Resolution == resolution) ||
-                                              (q.Resolution == Resolution.Unknown)) && (q.Modifier == modifier)) ??
-                   All.FirstOrDefault(q => q.Source == source && ((q.Resolution == resolution) ||
-                                                                  (q.Resolution == Resolution.Unknown))) ??
-                   Unknown;
-        }
     }
 }

src/NzbDrone.Core/Qualities/QualityFinder.cs

@@ -9,9 +9,9 @@ namespace NzbDrone.Core.Qualities
     {
         private static readonly Logger Logger = NzbDroneLogger.GetLogger(typeof(QualityFinder));
 
-        public static Quality FindBySourceAndResolution(Source source, Resolution resolution)
+        public static Quality FindBySourceAndResolution(Source source, Resolution resolution, Modifier modifer)
         {
-            var matchingQuality = Quality.All.SingleOrDefault(q => q.Source == source && q.Resolution == resolution);
+            var matchingQuality = Quality.All.SingleOrDefault(q => q.Source == source && q.Resolution == resolution && q.Modifier == modifer);
 
             if (matchingQuality != null)
             {