github/nzbToMedia
1
0
Fork 0
mirror of https://github.com/clinton-hall/nzbToMedia.git synced 2025-08-19 21:03:14 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fixed issue with key_error in autoProcessMovie

Browse source
This commit is contained in:
echel0n 2014-04-17 09:21:14 -07:00
commit 8d2049cb14
2 changed files with 18 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

31
nzbtomedia/autoProcess/autoProcessMovie.py
View file

@ -52,7 +52,7 @@ class autoProcessMovie:
# determin cmd and params to send to CouchPotato to get our results # determin cmd and params to send to CouchPotato to get our results
section = 'movies' section = 'movies'
cmd = "/media.list" cmd = "/media.list"
params['status'] = 'active' params['status'] = 'active,done'
if imdbid: if imdbid:
section = 'media' section = 'media'
cmd = "/media.get" cmd = "/media.get"
@ -71,19 +71,20 @@ class autoProcessMovie:
results = r.json() results = r.json()
try: 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']: for release in movie['releases']:
if download_id and hasattr(release, 'download_info'): if download_id:
try:
if download_id != release['download_info']['id']: if download_id != release['download_info']['id']:
continue continue
except:continue
releases[release['_id']] = release id = release['_id']
except:pass releases[id] = release
return releases return releases
@ -154,13 +155,15 @@ class autoProcessMovie:
logger.error("Could not find any releases marked as WANTED on CouchPotato to compare changes against %s, skipping ...", nzbName) logger.error("Could not find any releases marked as WANTED on CouchPotato to compare changes against %s, skipping ...", nzbName)
return 1 return 1
# try to get release_id, media_id, and download_id if one was not passed in
release_id = None release_id = None
media_id = None media_id = None
if len(releases) == 1: if len(releases) == 1:
release_id = releases.keys()[0] try:
media_id = releases[release_id]['media_id'] release_id = releases.keys()[0]
if hasattr(releases, 'download_info'): media_id = releases[release_id]['media_id']
download_id = releases['download_info']['id'] download_id = releases['download_info']['id']
except:pass
process_all_exceptions(nzbName.lower(), dirName) process_all_exceptions(nzbName.lower(), dirName)
nzbName, dirName = convert_to_ascii(nzbName, dirName) nzbName, dirName = convert_to_ascii(nzbName, dirName)

2
nzbtomedia/nzbToMediaUtil.py
View file

@ -419,7 +419,7 @@ def get_dirnames(section, subsections=None):
return list(set(dirNames)) return list(set(dirNames))
def delete(dirName): def delete(dirName):
logger.info("Deleting failed files and folder %s", dirName) logger.info("Deleting %s", dirName)
try: try:
shutil.rmtree(dirName, True) shutil.rmtree(dirName, True)
except: except: