return '#' as first character for non alphanumeric
This commit is contained in:
parent
35365665cf
commit
5871189891
|
@ -36,6 +36,8 @@ namespace NzbDrone.Core.Test.OrganizerTests.FileNameBuilderTests
|
||||||
[TestCase("The Mist", "M\\The Mist")]
|
[TestCase("The Mist", "M\\The Mist")]
|
||||||
[TestCase("A", "A\\A")]
|
[TestCase("A", "A\\A")]
|
||||||
[TestCase("30 Rock", "3\\30 Rock")]
|
[TestCase("30 Rock", "3\\30 Rock")]
|
||||||
|
[TestCase("The '80s Greatest", "#\\The '80s Greatest")]
|
||||||
|
|
||||||
public void should_get_expected_folder_name_back(string title, string expected)
|
public void should_get_expected_folder_name_back(string title, string expected)
|
||||||
{
|
{
|
||||||
_series.Title = title;
|
_series.Title = title;
|
||||||
|
|
|
@ -377,6 +377,19 @@ namespace NzbDrone.Core.Organizer
|
||||||
return title;
|
return title;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public static string TitleFirstCharacter(string title)
|
||||||
|
{
|
||||||
|
title = ScenifyReplaceChars.Replace(title, " ");
|
||||||
|
title = ScenifyRemoveChars.Replace(title, string.Empty);
|
||||||
|
|
||||||
|
if (char.IsLetterOrDigit(title[0]))
|
||||||
|
{
|
||||||
|
return title.Substring(0, 1).FirstCharToUpper();
|
||||||
|
}
|
||||||
|
|
||||||
|
return "#";
|
||||||
|
}
|
||||||
|
|
||||||
public static string CleanFileName(string name)
|
public static string CleanFileName(string name)
|
||||||
{
|
{
|
||||||
return CleanFileName(name, NamingConfig.Default);
|
return CleanFileName(name, NamingConfig.Default);
|
||||||
|
@ -452,7 +465,7 @@ namespace NzbDrone.Core.Organizer
|
||||||
tokenHandlers["{Series TitleWithoutYear}"] = m => TitleWithoutYear(series.Title);
|
tokenHandlers["{Series TitleWithoutYear}"] = m => TitleWithoutYear(series.Title);
|
||||||
tokenHandlers["{Series TitleTheYear}"] = m => TitleYear(TitleThe(series.Title), series.Year);
|
tokenHandlers["{Series TitleTheYear}"] = m => TitleYear(TitleThe(series.Title), series.Year);
|
||||||
tokenHandlers["{Series TitleTheWithoutYear}"] = m => TitleWithoutYear(TitleThe(series.Title));
|
tokenHandlers["{Series TitleTheWithoutYear}"] = m => TitleWithoutYear(TitleThe(series.Title));
|
||||||
tokenHandlers["{Series TitleFirstCharacter}"] = m => TitleThe(series.Title).Substring(0, 1).FirstCharToUpper();
|
tokenHandlers["{Series TitleFirstCharacter}"] = m => TitleFirstCharacter(TitleThe(series.Title));
|
||||||
tokenHandlers["{Series Year}"] = m => series.Year.ToString();
|
tokenHandlers["{Series Year}"] = m => series.Year.ToString();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue