mirror of https://github.com/Radarr/Radarr
adds 'Movie Title, The' filename option (#359)
* adds 'Movie Title, The' filename option * updates the FileNameBuilder.MovieTitleRegex to include new format
This commit is contained in:
parent
aa9537c201
commit
a691ffa7b7
|
@ -58,7 +58,7 @@ namespace NzbDrone.Core.Organizer
|
||||||
public static readonly Regex SeriesTitleRegex = new Regex(@"(?<token>\{(?:Series)(?<separator>[- ._])(Clean)?Title\})",
|
public static readonly Regex SeriesTitleRegex = new Regex(@"(?<token>\{(?:Series)(?<separator>[- ._])(Clean)?Title\})",
|
||||||
RegexOptions.Compiled | RegexOptions.IgnoreCase);
|
RegexOptions.Compiled | RegexOptions.IgnoreCase);
|
||||||
|
|
||||||
public static readonly Regex MovieTitleRegex = new Regex(@"(?<token>\{((?:(Movie|Original))(?<separator>[- ._])(Clean)?Title)\})",
|
public static readonly Regex MovieTitleRegex = new Regex(@"(?<token>\{((?:(Movie|Original))(?<separator>[- ._])(Clean)?Title(The)?)\})",
|
||||||
RegexOptions.Compiled | RegexOptions.IgnoreCase);
|
RegexOptions.Compiled | RegexOptions.IgnoreCase);
|
||||||
|
|
||||||
private static readonly Regex FileNameCleanupRegex = new Regex(@"([- ._])(\1)+", RegexOptions.Compiled);
|
private static readonly Regex FileNameCleanupRegex = new Regex(@"([- ._])(\1)+", RegexOptions.Compiled);
|
||||||
|
@ -316,6 +316,22 @@ namespace NzbDrone.Core.Organizer
|
||||||
return title;
|
return title;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public static string TitleThe(string title)
|
||||||
|
{
|
||||||
|
string[] prefixes = { "The ", "An ", "A " };
|
||||||
|
foreach (string prefix in prefixes)
|
||||||
|
{
|
||||||
|
int prefix_length = prefix.Length;
|
||||||
|
if (prefix.ToLower() == title.Substring(0, prefix_length).ToLower())
|
||||||
|
{
|
||||||
|
title = title.Substring(prefix_length) + ", " + prefix.Trim();
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return title.Trim();
|
||||||
|
}
|
||||||
|
|
||||||
public static string CleanFileName(string name, bool replace = true)
|
public static string CleanFileName(string name, bool replace = true)
|
||||||
{
|
{
|
||||||
string result = name;
|
string result = name;
|
||||||
|
@ -472,6 +488,7 @@ namespace NzbDrone.Core.Organizer
|
||||||
{
|
{
|
||||||
tokenHandlers["{Movie Title}"] = m => movie.Title;
|
tokenHandlers["{Movie Title}"] = m => movie.Title;
|
||||||
tokenHandlers["{Movie CleanTitle}"] = m => CleanTitle(movie.Title);
|
tokenHandlers["{Movie CleanTitle}"] = m => CleanTitle(movie.Title);
|
||||||
|
tokenHandlers["{Movie Title The}"] = m => TitleThe(movie.Title);
|
||||||
}
|
}
|
||||||
|
|
||||||
private void AddReleaseDateTokens(Dictionary<string, Func<TokenMatch, string>> tokenHandlers, int releaseYear)
|
private void AddReleaseDateTokens(Dictionary<string, Func<TokenMatch, string>> tokenHandlers, int releaseYear)
|
||||||
|
|
|
@ -46,7 +46,7 @@ namespace NzbDrone.Core.Organizer
|
||||||
|
|
||||||
_movie = new Movie
|
_movie = new Movie
|
||||||
{
|
{
|
||||||
Title = "Movie Title",
|
Title = "The Movie Title",
|
||||||
Year = 2010,
|
Year = 2010,
|
||||||
ImdbId = "tt0066921"
|
ImdbId = "tt0066921"
|
||||||
};
|
};
|
||||||
|
|
|
@ -4,6 +4,7 @@
|
||||||
<li><a href="#" data-token="Movie Title">Movie Title</a></li>
|
<li><a href="#" data-token="Movie Title">Movie Title</a></li>
|
||||||
<li><a href="#" data-token="Movie.Title">Movie.Title</a></li>
|
<li><a href="#" data-token="Movie.Title">Movie.Title</a></li>
|
||||||
<li><a href="#" data-token="Movie_Title">Movie_Title</a></li>
|
<li><a href="#" data-token="Movie_Title">Movie_Title</a></li>
|
||||||
|
<li><a href="#" data-token="Movie TitleThe">Movie Title, The</a></li>
|
||||||
<li><a href="#" data-token="Movie CleanTitle">Movie CleanTitle</a></li>
|
<li><a href="#" data-token="Movie CleanTitle">Movie CleanTitle</a></li>
|
||||||
<li><a href="#" data-token="Movie.CleanTitle">Movie.CleanTitle</a></li>
|
<li><a href="#" data-token="Movie.CleanTitle">Movie.CleanTitle</a></li>
|
||||||
<li><a href="#" data-token="Movie_CleanTitle">Movie_CleanTitle</a></li>
|
<li><a href="#" data-token="Movie_CleanTitle">Movie_CleanTitle</a></li>
|
||||||
|
|
Loading…
Reference in New Issue