From 9a88cc8e0bf90f95ceb95fd80af6fc0bd7621fb4 Mon Sep 17 00:00:00 2001 From: Ruud Date: Sat, 10 Mar 2012 23:19:51 +0100 Subject: [PATCH] Prio tmdb searches before imdbapi --- couchpotato/core/providers/movie/themoviedb/main.py | 4 ++-- couchpotato/core/providers/userscript/tmdb/main.py | 5 ++++- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/couchpotato/core/providers/movie/themoviedb/main.py b/couchpotato/core/providers/movie/themoviedb/main.py index f2c14e12..2838c4ce 100644 --- a/couchpotato/core/providers/movie/themoviedb/main.py +++ b/couchpotato/core/providers/movie/themoviedb/main.py @@ -11,8 +11,8 @@ class TheMovieDb(MovieProvider): def __init__(self): addEvent('movie.by_hash', self.byHash) - addEvent('movie.search', self.search) - addEvent('movie.info', self.getInfo) + addEvent('movie.search', self.search, priority = 1) + addEvent('movie.info', self.getInfo, priority = 1) addEvent('movie.info_by_tmdb', self.getInfoByTMDBId) # Use base wrapper diff --git a/couchpotato/core/providers/userscript/tmdb/main.py b/couchpotato/core/providers/userscript/tmdb/main.py index d58d8197..6205851e 100644 --- a/couchpotato/core/providers/userscript/tmdb/main.py +++ b/couchpotato/core/providers/userscript/tmdb/main.py @@ -10,4 +10,7 @@ class TMDB(UserscriptBase): def getMovie(self, url): match = re.search('(?P\d+)', url) movie = fireEvent('movie.info_by_tmdb', id = match.group('id'), merge = True) - return self.getInfo(movie['imdb']) + + if movie['imdb']: + return self.getInfo(movie['imdb']) +