Manual runs should now always get a release so we removed conditionals that would allow manual runs to bypass checks for release status and download_id and fail them now if those variables are not present.

This commit is contained in:
echel0n 2014-04-14 13:12:52 -07:00
commit 29c03bb871

View file

@ -171,9 +171,8 @@ class autoProcessMovie:
logger.warning("%s is marked with a status of %s on CouchPotato, skipping ...", nzbName, release_status) logger.warning("%s is marked with a status of %s on CouchPotato, skipping ...", nzbName, release_status)
return 0 return 0
else: else:
if clientAgent != 'manual': logger.error("Could not find a release status for %s on CouchPotato, skipping ...", nzbName)
logger.error("Could not find a status for %s on CouchPotato, skipping ...", nzbName) return 1
return 1
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)
@ -251,10 +250,7 @@ class autoProcessMovie:
return 0 # success return 0 # success
if not (download_id or media_id or release_id): if not (download_id or media_id or release_id):
if clientAgent != 'manual': return 1
return 1
else:
return 0
# we will now check to see if CPS has finished renaming before returning to TorrentToMedia and unpausing. # we will now check to see if CPS has finished renaming before returning to TorrentToMedia and unpausing.
timeout = time.time() + 60 * int(wait_for) timeout = time.time() + 60 * int(wait_for)