From ab7bdf6d19302d3f2cdc79905a17ae1a12194b62 Mon Sep 17 00:00:00 2001 From: Ruud Date: Thu, 19 Apr 2012 20:51:44 +0200 Subject: [PATCH] Better movie matching quality --- couchpotato/core/plugins/scanner/main.py | 6 +++--- couchpotato/core/plugins/searcher/main.py | 3 ++- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/couchpotato/core/plugins/scanner/main.py b/couchpotato/core/plugins/scanner/main.py index bf88e7f0..f7869905 100644 --- a/couchpotato/core/plugins/scanner/main.py +++ b/couchpotato/core/plugins/scanner/main.py @@ -686,7 +686,7 @@ class Scanner(Plugin): return None def findYear(self, text): - matches = re.search('(?P[0-9]{4})', text) + matches = re.search('(?P[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 diff --git a/couchpotato/core/plugins/searcher/main.py b/couchpotato/core/plugins/searcher/main.py index b0e5297d..4e3273d6 100644 --- a/couchpotato/core/plugins/searcher/main.py +++ b/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