mirror of
https://github.com/Radarr/Radarr
synced 2025-03-04 02:38:18 +00:00
Added parsing and tests for Full Season Releases (no episode information)
This commit is contained in:
parent
a338b9fee5
commit
21e14fbb84
2 changed files with 29 additions and 10 deletions
|
@ -123,6 +123,19 @@ namespace NzbDrone.Core.Test
|
||||||
Assert.IsNull(result.Episodes);
|
Assert.IsNull(result.Episodes);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
[Test]
|
||||||
|
[Row("30.Rock.Season.04.HDTV.XviD-DIMENSION", "30.Rock", 4)]
|
||||||
|
[Row("Parks.and.Recreation.S02.720p.x264-DIMENSION", "Parks.and.Recreation", 2)]
|
||||||
|
[Row("The.Office.US.S03.720p.x264-DIMENSION", "The.Office.US", 3)]
|
||||||
|
public void full_season_release_parse(string postTitle, string title, int season)
|
||||||
|
{
|
||||||
|
var result = Parser.ParseEpisodeInfo(postTitle);
|
||||||
|
Assert.AreEqual(season, result.SeasonNumber);
|
||||||
|
Assert.AreEqual(Parser.NormalizeTitle(title), result.CleanTitle);
|
||||||
|
Assert.AreEqual(0, result.Episodes.Count);
|
||||||
|
}
|
||||||
|
|
||||||
[Test]
|
[Test]
|
||||||
[Row("Conan", "conan")]
|
[Row("Conan", "conan")]
|
||||||
[Row("The Tonight Show With Jay Leno", "tonightshowwithjayleno")]
|
[Row("The Tonight Show With Jay Leno", "tonightshowwithjayleno")]
|
||||||
|
|
|
@ -19,10 +19,11 @@ namespace NzbDrone.Core
|
||||||
new Regex(@"^(?<title>.*?)?(?:\W?S?(?<season>\d{1,2}(?!\d+))(?:(?:\-|\.|[ex]|\s|\sto\s){1,2}(?<episode>\d{1,2}(?!\d+)))+)+\W?(?!\\)",
|
new Regex(@"^(?<title>.*?)?(?:\W?S?(?<season>\d{1,2}(?!\d+))(?:(?:\-|\.|[ex]|\s|\sto\s){1,2}(?<episode>\d{1,2}(?!\d+)))+)+\W?(?!\\)",
|
||||||
RegexOptions.IgnoreCase | RegexOptions.Compiled),
|
RegexOptions.IgnoreCase | RegexOptions.Compiled),
|
||||||
new Regex(@"^(?<title>.+?)?\W?(?:\W(?<season>\d+)(?<episode>\d{2}))+\W?(?!\\)",
|
new Regex(@"^(?<title>.+?)?\W?(?:\W(?<season>\d+)(?<episode>\d{2}))+\W?(?!\\)",
|
||||||
RegexOptions.IgnoreCase | RegexOptions.Compiled),
|
RegexOptions.IgnoreCase | RegexOptions.Compiled), //Supports 103/113 naming
|
||||||
//Supports 103/113 naming
|
|
||||||
new Regex(@"^(?<title>.*?)?(?:\W?S?(?<season>\d{1,2}(?!\d+))(?:(?:\-|\.|[ex]|\s|to)+(?<episode>\d+))+)+\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),
|
||||||
|
new Regex(@"^(?<title>.*?)\W(?:S|Season\W?)?(?<season>\d{1,2}(?!\d+))+\W?(?!\\)",
|
||||||
|
RegexOptions.IgnoreCase | RegexOptions.Compiled) //Supports Season only releases
|
||||||
};
|
};
|
||||||
|
|
||||||
private static readonly Regex[] SeasonReportTitleRegex = new[]
|
private static readonly Regex[] SeasonReportTitleRegex = new[]
|
||||||
|
@ -75,13 +76,18 @@ namespace NzbDrone.Core
|
||||||
|
|
||||||
foreach (Match matchGroup in match)
|
foreach (Match matchGroup in match)
|
||||||
{
|
{
|
||||||
var count = matchGroup.Groups["episode"].Captures.Count;
|
var count = matchGroup.Groups["episode"].Captures.Count;
|
||||||
var first = Convert.ToInt32(matchGroup.Groups["episode"].Captures[0].Value);
|
|
||||||
var last = Convert.ToInt32(matchGroup.Groups["episode"].Captures[count - 1].Value);
|
//Allows use to return a list of 0 episodes (We can handle that as a full season release)
|
||||||
|
if (count > 0)
|
||||||
for (int i = first; i <= last; i++)
|
{
|
||||||
{
|
var first = Convert.ToInt32(matchGroup.Groups["episode"].Captures[0].Value);
|
||||||
parsedEpisode.Episodes.Add(i);
|
var last = Convert.ToInt32(matchGroup.Groups["episode"].Captures[count - 1].Value);
|
||||||
|
|
||||||
|
for (int i = first; i <= last; i++)
|
||||||
|
{
|
||||||
|
parsedEpisode.Episodes.Add(i);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Add table
Reference in a new issue