Browse Source

Send ignore when getting chart movie info

pull/5397/head
Ruud 10 years ago
parent
commit
cdf1d4ea71
  1. 4
      couchpotato/core/media/movie/providers/automation/imdb.py
  2. 11
      couchpotato/core/media/movie/providers/info/couchpotatoapi.py
  3. 2
      couchpotato/core/media/movie/providers/info/themoviedb.py

4
couchpotato/core/media/movie/providers/automation/imdb.py

@ -51,7 +51,7 @@ class IMDBBase(Automation, RSS):
} }
def getInfo(self, imdb_id): 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): def getFromURL(self, url):
log.debug('Getting IMDBs from: %s', url) log.debug('Getting IMDBs from: %s', url)
@ -203,7 +203,7 @@ class IMDBCharts(IMDBBase):
try: try:
for imdb_id in imdb_ids[0:max_items]: 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: if not is_movie:
continue continue

11
couchpotato/core/media/movie/providers/info/couchpotatoapi.py

@ -74,13 +74,13 @@ class CouchPotatoApi(MovieProvider):
name_enc = base64.b64encode(ss(name)) name_enc = base64.b64encode(ss(name))
return self.getJsonData(self.urls['validate'] % name_enc, headers = self.getRequestHeaders()) 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: if not identifier:
return return
url = self.urls['is_movie'] % identifier 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()) data = self.getJsonData(url, headers = self.getRequestHeaders())
if data: if data:
@ -88,12 +88,15 @@ class CouchPotatoApi(MovieProvider):
return True return True
def getInfo(self, identifier = None, **kwargs): def getInfo(self, identifier = None, adding = False, **kwargs):
if not identifier: if not identifier:
return 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: if result:
return dict((k, v) for k, v in result.items() if v) return dict((k, v) for k, v in result.items() if v)

2
couchpotato/core/media/movie/providers/info/themoviedb.py

@ -75,7 +75,7 @@ class TheMovieDb(MovieProvider):
return results return results
def getInfo(self, identifier = None, extended = True): def getInfo(self, identifier = None, extended = True, **kwargs):
if not identifier: if not identifier:
return {} return {}

Loading…
Cancel
Save