diff --git a/nzbtomedia/autoProcess/autoProcessTV.py b/nzbtomedia/autoProcess/autoProcessTV.py index e31114f7..e9ad3733 100644 --- a/nzbtomedia/autoProcess/autoProcessTV.py +++ b/nzbtomedia/autoProcess/autoProcessTV.py @@ -151,7 +151,7 @@ class autoProcessTV: url = "%s%s:%s%s/home/postprocess/processEpisode" % (protocol,host,port,web_root) elif section == "NzbDrone": url = "%s%s:%s%s/api/command" % (protocol, host, port, web_root) - url1 = url = "%s%s:%s%s/api/missing" % (protocol, host, port, web_root) + url1 = "%s%s:%s%s/api/missing" % (protocol, host, port, web_root) headers = {"X-Api-Key": apikey} params = {'sortKey': 'series.title', 'page': 1, 'pageSize': 1, 'sortDir': 'asc'} data = json.dumps({"name": "DownloadedEpisodesScan", "path": dirName}) @@ -159,16 +159,21 @@ class autoProcessTV: logger.debug("Opening URL: %s" % (url),section) try: - r = None if section == "SickBeard": + r = None r = requests.get(url, auth=(username, password), params=fork_params, stream=True, verify=False) elif section == "NzbDrone": start_numMissing = numMissing(url1, params, headers) # get current number of outstanding eppisodes. + r = None r = requests.post(url, data=data, headers=headers, stream=True, verify=False) except requests.ConnectionError: logger.error("Unable to open URL: %s" % (url), section) return 1 # failure + 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 + Success = False Started = False for line in r.iter_lines(): @@ -183,10 +188,7 @@ class autoProcessTV: logger.postprocess("Deleting failed files and folder %s" % (dirName),section) rmDir(dirName) - 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 - elif Success: + if Success: return 0 elif section == "NzbDrone" and Started: num_processed = 0 @@ -203,7 +205,6 @@ class autoProcessTV: timeout += 10 * wait_for # extend this loop while things are still changing.... multi episode download. time.sleep(10 * wait_for) - # The status hasn't changed. we have waited 2 minutes which is more than enough. uTorrent can resume seeding now. logger.warning( "The number of missing episodes does not appear to have changed status after %s minutes, Please check your logs." % (str(wait_for)),