From 471f0016b481647261f07084f019a155836062e0 Mon Sep 17 00:00:00 2001 From: bakerboy448 <55419169+bakerboy448@users.noreply.github.com> Date: Tue, 29 Dec 2020 19:16:03 -0600 Subject: [PATCH] Fixed: Additional handling for obfuscated releases closes #4198 --- src/NzbDrone.Core.Test/ParserTests/HashedReleaseFixture.cs | 7 +++++++ src/NzbDrone.Core.Test/ParserTests/QualityParserFixture.cs | 2 +- src/NzbDrone.Core/Parser/Parser.cs | 3 +++ 3 files changed, 11 insertions(+), 1 deletion(-) diff --git a/src/NzbDrone.Core.Test/ParserTests/HashedReleaseFixture.cs b/src/NzbDrone.Core.Test/ParserTests/HashedReleaseFixture.cs index ecc7f87b6..a9ccf9485 100644 --- a/src/NzbDrone.Core.Test/ParserTests/HashedReleaseFixture.cs +++ b/src/NzbDrone.Core.Test/ParserTests/HashedReleaseFixture.cs @@ -115,6 +115,13 @@ namespace NzbDrone.Core.Test.ParserTests "Series Title", Quality.HDTV720p, null + }, + new object[] + { + @"C:\Test\tv\Series.Title.S04E03.Episode.Name.1080p.AMZN.WEB-DL.DDP5.1.H.264-NTb\cwnOJYks5E2WP7zGuzPkdkRK3JkWw0.mkv".AsOsAgnostic(), + "Series Title", + Quality.WEBDL1080p, + "NTb" } }; diff --git a/src/NzbDrone.Core.Test/ParserTests/QualityParserFixture.cs b/src/NzbDrone.Core.Test/ParserTests/QualityParserFixture.cs index da7e286e4..69110e419 100644 --- a/src/NzbDrone.Core.Test/ParserTests/QualityParserFixture.cs +++ b/src/NzbDrone.Core.Test/ParserTests/QualityParserFixture.cs @@ -240,7 +240,7 @@ namespace NzbDrone.Core.Test.ParserTests [TestCase("Better.Call.Saul.S03E09.1080p.NF.WEBRip.DD5.1.x264-ViSUM", false)] [TestCase("The Walking Dead S09E13 1.54 GB WEB-RIP 1080p Dual-Audio 2019 MKV", false)] [TestCase("Series.Title.1x04.ITA.1080p.WEBMux.x264-NovaRip", false)] - [TestCase("The.Mandalorian.2019.S02E07.Chapter.15.The.Believer.4Kto1080p.DSNYP.Webrip.x265.10bit.EAC3.5.1.Atmos.GokiTAoE", false)] + [TestCase("Series.Title.2019.S02E07.Chapter.15.The.Believer.4Kto1080p.DSNYP.Webrip.x265.10bit.EAC3.5.1.Atmos.GokiTAoE", false)] public void should_parse_webrip1080p_quality(string title, bool proper) { ParseAndVerifyQuality(title, Quality.WEBRip1080p, proper); diff --git a/src/NzbDrone.Core/Parser/Parser.cs b/src/NzbDrone.Core/Parser/Parser.cs index 0e697f4c9..23c2e81c2 100644 --- a/src/NzbDrone.Core/Parser/Parser.cs +++ b/src/NzbDrone.Core/Parser/Parser.cs @@ -346,6 +346,9 @@ namespace NzbDrone.Core.Parser // 170424_26 - Started appearing August 2018 new Regex(@"^\d{6}_\d{2}$"), + + // additional Generic match for mixed-case hashes. - Started appearing Dec 2020 + new Regex(@"^[0-9a-zA-Z]{30}", RegexOptions.Compiled), }; private static readonly Regex[] SeasonFolderRegexes = new Regex[]