From 7c6605c02bce57cbc956872a0784f721a2881140 Mon Sep 17 00:00:00 2001
From: Mark McDowall <markus.mcd5@gmail.com>
Date: Thu, 16 Jan 2014 23:23:34 -0800
Subject: [PATCH] New: Original Title can be used in file names

---
 .../OrganizerTests/GetNewFilenameFixture.cs         | 13 +++++++++++++
 src/NzbDrone.Core/Organizer/FileNameBuilder.cs      |  4 ++--
 .../MediaManagement/Naming/NamingViewTemplate.html  |  2 ++
 .../Naming/Partials/OriginalTitleNamingPartial.html |  1 +
 4 files changed, 18 insertions(+), 2 deletions(-)
 create mode 100644 src/UI/Settings/MediaManagement/Naming/Partials/OriginalTitleNamingPartial.html

diff --git a/src/NzbDrone.Core.Test/OrganizerTests/GetNewFilenameFixture.cs b/src/NzbDrone.Core.Test/OrganizerTests/GetNewFilenameFixture.cs
index 749dff288..b67e571ec 100644
--- a/src/NzbDrone.Core.Test/OrganizerTests/GetNewFilenameFixture.cs
+++ b/src/NzbDrone.Core.Test/OrganizerTests/GetNewFilenameFixture.cs
@@ -353,5 +353,18 @@ namespace NzbDrone.Core.Test.OrganizerTests
             Subject.BuildFilename(new List<Episode> { _episode1 }, _series, _episodeFile)
                    .Should().Be(_episodeFile.ReleaseGroup);
         }
+
+        [Test]
+        public void should_be_able_to_use_orginal_title()
+        {
+            _series.Title = "30 Rock";
+            _namingConfig.StandardEpisodeFormat = "{Series Title} - {Original Title}";
+
+            _episodeFile.SceneName = "30.Rock.S01E01.xvid-LOL";
+            _episodeFile.Path = @"C:\Test\TV\30 Rock - S01E01 - Test";
+
+            Subject.BuildFilename(new List<Episode> { _episode1 }, _series, _episodeFile)
+                   .Should().Be("30 Rock - 30.Rock.S01E01.xvid-LOL");
+        }
     }
 }
\ No newline at end of file
diff --git a/src/NzbDrone.Core/Organizer/FileNameBuilder.cs b/src/NzbDrone.Core/Organizer/FileNameBuilder.cs
index 004ff68ac..4a1abfed5 100644
--- a/src/NzbDrone.Core/Organizer/FileNameBuilder.cs
+++ b/src/NzbDrone.Core/Organizer/FileNameBuilder.cs
@@ -5,7 +5,6 @@ using System.Linq;
 using System.Text.RegularExpressions;
 using NLog;
 using NzbDrone.Common.Cache;
-using NzbDrone.Core.Configuration;
 using NzbDrone.Core.MediaFiles;
 using NzbDrone.Core.Tv;
 
@@ -86,7 +85,8 @@ namespace NzbDrone.Core.Organizer
 
             var tokenValues = new Dictionary<string, string>(FilenameBuilderTokenEqualityComparer.Instance)
             {
-                {"{Series Title}", series.Title}
+                {"{Series Title}", series.Title},
+                {"Original Title", episodeFile.SceneName}
             };
 
             tokenValues.Add("{Release Group}", episodeFile.ReleaseGroup);
diff --git a/src/UI/Settings/MediaManagement/Naming/NamingViewTemplate.html b/src/UI/Settings/MediaManagement/Naming/NamingViewTemplate.html
index e7b2e4f61..33586db4a 100644
--- a/src/UI/Settings/MediaManagement/Naming/NamingViewTemplate.html
+++ b/src/UI/Settings/MediaManagement/Naming/NamingViewTemplate.html
@@ -42,6 +42,7 @@
                             {{> EpisodeTitleNamingPartial}}
                             {{> QualityTitleNamingPartial}}
                             {{> ReleaseGroupNamingPartial}}
+                            {{> OriginalTitleNamingPartial}}
                             {{> SeparatorNamingPartial}}
                         </ul>
                     </div>
@@ -71,6 +72,7 @@
                             {{> EpisodeTitleNamingPartial}}
                             {{> QualityTitleNamingPartial}}
                             {{> ReleaseGroupNamingPartial}}
+                            {{> OriginalTitleNamingPartial}}
                             {{> SeparatorNamingPartial}}
                         </ul>
                     </div>
diff --git a/src/UI/Settings/MediaManagement/Naming/Partials/OriginalTitleNamingPartial.html b/src/UI/Settings/MediaManagement/Naming/Partials/OriginalTitleNamingPartial.html
new file mode 100644
index 000000000..cef96b894
--- /dev/null
+++ b/src/UI/Settings/MediaManagement/Naming/Partials/OriginalTitleNamingPartial.html
@@ -0,0 +1 @@
+<li><a href="#" data-token="Original Title">Original Title</a></li>
\ No newline at end of file