From 53373e6f4aa0548b93dcc47bd4667fe4122aed3e Mon Sep 17 00:00:00 2001 From: Leonardo Galli Date: Sun, 15 Jan 2017 00:55:15 +0100 Subject: [PATCH] Add {Original Title} to FileNameBuilder. Fixes #103 --- src/NzbDrone.Core/Organizer/FileNameBuilder.cs | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/src/NzbDrone.Core/Organizer/FileNameBuilder.cs b/src/NzbDrone.Core/Organizer/FileNameBuilder.cs index 6e631ae0f..18197e161 100644 --- a/src/NzbDrone.Core/Organizer/FileNameBuilder.cs +++ b/src/NzbDrone.Core/Organizer/FileNameBuilder.cs @@ -163,7 +163,7 @@ public string BuildFileName(Movie movie, MovieFile movieFile, NamingConfig namin AddReleaseDateTokens(tokenHandlers, movie.Year); //In case we want to separate the year AddQualityTokens(tokenHandlers, movie, movieFile); AddMediaInfoTokens(tokenHandlers, movieFile); - AddReleaseGroupTokens(tokenHandlers, movie, movieFile); + AddMovieFileTokens(tokenHandlers, movieFile); var fileName = ReplaceTokens(pattern, tokenHandlers, namingConfig).Trim(); fileName = FileNameCleanupRegex.Replace(fileName, match => match.Captures[0].Value[0].ToString()); @@ -504,6 +504,13 @@ private void AddEpisodeFileTokens(Dictionary> t tokenHandlers["{Release Group}"] = m => episodeFile.ReleaseGroup ?? m.DefaultValue("Sonarr"); } + private void AddMovieFileTokens(Dictionary> tokenHandlers, MovieFile episodeFile) + { + tokenHandlers["{Original Title}"] = m => GetOriginalTitle(episodeFile); + tokenHandlers["{Original Filename}"] = m => GetOriginalFileName(episodeFile); + tokenHandlers["{Release Group}"] = m => episodeFile.ReleaseGroup ?? m.DefaultValue("Sonarr"); + } + private void AddQualityTokens(Dictionary> tokenHandlers, Series series, EpisodeFile episodeFile) { var qualityTitle = _qualityDefinitionService.Get(episodeFile.Quality.Quality).Title; @@ -528,13 +535,6 @@ private void AddQualityTokens(Dictionary> token tokenHandlers["{Quality Real}"] = m => qualityReal; } - private void AddReleaseGroupTokens(Dictionary> tokenHandlers, Movie movie, MovieFile movieFile) - { - var releaseGroup = movieFile.ReleaseGroup; - - tokenHandlers["{Release Group}"] = m => releaseGroup; - } - private void AddMediaInfoTokens(Dictionary> tokenHandlers, EpisodeFile episodeFile) { if (episodeFile.MediaInfo == null) return;