diff --git a/src/NzbDrone.Core/Organizer/FileNameBuilder.cs b/src/NzbDrone.Core/Organizer/FileNameBuilder.cs index e8aa4b99e9..9e0d61dc53 100644 --- a/src/NzbDrone.Core/Organizer/FileNameBuilder.cs +++ b/src/NzbDrone.Core/Organizer/FileNameBuilder.cs @@ -211,6 +211,18 @@ public static string CleanTitle(string title) return title.RemoveDiacritics(); } + public static string CollectionTitleThe(string collectionTitle) + { + if (string.IsNullOrEmpty(collectionTitle)) + { + return string.Empty; + } + else + { + return TitleThe(collectionTitle); + } + } + public static string TitleThe(string title) { return TitlePrefixRegex.Replace(title, "$2, $1$3"); @@ -268,7 +280,7 @@ private void AddMovieTokens(Dictionary> tokenHa tokenHandlers["{Movie Certification}"] = m => movie.MovieMetadata.Value.Certification ?? string.Empty; tokenHandlers["{Movie Collection}"] = m => Truncate(movie.MovieMetadata.Value.CollectionTitle, m.CustomFormat) ?? string.Empty; - tokenHandlers["{Movie CollectionThe}"] = m => Truncate(TitleThe(movie.MovieMetadata.Value.CollectionTitle), m.CustomFormat) ?? string.Empty; + tokenHandlers["{Movie CollectionThe}"] = m => Truncate(CollectionTitleThe(movie.MovieMetadata.Value.CollectionTitle), m.CustomFormat) ?? string.Empty; } private string GetLanguageTitle(Movie movie, string isoCodes)