CouchPotato - Change prefilter to allow results with no year #158

src/Jackett/Utils/TorznabCapsUtil.cs

@@ -12,6 +12,8 @@ namespace Jackett.Utils
     {
         static Regex reduceSpacesRegex = new Regex("\\s{2,}", RegexOptions.Compiled);
 
+        static Regex findYearRegex = new Regex(@"(?<=\[|\(|\s)(\d{4})(?=\]|\)|\s)", RegexOptions.Compiled);
+
         public static TorznabCapabilities CreateDefaultTorznabTVCaps()
         {
             var caps = new TorznabCapabilities();
@@ -23,7 +25,22 @@ namespace Jackett.Utils
             return caps;
         }
 
-        public static IEnumerable<ReleaseInfo> FilterResultsToTitle(IEnumerable<ReleaseInfo> results, string name, int year)
+        private static int GetYearFromTitle(string title)
+        {
+            var match = findYearRegex.Match(title);
+            if (match.Success)
+            {
+                var year = ParseUtil.CoerceInt(match.Value);
+                if(year>1850 && year < 2100)
+                {
+                    return year;
+                }
+            }
+
+            return 0;
+        }
+
+        public static IEnumerable<ReleaseInfo> FilterResultsToTitle(IEnumerable<ReleaseInfo> results, string name, int imdbYear)
         {
             if (string.IsNullOrWhiteSpace(name))
                 return results;
@@ -34,12 +51,18 @@ namespace Jackett.Utils
             {
                 if (result.Title == null)
                     continue;
-                if (CleanTitle(result.Title).Contains(name) &&
+
-                    (year ==0 || result.Title.Contains(year.ToString())))
+                // Match on title
+                if (CleanTitle(result.Title).Contains(name))
+                {
+                    // Match on year
+                    var titleYear = GetYearFromTitle(result.Title);
+                    if (imdbYear == 0 || titleYear == 0 || titleYear == imdbYear)
                     {
                         filteredResults.Add(result);
                     }
                 }
+            }
 
             return filteredResults;
         }