diff --git a/couchpotato/core/media/movie/providers/automation/imdb.py b/couchpotato/core/media/movie/providers/automation/imdb.py index ead888e..6fe54e1 100644 --- a/couchpotato/core/media/movie/providers/automation/imdb.py +++ b/couchpotato/core/media/movie/providers/automation/imdb.py @@ -51,7 +51,7 @@ class IMDBBase(Automation, RSS): } def getInfo(self, imdb_id): - return fireEvent('movie.info', identifier = imdb_id, extended = False, merge = True) + return fireEvent('movie.info', identifier = imdb_id, extended = False, adding = False, merge = True) def getFromURL(self, url): log.debug('Getting IMDBs from: %s', url) @@ -203,7 +203,7 @@ class IMDBCharts(IMDBBase): try: for imdb_id in imdb_ids[0:max_items]: - is_movie = fireEvent('movie.is_movie', identifier = imdb_id, single = True) + is_movie = fireEvent('movie.is_movie', identifier = imdb_id, adding = False, single = True) if not is_movie: continue diff --git a/couchpotato/core/media/movie/providers/info/couchpotatoapi.py b/couchpotato/core/media/movie/providers/info/couchpotatoapi.py index b789d88..c271a9e 100644 --- a/couchpotato/core/media/movie/providers/info/couchpotatoapi.py +++ b/couchpotato/core/media/movie/providers/info/couchpotatoapi.py @@ -74,13 +74,13 @@ class CouchPotatoApi(MovieProvider): name_enc = base64.b64encode(ss(name)) return self.getJsonData(self.urls['validate'] % name_enc, headers = self.getRequestHeaders()) - def isMovie(self, identifier = None, adding = False): + def isMovie(self, identifier = None, adding = False, **kwargs): if not identifier: return url = self.urls['is_movie'] % identifier - url += '?adding=1' if adding else '' + url += '' if adding else '?ignore=1' data = self.getJsonData(url, headers = self.getRequestHeaders()) if data: @@ -88,12 +88,15 @@ class CouchPotatoApi(MovieProvider): return True - def getInfo(self, identifier = None, **kwargs): + def getInfo(self, identifier = None, adding = False, **kwargs): if not identifier: return - result = self.getJsonData(self.urls['info'] % identifier, headers = self.getRequestHeaders()) + url = self.urls['info'] % identifier + url += '' if adding else '?ignore=1' + + result = self.getJsonData(url, headers = self.getRequestHeaders()) if result: return dict((k, v) for k, v in result.items() if v) diff --git a/couchpotato/core/media/movie/providers/info/themoviedb.py b/couchpotato/core/media/movie/providers/info/themoviedb.py index 17110af..bd41b34 100644 --- a/couchpotato/core/media/movie/providers/info/themoviedb.py +++ b/couchpotato/core/media/movie/providers/info/themoviedb.py @@ -75,7 +75,7 @@ class TheMovieDb(MovieProvider): return results - def getInfo(self, identifier = None, extended = True): + def getInfo(self, identifier = None, extended = True, **kwargs): if not identifier: return {}