From 22342a4c31cdfcb0fa33b934102fd47a07903c10 Mon Sep 17 00:00:00 2001 From: clinton-hall Date: Fri, 1 Aug 2014 22:35:53 +0930 Subject: [PATCH] don't pass None values. Fixes https://github.com/RuudBurger/CouchPotatoServer/issues/3725 --- nzbtomedia/autoProcess/autoProcessMovie.py | 39 +++++++++++----------- 1 file changed, 20 insertions(+), 19 deletions(-) diff --git a/nzbtomedia/autoProcess/autoProcessMovie.py b/nzbtomedia/autoProcess/autoProcessMovie.py index 30a035bd..e4785786 100644 --- a/nzbtomedia/autoProcess/autoProcessMovie.py +++ b/nzbtomedia/autoProcess/autoProcessMovie.py @@ -246,33 +246,34 @@ class autoProcessMovie: logger.postprocess("Deleting failed files and folder %s" % dirName, section) rmDir(dirName) - if not download_id: + if not release_id and not media_id: logger.error("Could not find a downloaded movie in the database matching %s, exiting!" % inputName, section) return [1, "%s: Failed to post-process - Failed download not found in %s" % (section, section) ] - logger.postprocess("Setting failed release %s to ignored ..." % (inputName), section) + if release_id: + logger.postprocess("Setting failed release %s to ignored ..." % (inputName), section) - url = baseURL + "/release.ignore" - params = {'id': release_id} + url = baseURL + "/release.ignore" + params = {'id': release_id} - logger.debug("Opening URL: %s with PARAMS: %s" % (url, params), section) + logger.debug("Opening URL: %s with PARAMS: %s" % (url, params), section) - try: - r = requests.get(url, params=params, verify=False) - except requests.ConnectionError: - logger.error("Unable to open URL %s" % (url), section) - return [1, "%s: Failed to post-process - Unable to connect to %s" % (section, section) ] + try: + r = requests.get(url, params=params, verify=False) + except requests.ConnectionError: + logger.error("Unable to open URL %s" % (url), section) + return [1, "%s: Failed to post-process - Unable to connect to %s" % (section, section) ] - result = r.json() - if not r.status_code in [requests.codes.ok, requests.codes.created, requests.codes.accepted]: - logger.error("Server returned status %s" % (str(r.status_code)), section) - return [1, "%s: Failed to post-process - Server returned status %s" % (section, str(r.status_code)) ] - elif result['success']: - logger.postprocess("SUCCESS: %s has been set to ignored ..." % (inputName), section) - else: - logger.warning("FAILED: Unable to set %s to ignored!" % (inputName), section) - return [1, "%s: Failed to post-process - Unable to set %s to ignored" % (section, inputName) ] + result = r.json() + if not r.status_code in [requests.codes.ok, requests.codes.created, requests.codes.accepted]: + logger.error("Server returned status %s" % (str(r.status_code)), section) + return [1, "%s: Failed to post-process - Server returned status %s" % (section, str(r.status_code)) ] + elif result['success']: + logger.postprocess("SUCCESS: %s has been set to ignored ..." % (inputName), section) + else: + logger.warning("FAILED: Unable to set %s to ignored!" % (inputName), section) + return [1, "%s: Failed to post-process - Unable to set %s to ignored" % (section, inputName) ] logger.postprocess("Trying to snatch the next highest ranked release.", section)