From 0ec18ce4b3a33dc86d26ae208438629fdae78626 Mon Sep 17 00:00:00 2001
From: Mark McDowall <mark@mcdowall.ca>
Date: Thu, 9 May 2024 17:25:49 -0700
Subject: [PATCH] New: Parse 480i Bluray/Remux as Bluray 480p

(cherry picked from commit 627b2a4289ecdd5558d37940624289708e01e10a)

Closes #10010
---
 .../ParserTests/QualityParserFixture.cs       |  5 +++
 src/NzbDrone.Core/Parser/QualityParser.cs     | 31 ++++++++++++++++++-
 2 files changed, 35 insertions(+), 1 deletion(-)

diff --git a/src/NzbDrone.Core.Test/ParserTests/QualityParserFixture.cs b/src/NzbDrone.Core.Test/ParserTests/QualityParserFixture.cs
index daced9a03..3b98792b9 100644
--- a/src/NzbDrone.Core.Test/ParserTests/QualityParserFixture.cs
+++ b/src/NzbDrone.Core.Test/ParserTests/QualityParserFixture.cs
@@ -116,6 +116,8 @@ namespace NzbDrone.Core.Test.ParserTests
         [TestCase("Movie.Name.S01E05.480p.BluRay.DD5.1.x264-HiSD", false)]
         [TestCase("Movie.Name.S03E01-06.DUAL.BDRip.AC3.-HELLYWOOD", false)]
         [TestCase("Movie.Name.2011.LIMITED.BluRay.360p.H264-20-40", false)]
+        [TestCase("Movie.Name.2011.BluRay.480i.DD.2.0.AVC.REMUX-FraMeSToR", false)]
+        [TestCase("Movie.Name.2011.480i.DD.2.0.AVC.REMUX-FraMeSToR", false)]
         public void should_parse_bluray480p_quality(string title, bool proper)
         {
             ParseAndVerifyQuality(title, QualitySource.BLURAY, proper, Resolution.R480p);
@@ -256,6 +258,7 @@ namespace NzbDrone.Core.Test.ParserTests
         [TestCase("Movie.Name2017.720p.MBluRay.x264-TREBLE.mkv", false)]
         [TestCase("Movie.Name.2.Parte.2.ITA-ENG.720p.BDMux.DD5.1.x264-DarkSideMux", false)]
         [TestCase("Movie.Hunter.2018.720p.Blu-ray.Remux.AVC.FLAC.2.0-SiCFoI", false)]
+        [TestCase("Movie.Name.2011.720p.DD.2.0.AVC.REMUX-FraMeSToR", false)]
         public void should_parse_bluray720p_quality(string title, bool proper)
         {
             ParseAndVerifyQuality(title, QualitySource.BLURAY, proper, Resolution.R720p);
@@ -324,6 +327,7 @@ namespace NzbDrone.Core.Test.ParserTests
         [TestCase("Movie Title 2022 (BDRemux 1080p HEVC FLAC) [Netaro]")]
         [TestCase("[Vodes] Movie Title - Other Title (2020) [BDRemux 1080p HEVC Dual-Audio]")]
         [TestCase("This.Wonderful.Movie.1991.German.ML.1080p.BluRay.AVC-GeRMaNSCeNEGRoUP")]
+        [TestCase("Movie.Name.2011.1080p.DD.2.0.AVC.REMUX-FraMeSToR")]
         public void should_parse_remux1080p_quality(string title)
         {
             ParseAndVerifyQuality(title, QualitySource.BLURAY, false, Resolution.R1080p, Modifier.REMUX);
@@ -337,6 +341,7 @@ namespace NzbDrone.Core.Test.ParserTests
         [TestCase("Movie.Name.2020.German.UHDBD.2160p.HDR10.HEVC.EAC3.DL.Remux-pmHD.mkv")]
         [TestCase("Movie Name (2021) [Remux-2160p x265 HDR 10-BIT DTS-HD MA 7.1]-FraMeSToR.mkv")]
         [TestCase("This.Wonderful.Movie.1991.German.ML.2160p.BluRay.HEVC-GeRMaNSCeNEGRoUP")]
+        [TestCase("Movie.Name.2011.2160p.DD.2.0.AVC.REMUX-FraMeSToR")]
         public void should_parse_remux2160p_quality(string title)
         {
             ParseAndVerifyQuality(title, QualitySource.BLURAY, false, Resolution.R2160p, Modifier.REMUX);
diff --git a/src/NzbDrone.Core/Parser/QualityParser.cs b/src/NzbDrone.Core/Parser/QualityParser.cs
index 3fa279e5d..9b6ea6e92 100644
--- a/src/NzbDrone.Core/Parser/QualityParser.cs
+++ b/src/NzbDrone.Core/Parser/QualityParser.cs
@@ -56,7 +56,7 @@ namespace NzbDrone.Core.Parser
         private static readonly Regex RealRegex = new (@"\b(?<real>REAL)\b",
                                                             RegexOptions.Compiled);
 
-        private static readonly Regex ResolutionRegex = new (@"\b(?:(?<R360p>360p)|(?<R480p>480p|640x480|848x480)|(?<R540p>540p)|(?<R576p>576p)|(?<R720p>720p|1280x720|960p)|(?<R1080p>1080p|1920x1080|1440p|FHD|1080i|4kto1080p)|(?<R2160p>2160p|3840x2160|4k[-_. ](?:UHD|HEVC|BD|H\.?265)|(?:UHD|HEVC|BD|H\.?265)[-_. ]4k))\b",
+        private static readonly Regex ResolutionRegex = new (@"\b(?:(?<R360p>360p)|(?<R480p>480p|480i|640x480|848x480)|(?<R540p>540p)|(?<R576p>576p)|(?<R720p>720p|1280x720|960p)|(?<R1080p>1080p|1920x1080|1440p|FHD|1080i|4kto1080p)|(?<R2160p>2160p|3840x2160|4k[-_. ](?:UHD|HEVC|BD|H\.?265)|(?:UHD|HEVC|BD|H\.?265)[-_. ]4k))\b",
                                                             RegexOptions.Compiled | RegexOptions.IgnoreCase);
 
         // Handle cases where no resolution is in the release name; assume if UHD then 4k
@@ -388,6 +388,35 @@ namespace NzbDrone.Core.Parser
                 }
             }
 
+            if (sourceMatch == null && remuxMatch && resolution != Resolution.Unknown)
+            {
+                result.SourceDetectionSource = QualityDetectionSource.Unknown;
+
+                if (resolution == Resolution.R480p)
+                {
+                    result.Quality = Quality.Bluray480p;
+                    return result;
+                }
+
+                if (resolution == Resolution.R720p)
+                {
+                    result.Quality = Quality.Bluray720p;
+                    return result;
+                }
+
+                if (resolution == Resolution.R2160p)
+                {
+                    result.Quality = Quality.Remux2160p;
+                    return result;
+                }
+
+                if (resolution == Resolution.R1080p)
+                {
+                    result.Quality = Quality.Remux1080p;
+                    return result;
+                }
+            }
+
             // Anime Bluray matching
             if (AnimeBlurayRegex.Match(normalizedName).Success)
             {