open-source-mirrors
/
Lidarr
mirror of https://github.com/Lidarr/Lidarr
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

QualityParserFixture improvements, m2ts will default to HDTV720p

Browse Source
pull/4/head
Mark McDowall 11 years ago
parent d5e1be39f1
commit b2ab9c1547
2 changed files with 107 additions and 177 deletions
Show Stats Download Patch File Download Diff File

282
NzbDrone.Core.Test/ParserTests/QualityParserFixture.cs
Unescape View File

@ -1,6 +1,4 @@
 using System;
using System;
using FluentAssertions; using FluentAssertions;
using NUnit.Framework; using NUnit.Framework;
using NzbDrone.Core.Qualities; using NzbDrone.Core.Qualities;
@ -12,120 +10,6 @@ namespace NzbDrone.Core.Test.ParserTests
public class QualityParserFixture : CoreTest public class QualityParserFixture : CoreTest
{ {
public static object[] SdtvCases =
{
new object[] { "S07E23 .avi ", false },
new object[] {"The.Shield.S01E13.x264-CtrlSD", false},
new object[] { "Nikita S02E01 HDTV XviD 2HD", false },
new object[] { "Gossip Girl S05E11 PROPER HDTV XviD 2HD", true },
new object[] { "The Jonathan Ross Show S02E08 HDTV x264 FTP", false },
new object[] { "White.Van.Man.2011.S02E01.WS.PDTV.x264-TLA", false },
new object[] { "White.Van.Man.2011.S02E01.WS.PDTV.x264-REPACK-TLA", true },
new object[] { "The Real Housewives of Vancouver S01E04 DSR x264 2HD", false },
new object[] { "Vanguard S01E04 Mexicos Death Train DSR x264 MiNDTHEGAP", false },
new object[] { "Chuck S11E03 has no periods or extension HDTV", false },
new object[] { "Chuck.S04E05.HDTV.XviD-LOL", false },
new object[] { "Sonny.With.a.Chance.S02E15.avi", false },
new object[] { "Sonny.With.a.Chance.S02E15.xvid", false },
new object[] { "Sonny.With.a.Chance.S02E15.divx", false },
new object[] { "The.Girls.Next.Door.S03E06.HDTV-WiDE", false },
new object[] { "Degrassi.S10E27.WS.DSR.XviD-2HD", false },
};
public static object[] DvdCases =
{
new object[] { "WEEDS.S03E01-06.DUAL.XviD.Bluray.AC3-REPACK.-HELLYWOOD.avi", true },
new object[] { "The.Shield.S01E13.NTSC.x264-CtrlSD", false },
new object[] { "WEEDS.S03E01-06.DUAL.BDRip.XviD.AC3.-HELLYWOOD", false },
new object[] { "WEEDS.S03E01-06.DUAL.BDRip.X-viD.AC3.-HELLYWOOD", false },
new object[] { "WEEDS.S03E01-06.DUAL.BDRip.AC3.-HELLYWOOD", false },
new object[] { "WEEDS.S03E01-06.DUAL.BDRip.XviD.AC3.-HELLYWOOD.avi", false },
new object[] { "WEEDS.S03E01-06.DUAL.BDRip.XviD.AC3.-HELLYWOOD.avi", false },
new object[] { "WEEDS.S03E01-06.DUAL.XviD.Bluray.AC3.-HELLYWOOD.avi", false },
new object[] { "The.Girls.Next.Door.S03E06.DVDRip.XviD-WiDE", false },
new object[] { "The.Girls.Next.Door.S03E06.DVD.Rip.XviD-WiDE", false },
new object[] { "the.shield.1x13.circles.ws.xvidvd-tns", false}
};
public static object[] Webdl480pCases =
{
new object[] { "Elementary.S01E10.The.Leviathan.480p.WEB-DL.x264-mSD", false },
new object[] { "Glee.S04E10.Glee.Actually.480p.WEB-DL.x264-mSD", false },
new object[] { "The.Big.Bang.Theory.S06E11.The.Santa.Simulation.480p.WEB-DL.x264-mSD", false },
};
public static object[] Hdtv720pCases =
{
new object[] { "Dexter - S01E01 - Title [HDTV]", false },
new object[] { "Dexter - S01E01 - Title [HDTV-720p]", false },
new object[] { "Pawn Stars S04E87 REPACK 720p HDTV x264 aAF", true },
new object[] { "Sonny.With.a.Chance.S02E15.720p", false },
new object[] { "S07E23 - [HDTV-720p].mkv ", false },
new object[] { "Chuck - S22E03 - MoneyBART - HD TV.mkv", false },
new object[] { "S07E23.mkv ", false },
new object[] { "Two.and.a.Half.Men.S08E05.720p.HDTV.X264-DIMENSION", false },
new object[] { "Sonny.With.a.Chance.S02E15.mkv", false },
};
public static object[] Hdtv1080pCases =
{
new object[] { "Under the Dome S01E10 Let the Games Begin 1080p", false },
new object[] { "DEXTER.S07E01.ARE.YOU.1080P.HDTV.X264-QCF", false },
new object[] { "DEXTER.S07E01.ARE.YOU.1080P.HDTV.x264-QCF", false },
new object[] { "DEXTER.S07E01.ARE.YOU.1080P.HDTV.proper.X264-QCF", true },
new object[] { "Dexter - S01E01 - Title [HDTV-1080p]", false },
};
public static object[] Webdl720pCases =
{
new object[] { "Arrested.Development.S04E01.720p.WEBRip.AAC2.0.x264-NFRiP", false },
new object[] { "Vanguard S01E04 Mexicos Death Train 720p WEB DL", false },
new object[] { "Hawaii Five 0 S02E21 720p WEB DL DD5 1 H 264", false },
new object[] { "Castle S04E22 720p WEB DL DD5 1 H 264 NFHD", false },
new object[] { "Chuck - S11E06 - D-Yikes! - 720p WEB-DL.mkv", false },
new object[] { "Sonny.With.a.Chance.S02E15.720p.WEB-DL.DD5.1.H.264-SURFER", false },
new object[] { "S07E23 - [WEBDL].mkv ", false },
new object[] { "Fringe S04E22 720p WEB-DL DD5.1 H264-EbP.mkv", false },
};
public static object[] Webdl1080pCases =
{
new object[] { "Arrested.Development.S04E01.iNTERNAL.1080p.WEBRip.x264-QRUS", false },
new object[] { "CSI NY S09E03 1080p WEB DL DD5 1 H264 NFHD", false },
new object[] { "Two and a Half Men S10E03 1080p WEB DL DD5 1 H 264 NFHD", false },
new object[] { "Criminal.Minds.S08E01.1080p.WEB-DL.DD5.1.H264-NFHD", false },
new object[] { "Its.Always.Sunny.in.Philadelphia.S08E01.1080p.WEB-DL.proper.AAC2.0.H.264", true },
new object[] { "Two and a Half Men S10E03 1080p WEB DL DD5 1 H 264 REPACK NFHD", true },
new object[] { "Glee.S04E09.Swan.Song.1080p.WEB-DL.DD5.1.H.264-ECI", false },
new object[] { "The.Big.Bang.Theory.S06E11.The.Santa.Simulation.1080p.WEB-DL.DD5.1.H.264", false },
};
public static object[] Bluray720pCases =
{
new object[] { "WEEDS.S03E01-06.DUAL.Bluray.AC3.-HELLYWOOD.avi", false },
new object[] { "Chuck - S01E03 - Come Fly With Me - 720p BluRay.mkv", false },
};
public static object[] Bluray1080pCases =
{
new object[] { "Chuck - S01E03 - Come Fly With Me - 1080p BluRay.mkv", false },
new object[] { "Sons.Of.Anarchy.S02E13.1080p.BluRay.x264-AVCDVD", false },
};
public static object[] RawCases =
{
new object[] { "POI S02E11 1080i HDTV DD5.1 MPEG2-TrollHD", false },
new object[] { "How I Met Your Mother S01E18 Nothing Good Happens After 2 A.M. 720p HDTV DD5.1 MPEG2-TrollHD", false },
new object[] { "The Voice S01E11 The Finals 1080i HDTV DD5.1 MPEG2-TrollHD", false },
};
public static object[] UnknownCases =
{
new object[] { "Sonny.With.a.Chance.S02E15", false },
new object[] { "Law & Order: Special Victims Unit - 11x11 - Quickie", false },
};
public static object[] SelfQualityParserCases = public static object[] SelfQualityParserCases =
{ {
new object[] { Quality.SDTV }, new object[] { Quality.SDTV },
@ -138,92 +22,129 @@ namespace NzbDrone.Core.Test.ParserTests
new object[] { Quality.Bluray1080p } new object[] { Quality.Bluray1080p }
}; };
[Test, TestCaseSource("SdtvCases")] [TestCase("S07E23 .avi ", false)]
public void should_parse_sdtv_quality(string postTitle, bool proper) [TestCase("The.Shield.S01E13.x264-CtrlSD", false)]
{ [TestCase("Nikita S02E01 HDTV XviD 2HD", false)]
var result = Parser.QualityParser.ParseQuality(postTitle); [TestCase("Gossip Girl S05E11 PROPER HDTV XviD 2HD", true)]
result.Quality.Should().Be(Quality.SDTV); [TestCase("The Jonathan Ross Show S02E08 HDTV x264 FTP", false)]
result.Proper.Should().Be(proper); [TestCase("White.Van.Man.2011.S02E01.WS.PDTV.x264-TLA", false)]
[TestCase("White.Van.Man.2011.S02E01.WS.PDTV.x264-REPACK-TLA", true)]
[TestCase("The Real Housewives of Vancouver S01E04 DSR x264 2HD", false)]
[TestCase("Vanguard S01E04 Mexicos Death Train DSR x264 MiNDTHEGAP", false)]
[TestCase("Chuck S11E03 has no periods or extension HDTV", false)]
[TestCase("Chuck.S04E05.HDTV.XviD-LOL", false)]
[TestCase("Sonny.With.a.Chance.S02E15.avi", false)]
[TestCase("Sonny.With.a.Chance.S02E15.xvid", false)]
[TestCase("Sonny.With.a.Chance.S02E15.divx", false)]
[TestCase("The.Girls.Next.Door.S03E06.HDTV-WiDE", false)]
[TestCase("Degrassi.S10E27.WS.DSR.XviD-2HD", false)]
public void should_parse_sdtv_quality(string title, bool proper)
{
ParseAndVerifyQuality(title, Quality.SDTV, proper);
} }
[Test, TestCaseSource("DvdCases")] [TestCase("WEEDS.S03E01-06.DUAL.XviD.Bluray.AC3-REPACK.-HELLYWOOD.avi", true)]
public void should_parse_dvd_quality(string postTitle, bool proper) [TestCase("The.Shield.S01E13.NTSC.x264-CtrlSD", false)]
{ [TestCase("WEEDS.S03E01-06.DUAL.BDRip.XviD.AC3.-HELLYWOOD", false)]
var result = Parser.QualityParser.ParseQuality(postTitle); [TestCase("WEEDS.S03E01-06.DUAL.BDRip.X-viD.AC3.-HELLYWOOD", false)]
result.Quality.Should().Be(Quality.DVD); [TestCase("WEEDS.S03E01-06.DUAL.BDRip.AC3.-HELLYWOOD", false)]
result.Proper.Should().Be(proper); [TestCase("WEEDS.S03E01-06.DUAL.BDRip.XviD.AC3.-HELLYWOOD.avi", false)]
[TestCase("WEEDS.S03E01-06.DUAL.BDRip.XviD.AC3.-HELLYWOOD.avi", false)]
[TestCase("WEEDS.S03E01-06.DUAL.XviD.Bluray.AC3.-HELLYWOOD.avi", false)]
[TestCase("The.Girls.Next.Door.S03E06.DVDRip.XviD-WiDE", false)]
[TestCase("The.Girls.Next.Door.S03E06.DVD.Rip.XviD-WiDE", false)]
[TestCase("the.shield.1x13.circles.ws.xvidvd-tns", false)]
public void should_parse_dvd_quality(string title, bool proper)
{
ParseAndVerifyQuality(title, Quality.DVD, proper);
} }
[Test, TestCaseSource("Webdl480pCases")] [TestCase("Elementary.S01E10.The.Leviathan.480p.WEB-DL.x264-mSD", false)]
public void should_parse_webdl480p_quality(string postTitle, bool proper) [TestCase("Glee.S04E10.Glee.Actually.480p.WEB-DL.x264-mSD", false)]
[TestCase("The.Big.Bang.Theory.S06E11.The.Santa.Simulation.480p.WEB-DL.x264-mSD", false)]
public void should_parse_webdl480p_quality(string title, bool proper)
{ {
var result = Parser.QualityParser.ParseQuality(postTitle); ParseAndVerifyQuality(title, Quality.WEBDL480p, proper);
result.Quality.Should().Be(Quality.WEBDL480p);
result.Proper.Should().Be(proper);
} }
[Test, TestCaseSource("Hdtv720pCases")] [TestCase("Dexter - S01E01 - Title [HDTV]", false)]
public void should_parse_hdtv720p_quality(string postTitle, bool proper) [TestCase("Dexter - S01E01 - Title [HDTV-720p]", false)]
{ [TestCase("Pawn Stars S04E87 REPACK 720p HDTV x264 aAF", true)]
var result = Parser.QualityParser.ParseQuality(postTitle); [TestCase("Sonny.With.a.Chance.S02E15.720p", false)]
result.Quality.Should().Be(Quality.HDTV720p); [TestCase("S07E23 - [HDTV-720p].mkv ", false)]
result.Proper.Should().Be(proper); [TestCase("Chuck - S22E03 - MoneyBART - HD TV.mkv", false)]
[TestCase("S07E23.mkv ", false)]
[TestCase("Two.and.a.Half.Men.S08E05.720p.HDTV.X264-DIMENSION", false)]
[TestCase("Sonny.With.a.Chance.S02E15.mkv", false)]
[TestCase("The Big Bang Theory.S03E01.The Electric Can Opener Fluctuation.m2ts", false)]
public void should_parse_hdtv720p_quality(string title, bool proper)
{
ParseAndVerifyQuality(title, Quality.HDTV720p, proper);
} }
[Test, TestCaseSource("Hdtv1080pCases")] [TestCase("Under the Dome S01E10 Let the Games Begin 1080p", false)]
public void should_parse_hdtv1080p_quality(string postTitle, bool proper) [TestCase("DEXTER.S07E01.ARE.YOU.1080P.HDTV.X264-QCF", false)]
[TestCase("DEXTER.S07E01.ARE.YOU.1080P.HDTV.x264-QCF", false)]
[TestCase("DEXTER.S07E01.ARE.YOU.1080P.HDTV.proper.X264-QCF", true)]
[TestCase("Dexter - S01E01 - Title [HDTV-1080p]", false)]
public void should_parse_hdtv1080p_quality(string title, bool proper)
{ {
var result = Parser.QualityParser.ParseQuality(postTitle); ParseAndVerifyQuality(title, Quality.HDTV1080p, proper);
result.Quality.Should().Be(Quality.HDTV1080p);
result.Proper.Should().Be(proper);
} }
[Test, TestCaseSource("Webdl720pCases")] [TestCase("Arrested.Development.S04E01.720p.WEBRip.AAC2.0.x264-NFRiP", false)]
public void should_parse_webdl720p_quality(string postTitle, bool proper) [TestCase("Vanguard S01E04 Mexicos Death Train 720p WEB DL", false)]
{ [TestCase("Hawaii Five 0 S02E21 720p WEB DL DD5 1 H 264", false)]
var result = Parser.QualityParser.ParseQuality(postTitle); [TestCase("Castle S04E22 720p WEB DL DD5 1 H 264 NFHD", false)]
result.Quality.Should().Be(Quality.WEBDL720p); [TestCase("Chuck - S11E06 - D-Yikes! - 720p WEB-DL.mkv", false)]
result.Proper.Should().Be(proper); [TestCase("Sonny.With.a.Chance.S02E15.720p.WEB-DL.DD5.1.H.264-SURFER", false)]
[TestCase("S07E23 - [WEBDL].mkv ", false)]
[TestCase("Fringe S04E22 720p WEB-DL DD5.1 H264-EbP.mkv", false)]
public void should_parse_webdl720p_quality(string title, bool proper)
{
ParseAndVerifyQuality(title, Quality.WEBDL720p, proper);
} }
[Test, TestCaseSource("Webdl1080pCases")] [TestCase("Arrested.Development.S04E01.iNTERNAL.1080p.WEBRip.x264-QRUS", false)]
public void should_parse_webdl1080p_quality(string postTitle, bool proper) [TestCase("CSI NY S09E03 1080p WEB DL DD5 1 H264 NFHD", false)]
{ [TestCase("Two and a Half Men S10E03 1080p WEB DL DD5 1 H 264 NFHD", false)]
var result = Parser.QualityParser.ParseQuality(postTitle); [TestCase("Criminal.Minds.S08E01.1080p.WEB-DL.DD5.1.H264-NFHD", false)]
result.Quality.Should().Be(Quality.WEBDL1080p); [TestCase("Its.Always.Sunny.in.Philadelphia.S08E01.1080p.WEB-DL.proper.AAC2.0.H.264", true)]
result.Proper.Should().Be(proper); [TestCase("Two and a Half Men S10E03 1080p WEB DL DD5 1 H 264 REPACK NFHD", true)]
[TestCase("Glee.S04E09.Swan.Song.1080p.WEB-DL.DD5.1.H.264-ECI", false)]
[TestCase("The.Big.Bang.Theory.S06E11.The.Santa.Simulation.1080p.WEB-DL.DD5.1.H.264", false)]
public void should_parse_webdl1080p_quality(string title, bool proper)
{
ParseAndVerifyQuality(title, Quality.WEBDL1080p, proper);
} }
[Test, TestCaseSource("Bluray720pCases")] [TestCase("WEEDS.S03E01-06.DUAL.Bluray.AC3.-HELLYWOOD.avi", false)]
public void should_parse_bluray720p_quality(string postTitle, bool proper) [TestCase("Chuck - S01E03 - Come Fly With Me - 720p BluRay.mkv", false)]
public void should_parse_bluray720p_quality(string title, bool proper)
{ {
var result = Parser.QualityParser.ParseQuality(postTitle); ParseAndVerifyQuality(title, Quality.Bluray720p, proper);
result.Quality.Should().Be(Quality.Bluray720p);
result.Proper.Should().Be(proper);
} }
[Test, TestCaseSource("Bluray1080pCases")] [TestCase("Chuck - S01E03 - Come Fly With Me - 1080p BluRay.mkv", false)]
public void should_parse_bluray1080p_quality(string postTitle, bool proper) [TestCase("Sons.Of.Anarchy.S02E13.1080p.BluRay.x264-AVCDVD", false)]
public void should_parse_bluray1080p_quality(string title, bool proper)
{ {
var result = Parser.QualityParser.ParseQuality(postTitle); ParseAndVerifyQuality(title, Quality.Bluray1080p, proper);
result.Quality.Should().Be(Quality.Bluray1080p);
result.Proper.Should().Be(proper);
} }
[Test, TestCaseSource("RawCases")] [TestCase("POI S02E11 1080i HDTV DD5.1 MPEG2-TrollHD", false)]
public void should_parse_raw_quality(string postTitle, bool proper) [TestCase("How I Met Your Mother S01E18 Nothing Good Happens After 2 A.M. 720p HDTV DD5.1 MPEG2-TrollHD", false)]
[TestCase("The Voice S01E11 The Finals 1080i HDTV DD5.1 MPEG2-TrollHD", false)]
public void should_parse_raw_quality(string title, bool proper)
{ {
var result = Parser.QualityParser.ParseQuality(postTitle); ParseAndVerifyQuality(title, Quality.RAWHD, proper);
result.Quality.Should().Be(Quality.RAWHD);
result.Proper.Should().Be(proper);
} }
[Test, TestCaseSource("UnknownCases")] [TestCase("Sonny.With.a.Chance.S02E15", false)]
public void quality_parse(string postTitle, bool proper) [TestCase("Law & Order: Special Victims Unit - 11x11 - Quickie", false)]
public void quality_parse(string title, bool proper)
{ {
var result = Parser.QualityParser.ParseQuality(postTitle); ParseAndVerifyQuality(title, Quality.Unknown, proper);
result.Quality.Should().Be(Quality.Unknown);
result.Proper.Should().Be(proper);
} }
[Test, TestCaseSource("SelfQualityParserCases")] [Test, TestCaseSource("SelfQualityParserCases")]
@ -233,5 +154,12 @@ namespace NzbDrone.Core.Test.ParserTests
var result = Parser.QualityParser.ParseQuality(fileName); var result = Parser.QualityParser.ParseQuality(fileName);
result.Quality.Should().Be(quality); result.Quality.Should().Be(quality);
} }
private void ParseAndVerifyQuality(string title, Quality quality, bool proper)
{
var result = Parser.QualityParser.ParseQuality(title);
result.Quality.Should().Be(quality);
result.Proper.Should().Be(proper);
}
} }
} }

2
NzbDrone.Core/Parser/QualityParser.cs
Unescape View File

@ -168,12 +168,14 @@ namespace NzbDrone.Core.Parser
case ".dvr-ms": case ".dvr-ms":
case ".ogm": case ".ogm":
case ".strm": case ".strm":
{ {
result.Quality = Quality.SDTV; result.Quality = Quality.SDTV;
break; break;
} }
case ".mkv": case ".mkv":
case ".ts": case ".ts":
case ".m2ts":
{ {
result.Quality = Quality.HDTV720p; result.Quality = Quality.HDTV720p;
break; break;

Write Preview
Loading…
Cancel
Save