From 19d625c6c568abc0d645e767aab1d7980f60776e Mon Sep 17 00:00:00 2001 From: Taloth Saldono Date: Mon, 10 Oct 2016 22:36:58 +0200 Subject: [PATCH] Fixed: Changed Quality Parser to avoid matching tags in the Episode title instead of the Quality tags. --- .../ParserTests/QualityParserFixture.cs | 1 + src/NzbDrone.Core/Parser/QualityParser.cs | 194 +++++++++--------- 2 files changed, 100 insertions(+), 95 deletions(-) diff --git a/src/NzbDrone.Core.Test/ParserTests/QualityParserFixture.cs b/src/NzbDrone.Core.Test/ParserTests/QualityParserFixture.cs index 52dfc1fde..3eabec7e9 100644 --- a/src/NzbDrone.Core.Test/ParserTests/QualityParserFixture.cs +++ b/src/NzbDrone.Core.Test/ParserTests/QualityParserFixture.cs @@ -165,6 +165,7 @@ namespace NzbDrone.Core.Test.ParserTests [TestCase("Series Title S06E08 1080p WEB h264-EXCLUSIVE", false)] [TestCase("Series Title S06E08 No One PROPER 1080p WEB DD5 1 H 264-EXCLUSIVE", true)] [TestCase("Series Title S06E08 No One PROPER 1080p WEB H 264-EXCLUSIVE", true)] + [TestCase("The.Simpsons.S25E21.Pay.Pal.1080p.WEB-DL.DD5.1.H.264-NTb", false)] public void should_parse_webdl1080p_quality(string title, bool proper) { ParseAndVerifyQuality(title, Quality.WEBDL1080p, proper); diff --git a/src/NzbDrone.Core/Parser/QualityParser.cs b/src/NzbDrone.Core/Parser/QualityParser.cs index 8e869808f..280de776b 100644 --- a/src/NzbDrone.Core/Parser/QualityParser.cs +++ b/src/NzbDrone.Core/Parser/QualityParser.cs @@ -1,5 +1,6 @@ using System; using System.IO; +using System.Linq; using System.Text.RegularExpressions; using NLog; using NzbDrone.Common.Extensions; @@ -64,137 +65,140 @@ namespace NzbDrone.Core.Parser result.Quality = Quality.RAWHD; return result; } - - var sourceMatch = SourceRegex.Match(normalizedName); + + var sourceMatch = SourceRegex.Matches(normalizedName).OfType().LastOrDefault(); var resolution = ParseResolution(normalizedName); var codecRegex = CodecRegex.Match(normalizedName); - if (sourceMatch.Groups["bluray"].Success) + if (sourceMatch != null && sourceMatch.Success) { - if (codecRegex.Groups["xvid"].Success || codecRegex.Groups["divx"].Success) + if (sourceMatch.Groups["bluray"].Success) { - result.Quality = Quality.DVD; - return result; - } + if (codecRegex.Groups["xvid"].Success || codecRegex.Groups["divx"].Success) + { + result.Quality = Quality.DVD; + return result; + } - if (resolution == Resolution._2160p) - { - result.Quality = Quality.Bluray2160p; - return result; - } + if (resolution == Resolution._2160p) + { + result.Quality = Quality.Bluray2160p; + return result; + } - if (resolution == Resolution._1080p) - { - result.Quality = Quality.Bluray1080p; + if (resolution == Resolution._1080p) + { + result.Quality = Quality.Bluray1080p; + return result; + } + + if (resolution == Resolution._480p || resolution == Resolution._576p) + { + result.Quality = Quality.DVD; + return result; + } + + result.Quality = Quality.Bluray720p; return result; } - if (resolution == Resolution._480p || resolution == Resolution._576p) + if (sourceMatch.Groups["webdl"].Success) { - result.Quality = Quality.DVD; - return result; - } + if (resolution == Resolution._2160p) + { + result.Quality = Quality.WEBDL2160p; + return result; + } - result.Quality = Quality.Bluray720p; - return result; - } + if (resolution == Resolution._1080p) + { + result.Quality = Quality.WEBDL1080p; + return result; + } - if (sourceMatch.Groups["webdl"].Success) - { - if (resolution == Resolution._2160p) - { - result.Quality = Quality.WEBDL2160p; - return result; - } + if (resolution == Resolution._720p) + { + result.Quality = Quality.WEBDL720p; + return result; + } - if (resolution == Resolution._1080p) - { - result.Quality = Quality.WEBDL1080p; - return result; - } + if (name.Contains("[WEBDL]")) + { + result.Quality = Quality.WEBDL720p; + return result; + } - if (resolution == Resolution._720p) - { - result.Quality = Quality.WEBDL720p; + result.Quality = Quality.WEBDL480p; return result; } - if (name.Contains("[WEBDL]")) + if (sourceMatch.Groups["hdtv"].Success) { - result.Quality = Quality.WEBDL720p; - return result; - } + if (resolution == Resolution._2160p) + { + result.Quality = Quality.HDTV2160p; + return result; + } - result.Quality = Quality.WEBDL480p; - return result; - } + if (resolution == Resolution._1080p) + { + result.Quality = Quality.HDTV1080p; + return result; + } - if (sourceMatch.Groups["hdtv"].Success) - { - if (resolution == Resolution._2160p) - { - result.Quality = Quality.HDTV2160p; - return result; - } + if (resolution == Resolution._720p) + { + result.Quality = Quality.HDTV720p; + return result; + } - if (resolution == Resolution._1080p) - { - result.Quality = Quality.HDTV1080p; + if (name.Contains("[HDTV]")) + { + result.Quality = Quality.HDTV720p; + return result; + } + + result.Quality = Quality.SDTV; return result; } - if (resolution == Resolution._720p) + if (sourceMatch.Groups["bdrip"].Success || + sourceMatch.Groups["brrip"].Success) { - result.Quality = Quality.HDTV720p; - return result; + switch (resolution) + { + case Resolution._720p: + result.Quality = Quality.Bluray720p; + return result; + case Resolution._1080p: + result.Quality = Quality.Bluray1080p; + return result; + default: + result.Quality = Quality.DVD; + return result; + } } - if (name.Contains("[HDTV]")) + if (sourceMatch.Groups["dvd"].Success) { - result.Quality = Quality.HDTV720p; + result.Quality = Quality.DVD; return result; } - result.Quality = Quality.SDTV; - return result; - } - - if (sourceMatch.Groups["bdrip"].Success || - sourceMatch.Groups["brrip"].Success) - { - switch (resolution) + if (sourceMatch.Groups["pdtv"].Success || + sourceMatch.Groups["sdtv"].Success || + sourceMatch.Groups["dsr"].Success || + sourceMatch.Groups["tvrip"].Success) { - case Resolution._720p: - result.Quality = Quality.Bluray720p; - return result; - case Resolution._1080p: - result.Quality = Quality.Bluray1080p; + if (HighDefPdtvRegex.IsMatch(normalizedName)) + { + result.Quality = Quality.HDTV720p; return result; - default: - result.Quality = Quality.DVD; - return result; - } - } + } - if (sourceMatch.Groups["dvd"].Success) - { - result.Quality = Quality.DVD; - return result; - } - - if (sourceMatch.Groups["pdtv"].Success || - sourceMatch.Groups["sdtv"].Success || - sourceMatch.Groups["dsr"].Success || - sourceMatch.Groups["tvrip"].Success) - { - if (HighDefPdtvRegex.IsMatch(normalizedName)) - { - result.Quality = Quality.HDTV720p; + result.Quality = Quality.SDTV; return result; } - - result.Quality = Quality.SDTV; - return result; } @@ -304,7 +308,7 @@ namespace NzbDrone.Core.Parser } catch (ArgumentException) { - //Swallow exception for cases where string contains illegal + //Swallow exception for cases where string contains illegal //path characters. } }