From 29c03bb8717165971f1f2515db6644af782b9cdc Mon Sep 17 00:00:00 2001 From: echel0n Date: Mon, 14 Apr 2014 13:12:52 -0700 Subject: [PATCH] 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. --- nzbtomedia/autoProcess/autoProcessMovie.py | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/nzbtomedia/autoProcess/autoProcessMovie.py b/nzbtomedia/autoProcess/autoProcessMovie.py index ecfd2635..bfab2f6a 100644 --- a/nzbtomedia/autoProcess/autoProcessMovie.py +++ b/nzbtomedia/autoProcess/autoProcessMovie.py @@ -171,9 +171,8 @@ class autoProcessMovie: logger.warning("%s is marked with a status of %s on CouchPotato, skipping ...", nzbName, release_status) return 0 else: - if clientAgent != 'manual': - logger.error("Could not find a status for %s on CouchPotato, skipping ...", nzbName) - return 1 + logger.error("Could not find a release status for %s on CouchPotato, skipping ...", nzbName) + return 1 process_all_exceptions(nzbName.lower(), dirName) nzbName, dirName = convert_to_ascii(nzbName, dirName) @@ -251,10 +250,7 @@ class autoProcessMovie: return 0 # success if not (download_id or media_id or release_id): - if clientAgent != 'manual': - return 1 - else: - return 0 + return 1 # we will now check to see if CPS has finished renaming before returning to TorrentToMedia and unpausing. timeout = time.time() + 60 * int(wait_for)