|
|
@ -163,6 +163,7 @@ namespace NzbDrone.Core.Organizer
|
|
|
|
AddReleaseDateTokens(tokenHandlers, movie.Year); //In case we want to separate the year
|
|
|
|
AddReleaseDateTokens(tokenHandlers, movie.Year); //In case we want to separate the year
|
|
|
|
AddQualityTokens(tokenHandlers, movie, movieFile);
|
|
|
|
AddQualityTokens(tokenHandlers, movie, movieFile);
|
|
|
|
AddMediaInfoTokens(tokenHandlers, movieFile);
|
|
|
|
AddMediaInfoTokens(tokenHandlers, movieFile);
|
|
|
|
|
|
|
|
AddReleaseGroupTokens(tokenHandlers, movie, movieFile);
|
|
|
|
|
|
|
|
|
|
|
|
var fileName = ReplaceTokens(pattern, tokenHandlers, namingConfig).Trim();
|
|
|
|
var fileName = ReplaceTokens(pattern, tokenHandlers, namingConfig).Trim();
|
|
|
|
fileName = FileNameCleanupRegex.Replace(fileName, match => match.Captures[0].Value[0].ToString());
|
|
|
|
fileName = FileNameCleanupRegex.Replace(fileName, match => match.Captures[0].Value[0].ToString());
|
|
|
@ -527,6 +528,13 @@ namespace NzbDrone.Core.Organizer
|
|
|
|
tokenHandlers["{Quality Real}"] = m => qualityReal;
|
|
|
|
tokenHandlers["{Quality Real}"] = m => qualityReal;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
private void AddReleaseGroupTokens(Dictionary<string, Func<TokenMatch, string>> tokenHandlers, Movie movie, MovieFile movieFile)
|
|
|
|
|
|
|
|
{
|
|
|
|
|
|
|
|
var releaseGroup = movieFile.ReleaseGroup;
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
tokenHandlers["{Release Group}"] = m => releaseGroup;
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
private void AddMediaInfoTokens(Dictionary<string, Func<TokenMatch, string>> tokenHandlers, EpisodeFile episodeFile)
|
|
|
|
private void AddMediaInfoTokens(Dictionary<string, Func<TokenMatch, string>> tokenHandlers, EpisodeFile episodeFile)
|
|
|
|
{
|
|
|
|
{
|
|
|
|
if (episodeFile.MediaInfo == null) return;
|
|
|
|
if (episodeFile.MediaInfo == null) return;
|
|
|
|