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

Removed Year from EpisodeParseResult (we never used it anyways).

Browse Source 
Episode parsing REGEX will properly handle filenames with S01E01/1x01 naming.
Added REGEX to support seasons with more than 100 episodes (0-99)... Stupid soaps.
Title Normalizing REGEX will keep the year (has to start with 19 or 20 and be exactly 4 digits long)
pull/6/head
Mark McDowall 14 years ago
parent 86e709e922
commit e9ce98caa4
3 changed files with 38 additions and 29 deletions
Show Stats Download Patch File Download Diff File

30
NzbDrone.Core.Test/ParserTest.cs
Unescape View File

@ -24,13 +24,18 @@ namespace NzbDrone.Core.Test
[Row("Chuck.4x05.HDTV.XviD-LOL", "Chuck", 4, 5)] [Row("Chuck.4x05.HDTV.XviD-LOL", "Chuck", 4, 5)]
[Row("The.Girls.Next.Door.S03E06.DVDRip.XviD-WiDE", "The.Girls.Next.Door", 3, 6)] [Row("The.Girls.Next.Door.S03E06.DVDRip.XviD-WiDE", "The.Girls.Next.Door", 3, 6)]
[Row("Degrassi.S10E27.WS.DSR.XviD-2HD", "Degrassi", 10, 27)] [Row("Degrassi.S10E27.WS.DSR.XviD-2HD", "Degrassi", 10, 27)]
[Row("Parenthood.2010.S02E14.HDTV.XviD-LOL", "Parenthood", 2, 14)] [Row("Parenthood.2010.S02E14.HDTV.XviD-LOL", "Parenthood 2010", 2, 14)]
[Row("Hawaii Five 0 S01E19 720p WEB DL DD5 1 H 264 NT", "Hawaii Five0", 1, 19)] [Row("Hawaii Five 0 S01E19 720p WEB DL DD5 1 H 264 NT", "Hawaii Five", 1, 19)]
[Row("The Event S01E14 A Message Back 720p WEB DL DD5 1 H264 SURFER", "The Event", 1, 14)] [Row("The Event S01E14 A Message Back 720p WEB DL DD5 1 H264 SURFER", "The Event", 1, 14)]
[Row("Adam Hills In Gordon St Tonight S01E07 WS PDTV XviD FUtV", "Adam Hills In Gordon St Tonight", 1, 7)] [Row("Adam Hills In Gordon St Tonight S01E07 WS PDTV XviD FUtV", "Adam Hills In Gordon St Tonight", 1, 7)]
[Row("Adam Hills In Gordon St Tonight S01E07 WS PDTV XviD FUtV", "Adam Hills In Gordon St Tonight", 1, 7)] [Row("Adam Hills In Gordon St Tonight S01E07 WS PDTV XviD FUtV", "Adam Hills In Gordon St Tonight", 1, 7)]
[Row("Adventure.Inc.S03E19.DVDRip.XviD-OSiTV", "Adventure.Inc", 3, 19)] [Row("Adventure.Inc.S03E19.DVDRip.XviD-OSiTV", "Adventure.Inc", 3, 19)]
//[Row("The.Kennedys.Part.2.DSR.XviD-SYS", 1, 2)] [Row("S03E09 WS PDTV XviD FUtV", "", 3, 9)]
[Row("5x10 WS PDTV XviD FUtV", "", 5, 10)]
[Row("Castle.2009.S01E14.HDTV.XviD-LOL", "Castle 2009", 1, 14)]
[Row("Pride.and.Prejudice.1995.S03E20.HDTV.XviD-LOL", "Pride and Prejudice 1995", 3, 20)]
//[Row(@"Season 4\07 WS PDTV XviD FUtV", "", 4, 7)]
[Row("The.Office.S03E115.DVDRip.XviD-OSiTV", "The.Office", 3, 115)]
public void episode_parse(string postTitle, string title, int season, int episode) public void episode_parse(string postTitle, string title, int season, int episode)
{ {
var result = Parser.ParseEpisodeInfo(postTitle); var result = Parser.ParseEpisodeInfo(postTitle);
@ -109,6 +114,18 @@ namespace NzbDrone.Core.Test
Assert.AreEqual(airDate, result.AirDate); Assert.AreEqual(airDate, result.AirDate);
} }
[Test]
[Row("Conan", "conan")]
[Row("The Tonight Show With Jay Leno", "tonightshowwithjayleno")]
[Row("The.Daily.Show", "dailyshow")]
[Row("Castle (2009)", "castle2009")]
[Row("Parenthood.2010", "parenthood2010")]
public void series_name_normalize(string parsedSeriesName, string seriesName)
{
var result = Parser.NormalizeTitle(parsedSeriesName);
Assert.AreEqual(seriesName, result);
}
[Test] [Test]
[Row(@"c:\test\", @"c:\test")] [Row(@"c:\test\", @"c:\test")]
[Row(@"c:\\test\\", @"c:\test")] [Row(@"c:\\test\\", @"c:\test")]
@ -163,8 +180,11 @@ namespace NzbDrone.Core.Test
[Test] [Test]
[Row("the")] [Row("the")]
[Row("And")] [Row("and")]
[Row("Or")] [Row("or")]
[Row("a")]
[Row("an")]
[Row("of")]
public void Normalize_not_removed_common_words_in_the_middle(string word) public void Normalize_not_removed_common_words_in_the_middle(string word)
{ {
var dirtyFormat = new[] var dirtyFormat = new[]

1
NzbDrone.Core/Model/EpisodeParseResult.cs
Unescape View File

@ -11,7 +11,6 @@ namespace NzbDrone.Core.Model
internal int SeasonNumber { get; set; } internal int SeasonNumber { get; set; }
internal List<int> Episodes { get; set; } internal List<int> Episodes { get; set; }
internal int Year { get; set; }
internal string EpisodeTitle { get; set; } internal string EpisodeTitle { get; set; }

36
NzbDrone.Core/Parser.cs
Unescape View File

@ -13,18 +13,17 @@ namespace NzbDrone.Core
private static readonly Logger Logger = LogManager.GetCurrentClassLogger(); private static readonly Logger Logger = LogManager.GetCurrentClassLogger();
private static readonly Regex[] ReportTitleRegex = new[] private static readonly Regex[] ReportTitleRegex = new[]
{ {
new Regex( new Regex(@"^(?<title>.+?)?\W?(?<year>\d{4}?)?\W+(?<airyear>\d{4})\W+(?<airmonth>\d{2})\W+(?<airday>\d{2})\W?(?!\\)",
@"(?<title>.+?)?\W?(?<year>\d{4}?)?\W+(?<airyear>\d{4})\W+(?<airmonth>\d{2})\W+(?<airday>\d{2})\W?(?!\\)", RegexOptions.IgnoreCase | RegexOptions.Compiled),
RegexOptions.IgnoreCase | RegexOptions.Compiled), new Regex(@"^(?<title>.*?)?(?:\W?S?(?<season>\d{1,2}(?!\d+))(?:(?:\-|\.|[ex]|\s|to)+(?<episode>\d{1,2}(?!\d+)))+)+\W?(?!\\)",
new Regex( RegexOptions.IgnoreCase | RegexOptions.Compiled),
@"(?<title>.+?)?\W?(?<year>\d{4}?)?(?:\WS?(?<season>\d{1,2})(?:(?:\-|\.|[ex]|\s|to)+(?<episode>\d+))+)+\W?(?!\\)", new Regex(@"^(?<title>.+?)?\W?(?<year>\d{4}?)?(?:\W(?<season>\d+)(?<episode>\d{2}))+\W?(?!\\)",
RegexOptions.IgnoreCase | RegexOptions.Compiled), RegexOptions.IgnoreCase | RegexOptions.Compiled),
new Regex( //Supports 103/113 naming
@"(?<title>.+?)?\W?(?<year>\d{4}?)?(?:\W(?<season>\d+)(?<episode>\d{2}))+\W?(?!\\)", new Regex(@"^(?<title>.*?)?(?:\W?S?(?<season>\d{1,2}(?!\d+))(?:(?:\-|\.|[ex]|\s|to)+(?<episode>\d+))+)+\W?(?!\\)",
RegexOptions.IgnoreCase | RegexOptions.Compiled) RegexOptions.IgnoreCase | RegexOptions.Compiled)
//Supports 103/113 naming };
};
private static readonly Regex[] SeasonReportTitleRegex = new[] private static readonly Regex[] SeasonReportTitleRegex = new[]
{ {
@ -34,7 +33,7 @@ namespace NzbDrone.Core
RegexOptions.Compiled), RegexOptions.Compiled),
}; };
private static readonly Regex NormalizeRegex = new Regex(@"((^|\W)(a|an|the|and|or|of)($|\W))|\W", private static readonly Regex NormalizeRegex = new Regex(@"((^|\W)(a|an|the|and|or|of)($|\W))|\W|\b(?!(?:19\d{2}|20\d{2}))\d+\b",
RegexOptions.IgnoreCase | RegexOptions.Compiled); RegexOptions.IgnoreCase | RegexOptions.Compiled);
/// <summary> /// <summary>
@ -55,14 +54,7 @@ namespace NzbDrone.Core
if (match.Count != 0) if (match.Count != 0)
{ {
var seriesName = NormalizeTitle(match[0].Groups["title"].Value); var seriesName = NormalizeTitle(match[0].Groups["title"].Value);
var year = 0;
Int32.TryParse(match[0].Groups["year"].Value, out year);
if (year < 1900 || year > DateTime.Now.Year + 1)
{
year = 0;
}
var airyear = 0; var airyear = 0;
Int32.TryParse(match[0].Groups["airyear"].Value, out airyear); Int32.TryParse(match[0].Groups["airyear"].Value, out airyear);
@ -78,7 +70,6 @@ namespace NzbDrone.Core
Proper = title.ToLower().Contains("proper"), Proper = title.ToLower().Contains("proper"),
CleanTitle = seriesName, CleanTitle = seriesName,
SeasonNumber = season, SeasonNumber = season,
Year = year,
Episodes = new List<int>() Episodes = new List<int>()
}; };
@ -107,7 +98,6 @@ namespace NzbDrone.Core
{ {
Proper = title.ToLower().Contains("proper"), Proper = title.ToLower().Contains("proper"),
CleanTitle = seriesName, CleanTitle = seriesName,
Year = year,
AirDate = new DateTime(airyear, airmonth, airday) AirDate = new DateTime(airyear, airmonth, airday)
}; };
} }

Write Preview
Loading…
Cancel
Save