From 1718d3e706c1ba3863bf164fd1759b01b98c3824 Mon Sep 17 00:00:00 2001 From: Ruud Date: Sat, 21 Apr 2012 16:43:41 +0200 Subject: [PATCH] Don't search when name and year can't be found. fixes #125 --- couchpotato/core/plugins/scanner/main.py | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/couchpotato/core/plugins/scanner/main.py b/couchpotato/core/plugins/scanner/main.py index a89b980..7bc726c 100644 --- a/couchpotato/core/plugins/scanner/main.py +++ b/couchpotato/core/plugins/scanner/main.py @@ -474,12 +474,15 @@ class Scanner(Plugin): if len(identifier) > 2: try: filename = list(group['files'].get('movie'))[0] except: filename = None - movie = fireEvent('movie.search', q = '%(name)s %(year)s' % self.getReleaseNameYear(identifier, file_name = filename), merge = True, limit = 1) - if len(movie) > 0: - imdb_id = movie[0]['imdb'] - log.debug('Found movie via search: %s' % cur_file) - if imdb_id: break + name_year = self.getReleaseNameYear(identifier, file_name = filename) + if name_year.get('name') and name_year.get('year'): + movie = fireEvent('movie.search', q = '%(name)s %(year)s' % name_year, merge = True, limit = 1) + + if len(movie) > 0: + imdb_id = movie[0]['imdb'] + log.debug('Found movie via search: %s' % cur_file) + if imdb_id: break else: log.debug('Identifier to short to use for search: %s' % identifier)