diff --git a/couchpotato/core/providers/automation/bluray/main.py b/couchpotato/core/providers/automation/bluray/main.py index cd7c0c90..c6d82ebf 100644 --- a/couchpotato/core/providers/automation/bluray/main.py +++ b/couchpotato/core/providers/automation/bluray/main.py @@ -26,7 +26,7 @@ class Bluray(Automation, RSS): rss_data = self.getCache(cache_key, self.rss_url) data = XMLTree.fromstring(rss_data) - if data: + if data is not None: rss_movies = self.getElements(data, 'channel/item') for movie in rss_movies: diff --git a/couchpotato/core/providers/movie/imdbapi/main.py b/couchpotato/core/providers/movie/imdbapi/main.py index 535e6b24..c81a9aba 100644 --- a/couchpotato/core/providers/movie/imdbapi/main.py +++ b/couchpotato/core/providers/movie/imdbapi/main.py @@ -13,15 +13,14 @@ log = CPLog(__name__) class IMDBAPI(MovieProvider): urls = { - 'search': 'http://www.imdbapi.com/?%s', - 'info': 'http://www.imdbapi.com/?i=%s', + 'search': 'http://www.imdbapi.com/?tomatoes=true&%s', + 'info': 'http://www.imdbapi.com/?tomatoes=true&i=%s', } http_time_between_calls = 0 def __init__(self): addEvent('movie.search', self.search) - addEvent('movie.searchimdb', self.search) addEvent('movie.info', self.getInfo) def search(self, q, limit = 12): @@ -72,7 +71,7 @@ class IMDBAPI(MovieProvider): log.info('No proper json to decode') return movie_data - if movie.get('Response') == 'Parse Error': + if movie.get('Response') == 'Parse Error' or movie.get('Response') == 'False': return movie_data tmp_movie = movie.copy() @@ -91,7 +90,7 @@ class IMDBAPI(MovieProvider): }, 'rating': { 'imdb': (tryFloat(movie.get('imdbRating', 0)), tryInt(movie.get('imdbVotes', '').replace(',', ''))), - #'rotten': (tryFloat(movie.get('tomatoRating', 0)), tryInt(movie.get('tomatoReviews', 0))), + 'rotten': (tryFloat(movie.get('tomatoRating', 0)), tryInt(movie.get('tomatoReviews', '').replace(',', ''))), }, 'imdb': str(movie.get('imdbID', '')), 'runtime': self.runtimeToMinutes(movie.get('Runtime', '')),