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

Fixed: Parsing of numeric only titles that include a year 

Closes #4850
This commit is contained in:
bejhan 2022-01-23 13:45:47 -07:00 committed by GitHub
parent d4d4bf8784
commit f67e11d477
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 26 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/NzbDrone.Core.Test/ParserTests/ParserFixture.cs
View File

@ -35,6 +35,31 @@ namespace NzbDrone.Core.Test.ParserTests
result.Should().Be(title.CleanSeriesTitle()); result.Should().Be(title.CleanSeriesTitle());
} }
[TestCase("Series S03E14 720p HDTV X264-DIMENSION", "Series")]
[TestCase("Series.S03E14.720p.HDTV.X264-DIMENSION", "Series")]
[TestCase("Series-S03E14-720p-HDTV-X264-DIMENSION", "Series")]
[TestCase("Series_S03E14_720p_HDTV_X264-DIMENSION", "Series")]
[TestCase("Series 2022 S03E14 720p HDTV X264-DIMENSION", "Series", 2022)]
[TestCase("Series (2022) S03E14 720p HDTV X264-DIMENSION", "Series", 2022)]
[TestCase("Series.2022.S03E14.720p.HDTV.X264-DIMENSION", "Series", 2022)]
[TestCase("Series-2022-S03E14-720p-HDTV-X264-DIMENSION", "Series", 2022)]
[TestCase("Series_2022_S03E14_720p_HDTV_X264-DIMENSION", "Series", 2022)]
[TestCase("1234 S03E14 720p HDTV X264-DIMENSION", "1234")]
[TestCase("1234.S03E14.720p.HDTV.X264-DIMENSION", "1234")]
[TestCase("1234-S03E14-720p-HDTV-X264-DIMENSION", "1234")]
[TestCase("1234_S03E14_720p_HDTV_X264-DIMENSION", "1234")]
[TestCase("1234 2022 S03E14 720p HDTV X264-DIMENSION", "1234", 2022)]
[TestCase("1234 (2022) S03E14 720p HDTV X264-DIMENSION", "1234", 2022)]
[TestCase("1234.2022.S03E14.720p.HDTV.X264-DIMENSION", "1234", 2022)]
[TestCase("1234-2022-S03E14-720p-HDTV-X264-DIMENSION", "1234", 2022)]
[TestCase("1234_2022_S03E14_720p_HDTV_X264-DIMENSION", "1234", 2022)]
public void should_parse_series_title_info(string postTitle, string titleWithoutYear, int year = 0)
{
var seriesTitleInfo = Parser.Parser.ParseTitle(postTitle).SeriesTitleInfo;
seriesTitleInfo.TitleWithoutYear.Should().Be(titleWithoutYear);
seriesTitleInfo.Year.Should().Be(year);
}
[Test] [Test]
public void should_remove_accents_from_title() public void should_remove_accents_from_title()
{ {

2
src/NzbDrone.Core/Parser/Parser.cs
View File

@ -455,7 +455,7 @@ namespace NzbDrone.Core.Parser
private static readonly Regex LanguageRegex = new Regex(@"(?:\W|_)(?<italian>\b(?:ita|italian)\b)|(?<german>german\b|videomann)|(?<flemish>flemish)|(?<greek>greek)|(?<french>(?:\W|_)(?:FR|VOSTFR)(?:\W|_))|(?<russian>\brus\b)|(?<dutch>nl\W?subs?)|(?<hungarian>\b(?:HUNDUB|HUN)\b)|(?<spanish>\b(?:español|castellano)\b)", private static readonly Regex LanguageRegex = new Regex(@"(?:\W|_)(?<italian>\b(?:ita|italian)\b)|(?<german>german\b|videomann)|(?<flemish>flemish)|(?<greek>greek)|(?<french>(?:\W|_)(?:FR|VOSTFR)(?:\W|_))|(?<russian>\brus\b)|(?<dutch>nl\W?subs?)|(?<hungarian>\b(?:HUNDUB|HUN)\b)|(?<spanish>\b(?:español|castellano)\b)",
RegexOptions.IgnoreCase | RegexOptions.Compiled); RegexOptions.IgnoreCase | RegexOptions.Compiled);
private static readonly Regex YearInTitleRegex = new Regex(@"^(?<title>.+?)(?:\W|_)?(?<year>\d{4})", private static readonly Regex YearInTitleRegex = new Regex(@"^(?<title>.+?)[-_. ]+?\(?(?<year>\d{4})\)?",
RegexOptions.IgnoreCase | RegexOptions.Compiled); RegexOptions.IgnoreCase | RegexOptions.Compiled);
private static readonly Regex TitleComponentsRegex = new Regex(@"^(?:(?<title>.+?) \((?<title>.+?)\)|(?<title>.+?) \| (?<title>.+?))$", private static readonly Regex TitleComponentsRegex = new Regex(@"^(?:(?<title>.+?) \((?<title>.+?)\)|(?<title>.+?) \| (?<title>.+?))$",