From a30ec0eb52ba203bb086ebc79b8a53948b58d875 Mon Sep 17 00:00:00 2001 From: bakerboy448 <55419169+bakerboy448@users.noreply.github.com> Date: Sun, 21 Nov 2021 12:05:58 -0600 Subject: [PATCH] Add missing remux quality parsing tests --- src/NzbDrone.Core.Test/ParserTests/QualityParserFixture.cs | 4 ++++ src/NzbDrone.Core/Parser/QualityParser.cs | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/src/NzbDrone.Core.Test/ParserTests/QualityParserFixture.cs b/src/NzbDrone.Core.Test/ParserTests/QualityParserFixture.cs index 59918b230..a3fd2dd9c 100644 --- a/src/NzbDrone.Core.Test/ParserTests/QualityParserFixture.cs +++ b/src/NzbDrone.Core.Test/ParserTests/QualityParserFixture.cs @@ -25,6 +25,8 @@ namespace NzbDrone.Core.Test.ParserTests new object[] { Quality.Bluray720p }, new object[] { Quality.Bluray1080p }, new object[] { Quality.Bluray2160p }, + new object[] { Quality.Bluray1080pRemux }, + new object[] { Quality.Bluray2160pRemux }, }; public static object[] OtherSourceQualityParserCases = @@ -41,6 +43,8 @@ namespace NzbDrone.Core.Test.ParserTests new object[] { "720p BluRay", Quality.Bluray720p }, new object[] { "1080p BluRay", Quality.Bluray1080p }, new object[] { "2160p BluRay", Quality.Bluray2160p }, + new object[] { "1080p Remux", Quality.Bluray1080pRemux }, + new object[] { "2160p Remux", Quality.Bluray2160pRemux }, }; [TestCase("S07E23 .avi ", false)] diff --git a/src/NzbDrone.Core/Parser/QualityParser.cs b/src/NzbDrone.Core/Parser/QualityParser.cs index ea33c8b5b..b1ff26681 100644 --- a/src/NzbDrone.Core/Parser/QualityParser.cs +++ b/src/NzbDrone.Core/Parser/QualityParser.cs @@ -64,7 +64,7 @@ namespace NzbDrone.Core.Parser private static readonly Regex HighDefPdtvRegex = new Regex(@"hr[-_. ]ws", RegexOptions.Compiled | RegexOptions.IgnoreCase); - private static readonly Regex RemuxRegex = new Regex(@"[_. ](?(?:(BD)[-_. ])?Remux)\b", RegexOptions.Compiled | RegexOptions.IgnoreCase); + private static readonly Regex RemuxRegex = new Regex(@"(?:[_. ]|\d{4}p-)(?(?:(BD|UHD)[-_. ]?)?Remux)\b", RegexOptions.Compiled | RegexOptions.IgnoreCase); public static QualityModel ParseQuality(string name) {