From bbdad5844faa11de8c645f84eec6c4ce7ad803a6 Mon Sep 17 00:00:00 2001 From: "kay.one" Date: Mon, 23 May 2011 21:41:57 -0700 Subject: [PATCH] fixed quality parse bug --- NzbDrone.Core.Test/ParserTest.cs | 9 ++++++--- NzbDrone.Core/Parser.cs | 5 +++-- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/NzbDrone.Core.Test/ParserTest.cs b/NzbDrone.Core.Test/ParserTest.cs index cd8c2bf64..4231c2dbf 100644 --- a/NzbDrone.Core.Test/ParserTest.cs +++ b/NzbDrone.Core.Test/ParserTest.cs @@ -17,8 +17,8 @@ namespace NzbDrone.Core.Test */ - - + + [Test] [Row("Sonny.With.a.Chance.S02E15", "Sonny.With.a.Chance", 2, 15)] @@ -91,6 +91,9 @@ namespace NzbDrone.Core.Test [Row("WEEDS.S03E01-06.DUAL.BDRip.XviD.AC3.-HELLYWOOD.avi", QualityTypes.DVD)] [Row("Law & Order: Special Victims Unit - 11x11 - Quickie", QualityTypes.Unknown)] [Row("(NZB)", QualityTypes.Unknown)] + [Row("S07E23 - [HDTV].mkv ", QualityTypes.HDTV)] + [Row("S07E23.mkv ", QualityTypes.HDTV)] + [Row("S07E23 .avi ", QualityTypes.SDTV)] public void quality_parse(string postTitle, object quality) { var result = Parser.ParseQuality(postTitle); @@ -121,7 +124,7 @@ namespace NzbDrone.Core.Test [Row("The Tonight Show With Jay Leno 2011 04 15 1080i HDTV DD5 1 MPEG2 TrollHD", "The Tonight Show With Jay Leno", 2011, 04, 15)] [Row("The.Daily.Show.2010.10.11.Johnny.Knoxville.iTouch-MW", "The.Daily.Show", 2010, 10, 11)] [Row("The Daily Show - 2011-04-12 - Gov. Deval Patrick", "The.Daily.Show", 2011, 04, 12)] - [Row("2011.01.10 - Denis Leary - HD TV.mkv","", 2011, 1, 10)] + [Row("2011.01.10 - Denis Leary - HD TV.mkv", "", 2011, 1, 10)] [Row("2011.03.13 - Denis Leary - HD TV.mkv", "", 2011, 3, 13)] public void episode_daily_parse(string postTitle, string title, int year, int month, int day) { diff --git a/NzbDrone.Core/Parser.cs b/NzbDrone.Core/Parser.cs index 91b4e7a82..3728252ac 100644 --- a/NzbDrone.Core/Parser.cs +++ b/NzbDrone.Core/Parser.cs @@ -205,7 +205,7 @@ namespace NzbDrone.Core Logger.Trace("Trying to parse quality for {0}", name); var result = QualityTypes.Unknown; - name = name.ToLowerInvariant(); + name = name.ToLowerInvariant().Trim(); if (name.Contains("dvd") || name.Contains("bdrip") || name.Contains("brrip")) { @@ -268,7 +268,8 @@ namespace NzbDrone.Core //path characters. } } - if (name.Contains("hdtv")) + + if (result == QualityTypes.Unknown && name.Contains("hdtv")) { return QualityTypes.SDTV; }