From 3f11fcf2e1c7ae4a26e78a90e6d9a6dfac7e438e Mon Sep 17 00:00:00 2001 From: Mark McDowall Date: Sun, 28 Sep 2014 00:47:24 -0700 Subject: [PATCH] Fixed: Use empty string when {Original Title} is not available --- .../OrganizerTests/FileNameBuilderFixture.cs | 13 +++++++++++++ src/NzbDrone.Core/Organizer/FileNameBuilder.cs | 2 +- 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/src/NzbDrone.Core.Test/OrganizerTests/FileNameBuilderFixture.cs b/src/NzbDrone.Core.Test/OrganizerTests/FileNameBuilderFixture.cs index 5aa943204..b194c4e70 100644 --- a/src/NzbDrone.Core.Test/OrganizerTests/FileNameBuilderFixture.cs +++ b/src/NzbDrone.Core.Test/OrganizerTests/FileNameBuilderFixture.cs @@ -1,3 +1,4 @@ +using System; using System.Collections.Generic; using System.IO; using System.Linq; @@ -615,5 +616,17 @@ namespace NzbDrone.Core.Test.OrganizerTests Subject.BuildFileName(new List { _episode1 }, _series, _episodeFile) .Should().Be("Venture.Bros.15x06"); } + + [Test] + public void should_use_empty_string_instead_of_null_when_scene_name_is_not_available() + { + _namingConfig.RenameEpisodes = true; + _namingConfig.StandardEpisodeFormat = "{Original Title}"; + + _episodeFile.SceneName = null; + + Subject.BuildFileName(new List { _episode1 }, _series, _episodeFile) + .Should().Be(String.Empty); + } } } \ No newline at end of file diff --git a/src/NzbDrone.Core/Organizer/FileNameBuilder.cs b/src/NzbDrone.Core/Organizer/FileNameBuilder.cs index 62fd5314f..a5886d201 100644 --- a/src/NzbDrone.Core/Organizer/FileNameBuilder.cs +++ b/src/NzbDrone.Core/Organizer/FileNameBuilder.cs @@ -398,7 +398,7 @@ namespace NzbDrone.Core.Organizer private void AddEpisodeFileTokens(Dictionary> tokenHandlers, Series series, EpisodeFile episodeFile) { - tokenHandlers["{Original Title}"] = m => episodeFile.SceneName; + tokenHandlers["{Original Title}"] = m => episodeFile.SceneName ?? String.Empty; tokenHandlers["{Release Group}"] = m => episodeFile.ReleaseGroup ?? "DRONE"; tokenHandlers["{Quality Title}"] = m => GetQualityTitle(series, episodeFile.Quality); }