Fixed: Don't include year 0 in series folder name

Fixes #3057
pull/3072/head
Mark McDowall 5 years ago
parent 478e13b0fd
commit 4933a75d15

@ -58,5 +58,16 @@ namespace NzbDrone.Core.Test.OrganizerTests.FileNameBuilderTests
Subject.BuildFileName(new List<Episode> { _episode }, _series, _episodeFile) Subject.BuildFileName(new List<Episode> { _episode }, _series, _episodeFile)
.Should().Be(expected); .Should().Be(expected);
} }
[Test]
public void should_not_include_0_for_year()
{
_series.Title = "The Alienist";
_series.Year = 0;
_namingConfig.StandardEpisodeFormat = "{Series CleanTitleYear}";
Subject.BuildFileName(new List<Episode> { _episode }, _series, _episodeFile)
.Should().Be("The Alienist");
}
} }
} }

@ -59,5 +59,16 @@ namespace NzbDrone.Core.Test.OrganizerTests.FileNameBuilderTests
Subject.BuildFileName(new List<Episode> { _episode }, _series, _episodeFile) Subject.BuildFileName(new List<Episode> { _episode }, _series, _episodeFile)
.Should().Be(expected); .Should().Be(expected);
} }
[Test]
public void should_not_include_0_for_year()
{
_series.Title = "The Alienist";
_series.Year = 0;
_namingConfig.StandardEpisodeFormat = "{Series TitleTheYear}";
Subject.BuildFileName(new List<Episode> { _episode }, _series, _episodeFile)
.Should().Be("Alienist, The");
}
} }
} }

@ -58,5 +58,16 @@ namespace NzbDrone.Core.Test.OrganizerTests.FileNameBuilderTests
Subject.BuildFileName(new List<Episode> { _episode }, _series, _episodeFile) Subject.BuildFileName(new List<Episode> { _episode }, _series, _episodeFile)
.Should().Be(expected); .Should().Be(expected);
} }
[Test]
public void should_not_include_0_for_year()
{
_series.Title = "The Alienist";
_series.Year = 0;
_namingConfig.StandardEpisodeFormat = "{Series TitleYear}";
Subject.BuildFileName(new List<Episode> { _episode }, _series, _episodeFile)
.Should().Be("The Alienist");
}
} }
} }

@ -286,6 +286,12 @@ namespace NzbDrone.Core.Organizer
public static string TitleYear(string title, int year) public static string TitleYear(string title, int year)
{ {
// Don't use 0 for the year.
if (year == 0)
{
return title;
}
// Regex match incase the year in the title doesn't match the year, for whatever reason. // Regex match incase the year in the title doesn't match the year, for whatever reason.
if (YearRegex.IsMatch(title)) if (YearRegex.IsMatch(title))
{ {

Loading…
Cancel
Save