From 6dc72713bedc75c60b9f35d96a3f63341bdc95b3 Mon Sep 17 00:00:00 2001
From: Powdor <powdor@tieland.org>
Date: Mon, 3 Nov 2014 15:13:08 +0100
Subject: [PATCH] New: Import Existing series now handles camelCase titles
 without spaces.

---
 .../MetadataSourceTests/TraktProxyFixture.cs        |  8 ++++++++
 src/NzbDrone.Core/MetadataSource/TraktProxy.cs      | 13 +++++++------
 2 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/src/NzbDrone.Core.Test/MetadataSourceTests/TraktProxyFixture.cs b/src/NzbDrone.Core.Test/MetadataSourceTests/TraktProxyFixture.cs
index 30d932ef9..06454fbfa 100644
--- a/src/NzbDrone.Core.Test/MetadataSourceTests/TraktProxyFixture.cs
+++ b/src/NzbDrone.Core.Test/MetadataSourceTests/TraktProxyFixture.cs
@@ -37,6 +37,14 @@ namespace NzbDrone.Core.Test.MetadataSourceTests
         [TestCase("tvdb:78804", "Doctor Who (2005)")]
         [TestCase("TVDB:78804", "Doctor Who (2005)")]
         [TestCase("TVDB: 78804 ", "Doctor Who (2005)")]
+        [TestCase("TheBigBangTheory", "The Big Bang Theory")]
+        [TestCase("Agents of S.H.I.E.L.D.", "Marvel's Agents of S.H.I.E.L.D.")]
+        [TestCase("Marvel's Agents of S.H.I.E.L.D.", "Marvel's Agents of S.H.I.E.L.D.")]
+        [TestCase("Marvel'sAgentsOfS.H.I.E.L.D.", "Marvel's Agents of S.H.I.E.L.D.")]
+        [TestCase("Utopia (US) (2014)", "Utopia (US) (2014)")]
+        [TestCase("Utopia US 2014", "Utopia (US) (2014)")]
+        [TestCase("UtopiaUS2014", "Utopia (US) (2014)")]
+        [TestCase("@Midnight", "@midnight")]
         public void successful_search(string title, string expected)
         {
             var result = Subject.SearchForNewSeries(title);
diff --git a/src/NzbDrone.Core/MetadataSource/TraktProxy.cs b/src/NzbDrone.Core/MetadataSource/TraktProxy.cs
index c80640427..7615ec265 100644
--- a/src/NzbDrone.Core/MetadataSource/TraktProxy.cs
+++ b/src/NzbDrone.Core/MetadataSource/TraktProxy.cs
@@ -19,8 +19,8 @@ namespace NzbDrone.Core.MetadataSource
         private readonly IHttpClient _httpClient;
         private static readonly Regex CollapseSpaceRegex = new Regex(@"\s+", RegexOptions.Compiled);
         private static readonly Regex InvalidSearchCharRegex = new Regex(@"(?:\*|\(|\)|'|!|@|\+)", RegexOptions.Compiled);
-
-
+        private static readonly Regex ExpandCamelCaseRegEx = new Regex(@"(?<!^|[A-Z]\.?|[^\w.])(?=[A-Z])", RegexOptions.IgnorePatternWhitespace | RegexOptions.Compiled);
+    
         private readonly HttpRequestBuilder _requestBuilder;
 
         public TraktProxy(Logger logger, IHttpClient httpClient)
@@ -230,12 +230,13 @@ namespace NzbDrone.Core.MetadataSource
         }
 
         private static string GetSearchTerm(string phrase)
-        {
-            phrase = phrase.RemoveAccent().ToLower();
+        {           
+            phrase = phrase.RemoveAccent();
             phrase = InvalidSearchCharRegex.Replace(phrase, "");
-            phrase = CollapseSpaceRegex.Replace(phrase, " ").Trim().ToLower();
+            phrase = ExpandCamelCaseRegEx.Replace(phrase, " ");
+            phrase = CollapseSpaceRegex.Replace(phrase, " ").Trim();
             phrase = phrase.Trim('-');
-            phrase = System.Web.HttpUtility.UrlEncode(phrase);
+            phrase = System.Web.HttpUtility.UrlEncode(phrase.ToLower());
 
             return phrase;
         }