Archive-Team
/
sonarr-repo-only
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Better parsing of full season releases on disk

This commit is contained in:
Mark McDowall 2012-11-25 23:13:55 -08:00
parent 22bc0e96ff
commit 0758a5eb1e
3 changed files with 9 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
NzbDrone.Core.Test/ParserFixture/ParserTest.cs
View File

@ -13,8 +13,8 @@ using NzbDrone.Test.Common;
namespace NzbDrone.Core.Test.ParserFixture
{
[TestFixture]
// ReSharper disable InconsistentNaming
[TestFixture]
public class ParserTest : CoreTest
{
/*Fucked-up hall of shame,
@ -189,6 +189,7 @@ namespace NzbDrone.Core.Test.ParserFixture
[TestCase("Parks.and.Recreation.S02.720p.x264-DIMENSION", "Parks.and.Recreation", 2)]
[TestCase("The.Office.US.S03.720p.x264-DIMENSION", "The.Office.US", 3)]
[TestCase(@"Sons.of.Anarchy.S03.720p.BluRay-CLUE\REWARD", "Sons.of.Anarchy", 3)]
[TestCase("Adventure Time S02 720p HDTV x264 CRON", "Adventure Time", 2)]
public void full_season_release_parse(string postTitle, string title, int season)
{
var result = Parser.ParseTitle(postTitle);
@ -285,6 +286,7 @@ namespace NzbDrone.Core.Test.ParserFixture
[TestCase("The Daily Show With Jon Stewart -", "dailyshowwithjonstewart")]
[TestCase("The Venture Bros. (2004)", "venturebros2004")]
[TestCase("Castle (2011)", "castle2011")]
[TestCase("Adventure Time S02 720p HDTV x264 CRON", "adventuretime")]
public void parse_series_name(string postTitle, string title)
{
var result = Parser.ParseSeriesName(postTitle);

16
NzbDrone.Core/Parser.cs
View File

@ -236,20 +236,12 @@ namespace NzbDrone.Core
{
Logger.Trace("Parsing string '{0}'", title);
foreach (var regex in ReportTitleRegex)
{
var match = regex.Matches(title);
var parseResult = ParseTitle(title);
if (match.Count != 0)
{
var seriesName = NormalizeTitle(match[0].Groups["title"].Value);
if(parseResult == null)
return NormalizeTitle(title);
Logger.Trace("Series Parsed. {0}", seriesName);
return seriesName;
}
}
return NormalizeTitle(title);
return parseResult.CleanTitle;
}
internal static QualityModel ParseQuality(string name)

2
NzbDrone.Web/NzbDrone.Web.csproj
View File

@ -161,6 +161,8 @@
<Content Include="Content\font-awesome-ie7.css" />
<Content Include="Content\font-awesome.css" />
<Content Include="Content\font\fontawesome-webfont.svg" />
<Content Include="Content\Images\apple-touch-icon-114.png" />
<Content Include="Content\Images\apple-touch-icon-144.png" />
<Content Include="Content\SeriesEditor.css" />
<Content Include="Content\DataTables-1.9.0\media\css\jquery.dataTables.css" />
<Content Include="Content\DataTables-1.9.0\media\images\back.png" />