Better movie matching quality

couchpotato/core/plugins/scanner/main.py

@@ -686,7 +686,7 @@ class Scanner(Plugin):
         return None
 
     def findYear(self, text):
-        matches = re.search('(?P<year>[0-9]{4})', text)
+        matches = re.search('(?P<year>[12]{1}[0-9]{3})', text)
         if matches:
             return matches.group('year')
 
@@ -713,7 +713,7 @@ class Scanner(Plugin):
                 movie_name = cleaned.split(year).pop(0).strip()
                 return {
                     'name': movie_name,
-                    'year': year,
+                    'year': int(year),
                 }
             except:
                 pass
@@ -722,7 +722,7 @@ class Scanner(Plugin):
                 movie_name = cleaned.split('  ').pop(0).strip()
                 return {
                     'name': movie_name,
-                    'year': year,
+                    'year': int(year),
                 }
             except:
                 pass

couchpotato/core/plugins/searcher/main.py

@@ -250,7 +250,8 @@ class Searcher(Plugin):
                 found[quality['identifier']] = True
 
         # Hack for older movies that don't contain quality tag
-        if movie_year < datetime.datetime.now().year:
+        year_name = fireEvent('scanner.name_year', name, single = True)
+        if movie_year < datetime.datetime.now().year - 3 and not year_name.get('year', None):
             if size > 3000: # Assume dvdr
                 return 'dvdr' == preferred_quality['identifier']
             else: # Assume dvdrip