From 0de3f10701d9994db1d39051c8832c43fa715539 Mon Sep 17 00:00:00 2001 From: Mark McDowall Date: Sun, 25 Oct 2020 17:17:57 -0700 Subject: [PATCH] Fixed: 1080i HDTV H264 incorrectly being detected as Raw HD --- src/NzbDrone.Core.Test/ParserTests/QualityParserFixture.cs | 1 + src/NzbDrone.Core/Parser/QualityParser.cs | 4 +--- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/src/NzbDrone.Core.Test/ParserTests/QualityParserFixture.cs b/src/NzbDrone.Core.Test/ParserTests/QualityParserFixture.cs index 1453dae83..96eb510dc 100644 --- a/src/NzbDrone.Core.Test/ParserTests/QualityParserFixture.cs +++ b/src/NzbDrone.Core.Test/ParserTests/QualityParserFixture.cs @@ -157,6 +157,7 @@ namespace NzbDrone.Core.Test.ParserTests [TestCase("[Kousei]_One_Piece_ - _609_[FHD][648A87C7].mp4", false)] [TestCase("Presunto culpable 1x02 Culpabilidad [HDTV 1080i AVC MP2 2.0 Sub][GrupoHDS]", false)] [TestCase("Cuéntame cómo pasó - 19x15 [344] Cuarenta años de baile [HDTV 1080i AVC MP2 2.0 Sub][GrupoHDS]", false)] + [TestCase("Super.Robot.Monkey.Team.Hyperforce.Go.S01E02.Depths.of.Fear.1080i.HDTV.DD5.1.H.264-NOGRP", false)] public void should_parse_hdtv1080p_quality(string title, bool proper) { ParseAndVerifyQuality(title, Quality.HDTV1080p, proper); diff --git a/src/NzbDrone.Core/Parser/QualityParser.cs b/src/NzbDrone.Core/Parser/QualityParser.cs index d9812349f..23f5b6d68 100644 --- a/src/NzbDrone.Core/Parser/QualityParser.cs +++ b/src/NzbDrone.Core/Parser/QualityParser.cs @@ -2,9 +2,7 @@ using System; using System.IO; using System.Linq; using System.Text.RegularExpressions; -using System.Web.UI; using NLog; -using NzbDrone.Common.Disk; using NzbDrone.Common.Extensions; using NzbDrone.Common.Instrumentation; using NzbDrone.Core.MediaFiles; @@ -31,7 +29,7 @@ namespace NzbDrone.Core.Parser )(?:\b|$|[ .])", RegexOptions.Compiled | RegexOptions.IgnoreCase | RegexOptions.IgnorePatternWhitespace); - private static readonly Regex RawHDRegex = new Regex(@"\b(?RawHD|1080i[-_. ]HDTV|Raw[-_. ]HD)\b", + private static readonly Regex RawHDRegex = new Regex(@"\b(?RawHD|Raw[-_. ]HD)\b", RegexOptions.Compiled | RegexOptions.IgnoreCase); private static readonly Regex MPEG2Regex = new Regex(@"\b(?MPEG[-_. ]?2)\b");