From e6e50c878480032df42b1a2a6b48ef98cc5c9466 Mon Sep 17 00:00:00 2001 From: Bogdan Date: Tue, 9 Jan 2024 18:39:37 +0200 Subject: [PATCH] Fixed: Ignore repack version for MP3 V0/V2 VBR --- .../ParserTests/QualityParserFixture.cs | 12 +++++++++--- src/NzbDrone.Core/Parser/QualityParser.cs | 2 +- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/src/NzbDrone.Core.Test/ParserTests/QualityParserFixture.cs b/src/NzbDrone.Core.Test/ParserTests/QualityParserFixture.cs index 92986c379..d2a0b1858 100644 --- a/src/NzbDrone.Core.Test/ParserTests/QualityParserFixture.cs +++ b/src/NzbDrone.Core.Test/ParserTests/QualityParserFixture.cs @@ -310,9 +310,15 @@ namespace NzbDrone.Core.Test.ParserTests [TestCase("Artist Title - Album Title 2017 REPACK FLAC aAF", true, 2)] [TestCase("Artist.Title-Album.Title.2017.REPACK.FLAC-aAF", true, 2)] [TestCase("Artist.Title-Album.Title.2017.REPACK2.FLAC-aAF", true, 3)] - [TestCase("Artist Title - Album Title 2017 RERIP FLAC aAF", true, 2)] - [TestCase("Artist Title - Album Title 2017 RERIP2 FLAC aAF", true, 3)] - [TestCase("Artist Title - Album Title 2017 PROPER FLAC aAF", false, 2)] + [TestCase("Artist.Title-Album.Title.2017.PROPER.FLAC-aAF", false, 2)] + [TestCase("Artist.Title-Album.Title.2017.RERIP.FLAC-DEMAND", true, 2)] + [TestCase("Artist.Title-Album.Title.2017.RERIP2.FLAC-DEMAND", true, 3)] + [TestCase("Artist Title - Album Title 2017 MP3 V2 (VBR) aAF", false, 1)] + [TestCase("Artist.Title-Album.Title.2017.MP3.V2.VBR-aAF", false, 1)] + [TestCase("Artist.Title-Album.Title.2017.MP3.V2.VBR-aAF", false, 1)] + [TestCase("Artist.Title-Album.Title.2017.MP3.V2.VBR-aAF", false, 1)] + [TestCase("Artist.Title-Album.Title.2017.MP3.V2.VBR-DEMAND", false, 1)] + [TestCase("Artist.Title-Album.Title.2017.MP3.V2.VBR-DEMAND", false, 1)] public void should_be_able_to_parse_repack(string title, bool isRepack, int version) { var result = QualityParser.ParseQuality(title, null, 0); diff --git a/src/NzbDrone.Core/Parser/QualityParser.cs b/src/NzbDrone.Core/Parser/QualityParser.cs index 91441e804..9b3c2d6c9 100644 --- a/src/NzbDrone.Core/Parser/QualityParser.cs +++ b/src/NzbDrone.Core/Parser/QualityParser.cs @@ -18,7 +18,7 @@ namespace NzbDrone.Core.Parser private static readonly Regex RepackRegex = new (@"\b(?repack\d?|rerip\d?)\b", RegexOptions.Compiled | RegexOptions.IgnoreCase); - private static readonly Regex VersionRegex = new (@"\d[-._ ]?v(?\d)[-._ ]|\[v(?\d)\]|repack(?\d)|rerip(?\d)", + private static readonly Regex VersionRegex = new (@"(?:\d(?\d)[-._ ]|\[v(?\d)\]|repack(?\d)|rerip(?\d)", RegexOptions.Compiled | RegexOptions.IgnoreCase); private static readonly Regex RealRegex = new (@"\b(?REAL)\b",