Fixed 2 bugs in autoProcessMovie, one that was giving a keyError on '_id' and another that was preventing imdbID from being returned correctly.

This commit is contained in:
echel0n 2014-04-18 07:13:12 -07:00
commit dd41ff3b2f

View file

@ -10,7 +10,10 @@ from nzbtomedia import logger
class autoProcessMovie: class autoProcessMovie:
def find_imdbid(self, dirName, nzbName): def find_imdbid(self, dirName, nzbName):
imdbid = None
nzbName = clean_nzbname(nzbName) nzbName = clean_nzbname(nzbName)
# find imdbid in dirName # find imdbid in dirName
m = re.search('(tt\d{7})', dirName) m = re.search('(tt\d{7})', dirName)
if m: if m:
@ -41,8 +44,13 @@ class autoProcessMovie:
return return
results = r.json() results = r.json()
if hasattr(results, 'imdbID'):
return results['imdbID'] try:
imdbid = results['imdbID']
except:pass
if imdbid:
return imdbid
def get_releases(self, baseURL, download_id, dirName, nzbName): def get_releases(self, baseURL, download_id, dirName, nzbName):
releases = {} releases = {}
@ -71,21 +79,22 @@ class autoProcessMovie:
return return
results = r.json() results = r.json()
movies = results[section] movies = results[section]
if not isinstance(movies, list): if not isinstance(movies, list):
movies = [movies] movies = [movies]
for movie in movies: for movie in movies:
for release in movie['releases']: releases = movie['releases']
if download_id: if not isinstance(releases, list):
releases = [releases]
for release in releases:
try: try:
if download_id:
if download_id != release['download_info']['id']: if download_id != release['download_info']['id']:
continue continue
except:continue
id = release['_id'] id = release['_id']
releases[id] = release releases[id] = release
except:continue
return releases return releases