From 8d44577dcad5acf91188b2cd7a9ebce95100afe7 Mon Sep 17 00:00:00 2001 From: Ruud Date: Mon, 13 Jan 2014 23:43:10 +0100 Subject: [PATCH] Update movie info getter with better exception handling --- couchpotato/core/providers/info/omdbapi/main.py | 2 +- .../core/providers/info/themoviedb/main.py | 16 +++++++++++----- 2 files changed, 12 insertions(+), 6 deletions(-) diff --git a/couchpotato/core/providers/info/omdbapi/main.py b/couchpotato/core/providers/info/omdbapi/main.py index d74bc4b4..7c8be386 100755 --- a/couchpotato/core/providers/info/omdbapi/main.py +++ b/couchpotato/core/providers/info/omdbapi/main.py @@ -39,7 +39,7 @@ class OMDBAPI(MovieProvider): if cached: result = self.parseMovie(cached) if result.get('titles') and len(result.get('titles')) > 0: - log.info('Found: %s', result['titles'][0] + ' (' + str(result['year']) + ')') + log.info('Found: %s', result['titles'][0] + ' (' + str(result.get('year')) + ')') return [result] return [] diff --git a/couchpotato/core/providers/info/themoviedb/main.py b/couchpotato/core/providers/info/themoviedb/main.py index 1a985f01..9587ba41 100644 --- a/couchpotato/core/providers/info/themoviedb/main.py +++ b/couchpotato/core/providers/info/themoviedb/main.py @@ -73,10 +73,16 @@ class TheMovieDb(MovieProvider): try: log.debug('Getting info: %s', cache_key) movie = tmdb3.Movie(identifier) - result = self.parseMovie(movie, extended = extended) - self.setCache(cache_key, result) + try: exists = movie.title is not None + except: exists = False + + if exists: + result = self.parseMovie(movie, extended = extended) + self.setCache(cache_key, result) + else: + result = {} except: - pass + log.error('Failed getting info for %s: %s', (identifier, traceback.format_exc())) return result @@ -157,9 +163,9 @@ class TheMovieDb(MovieProvider): image_url = '' try: - image_url = getattr(movie, type).geturl(size = 'original') + image_url = getattr(movie, type).geturl(size = size) except: - log.debug('Failed getting %s.%s for "%s"', (type, size, movie)) + log.debug('Failed getting %s.%s for "%s"', (type, size, str(movie))) return image_url