Fixed: Updated Add Series sort logic to better handle Country/Year variants.

src/NzbDrone.Core/MetadataSource/TraktProxy.cs

@@ -82,11 +82,11 @@ namespace NzbDrone.Core.MetadataSource
         {
             try
             {
-                var series = SearchTrakt(title.Trim());
+                var series = SearchTrakt(title.Trim()).Select(MapSeries).ToList();
 
-                return series.Select(MapSeries)
-                    .OrderBy(s => title.LevenshteinDistanceClean(s.Title))
-                    .ToList();
+                series.Sort(new TraktSearchSeriesComparer(title));
+
+                return series;
             }
             catch (HttpException)
             {

src/NzbDrone.Core/MetadataSource/TraktSearchSeriesComparer.cs

@@ -0,0 +1,113 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Text.RegularExpressions;
+using NzbDrone.Common;
+using NzbDrone.Core.Tv;
+
+namespace NzbDrone.Core.MetadataSource
+{
+    public class TraktSearchSeriesComparer : IComparer<Series>
+    {
+        private static readonly Regex RegexCleanPunctuation = new Regex("[-._:]", RegexOptions.Compiled);
+        private static readonly Regex RegexCleanCountryYearPostfix = new Regex(@"(?<=.+)( \([A-Z]{2}\)| \(\d{4}\)| \([A-Z]{2}\) \(\d{4}\))$", RegexOptions.Compiled);
+
+        public String SearchQuery { get; private set; }
+
+        private String _searchQueryWithoutYear;
+        private Int32? _year;
+
+        public TraktSearchSeriesComparer(String searchQuery)
+        {
+            SearchQuery = searchQuery;
+            
+            var match = Regex.Match(SearchQuery, @"^(?<query>.+)\s+(?:\((?<year>\d{4})\)|(?<year>\d{4}))$");
+            if (match.Success)
+            {
+                _searchQueryWithoutYear = match.Groups["query"].Value.ToLowerInvariant();
+                _year = Int32.Parse(match.Groups["year"].Value);
+            }
+            else
+            {
+                _searchQueryWithoutYear = searchQuery.ToLowerInvariant();
+            }
+        }
+
+        public int Compare(Series x, Series y)
+        {
+            int result = 0;
+
+            // Prefer exact matches
+            result = Compare(x, y, s => CleanPunctuation(s.Title).LevenshteinDistance(CleanPunctuation(SearchQuery)) <= 1);
+            if (result != 0) return -result;
+
+            // Compare clean matches by year "Battlestar Galactica 1978"
+            result = CompareWithYear(x, y, s => CleanTitle(s.Title).LevenshteinDistance(_searchQueryWithoutYear) <= 1);
+            if (result != 0) return -result;
+
+            // Compare prefix matches by year "(CSI: ..."
+            result = CompareWithYear(x, y, s => s.Title.ToLowerInvariant().StartsWith(_searchQueryWithoutYear + ":"));
+            if (result != 0) return -result;
+
+            return Compare(x, y, s => SearchQuery.LevenshteinDistanceClean(s.Title) - GetYearFactor(s));
+        }
+        
+        public Int32 Compare<T>(Series x, Series y, Func<Series,T> keySelector)
+            where T : IComparable<T>
+        {
+            var keyX = keySelector(x);
+            var keyY = keySelector(y);
+
+            return keyX.CompareTo(keyY);
+        }
+
+        public Int32 CompareWithYear(Series x, Series y, Predicate<Series> canMatch)
+        {
+            var matchX = canMatch(x);
+            var matchY = canMatch(y);
+
+            if (matchX && matchY)
+            {
+                if (_year.HasValue)
+                {
+                    var result = Compare(x, y, s => s.Year == _year.Value);
+                    if (result != 0) return result;
+                }
+
+                return Compare(x, y, s => s.Year);
+            }
+
+            return matchX.CompareTo(matchY);
+        }
+
+        private String CleanPunctuation(String title)
+        {
+            title = RegexCleanPunctuation.Replace(title, "");
+
+            return title.ToLowerInvariant();
+        }
+
+        private String CleanTitle(String title)
+        {
+            title = RegexCleanPunctuation.Replace(title, "");
+            title = RegexCleanCountryYearPostfix.Replace(title, "");
+
+            return title.ToLowerInvariant();
+        }
+
+        private Int32 GetYearFactor(Series series)
+        {
+            if (_year.HasValue)
+            {
+                var offset = Math.Abs(series.Year - _year.Value);
+                if (offset <= 1)
+                {
+                    return 20 - 10 * offset;
+                }
+            }
+
+            return 0;
+        }
+    }
+}

src/NzbDrone.Core/NzbDrone.Core.csproj

@@ -526,6 +526,7 @@
     <Compile Include="Messaging\Events\IEventAggregator.cs" />
     <Compile Include="Messaging\Events\IHandle.cs" />
     <Compile Include="Messaging\IProcessMessage.cs" />
+    <Compile Include="MetadataSource\TraktSearchSeriesComparer.cs" />
     <Compile Include="Metadata\Consumers\MediaBrowser\MediaBrowserMetadata.cs" />
     <Compile Include="Metadata\Consumers\MediaBrowser\MediaBrowserMetadataSettings.cs" />
     <Compile Include="Metadata\Consumers\Roksbox\RoksboxMetadata.cs" />