mirror of https://github.com/Radarr/Radarr
New: Added a single period as a separator when naming episodes.
This commit is contained in:
parent
5ed53008c6
commit
8618117926
|
@ -519,5 +519,59 @@ namespace NzbDrone.Core.Test.ProviderTests.MediaFileProviderTests
|
||||||
//Assert
|
//Assert
|
||||||
result.Should().Be("30 Rock - S06E06-E07 - Hey, Baby, What's Wrong! (1) + Hey, Baby, What's Wrong! (2)");
|
result.Should().Be("30 Rock - S06E06-E07 - Hey, Baby, What's Wrong! (1) + Hey, Baby, What's Wrong! (2)");
|
||||||
}
|
}
|
||||||
|
|
||||||
|
[Test]
|
||||||
|
public void GetNewFilename_Series_Episode_Quality_S01E05_Period()
|
||||||
|
{
|
||||||
|
//Setup
|
||||||
|
|
||||||
|
|
||||||
|
var fakeConfig = Mocker.GetMock<ConfigProvider>();
|
||||||
|
fakeConfig.SetupGet(c => c.SortingIncludeSeriesName).Returns(true);
|
||||||
|
fakeConfig.SetupGet(c => c.SortingIncludeEpisodeTitle).Returns(true);
|
||||||
|
fakeConfig.SetupGet(c => c.SortingAppendQuality).Returns(true);
|
||||||
|
fakeConfig.SetupGet(c => c.SortingSeparatorStyle).Returns(2);
|
||||||
|
fakeConfig.SetupGet(c => c.SortingNumberStyle).Returns(2);
|
||||||
|
fakeConfig.SetupGet(c => c.SortingReplaceSpaces).Returns(false);
|
||||||
|
|
||||||
|
var episode = Builder<Episode>.CreateNew()
|
||||||
|
.With(e => e.Title = "City Sushi")
|
||||||
|
.With(e => e.SeasonNumber = 15)
|
||||||
|
.With(e => e.EpisodeNumber = 6)
|
||||||
|
.Build();
|
||||||
|
|
||||||
|
//Act
|
||||||
|
string result = Mocker.Resolve<MediaFileProvider>().GetNewFilename(new List<Episode> { episode }, "South Park", QualityTypes.HDTV, false);
|
||||||
|
|
||||||
|
//Assert
|
||||||
|
Assert.AreEqual("South Park.S15E06.City Sushi [HDTV]", result);
|
||||||
|
}
|
||||||
|
|
||||||
|
[Test]
|
||||||
|
public void GetNewFilename_Episode_Quality_1x05_Period()
|
||||||
|
{
|
||||||
|
//Setup
|
||||||
|
|
||||||
|
|
||||||
|
var fakeConfig = Mocker.GetMock<ConfigProvider>();
|
||||||
|
fakeConfig.SetupGet(c => c.SortingIncludeSeriesName).Returns(false);
|
||||||
|
fakeConfig.SetupGet(c => c.SortingIncludeEpisodeTitle).Returns(true);
|
||||||
|
fakeConfig.SetupGet(c => c.SortingAppendQuality).Returns(true);
|
||||||
|
fakeConfig.SetupGet(c => c.SortingSeparatorStyle).Returns(2);
|
||||||
|
fakeConfig.SetupGet(c => c.SortingNumberStyle).Returns(0);
|
||||||
|
fakeConfig.SetupGet(c => c.SortingReplaceSpaces).Returns(false);
|
||||||
|
|
||||||
|
var episode = Builder<Episode>.CreateNew()
|
||||||
|
.With(e => e.Title = "City Sushi")
|
||||||
|
.With(e => e.SeasonNumber = 15)
|
||||||
|
.With(e => e.EpisodeNumber = 6)
|
||||||
|
.Build();
|
||||||
|
|
||||||
|
//Act
|
||||||
|
string result = Mocker.Resolve<MediaFileProvider>().GetNewFilename(new List<Episode> { episode }, "South Park", QualityTypes.HDTV, false);
|
||||||
|
|
||||||
|
//Assert
|
||||||
|
Assert.AreEqual("15x06.City Sushi [HDTV]", result);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
|
@ -19,6 +19,12 @@ namespace NzbDrone.Core.Helpers
|
||||||
Id = 1,
|
Id = 1,
|
||||||
Name = "Space",
|
Name = "Space",
|
||||||
Pattern = " "
|
Pattern = " "
|
||||||
|
},
|
||||||
|
new EpisodeSortingType
|
||||||
|
{
|
||||||
|
Id = 2,
|
||||||
|
Name = "Period",
|
||||||
|
Pattern = "."
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
|
@ -24,6 +24,9 @@ function createSingleEpisodeExample() {
|
||||||
if ($("#SeparatorStyle option:selected").val() == 1)
|
if ($("#SeparatorStyle option:selected").val() == 1)
|
||||||
separator = ' ';
|
separator = ' ';
|
||||||
|
|
||||||
|
if ($("#SeparatorStyle option:selected").val() == 2)
|
||||||
|
separator = '.';
|
||||||
|
|
||||||
if ($('#SeriesName').attr('checked')) {
|
if ($('#SeriesName').attr('checked')) {
|
||||||
result += 'Series Name';
|
result += 'Series Name';
|
||||||
result += separator;
|
result += separator;
|
||||||
|
@ -53,6 +56,9 @@ function createMultiEpisodeExample() {
|
||||||
if ($("#SeparatorStyle option:selected").val() == 1)
|
if ($("#SeparatorStyle option:selected").val() == 1)
|
||||||
separator = ' ';
|
separator = ' ';
|
||||||
|
|
||||||
|
if ($("#SeparatorStyle option:selected").val() == 2)
|
||||||
|
separator = '.';
|
||||||
|
|
||||||
if ($('#SeriesName').attr('checked')) {
|
if ($('#SeriesName').attr('checked')) {
|
||||||
result += 'Series Name';
|
result += 'Series Name';
|
||||||
result += separator;
|
result += separator;
|
||||||
|
|
Loading…
Reference in New Issue