mirror of
https://github.com/clinton-hall/nzbToMedia.git
synced 2025-07-16 02:02:53 -07:00
PEP8: Fix formatting
* Remove redundant backslash between brackets * Fix multiple statements on one line * Fix missing/excess whitespace * Fix comments not starting with a single `#` and a space * Convert tabs to spaces
This commit is contained in:
Labrys
parent
0a1fe84306
commit
38ed3350ac
5 changed files with 97 additions and 95 deletions
|
|
@ -13,8 +13,8 @@ requests.packages.urllib3.disable_warnings()
|
|||
class autoProcessComics(object):
|
||||
def processEpisode(self, section, dirName, inputName=None, status=0, clientAgent='manual', inputCategory=None):
|
||||
if int(status) != 0:
|
||||
logger.warning("FAILED DOWNLOAD DETECTED, nothing to process.",section)
|
||||
return [1, "%s: Failed to post-process. %s does not support failed downloads" % (section, section) ]
|
||||
logger.warning("FAILED DOWNLOAD DETECTED, nothing to process.", section)
|
||||
return [1, "%s: Failed to post-process. %s does not support failed downloads" % (section, section)]
|
||||
|
||||
host = core.CFG[section][inputCategory]["host"]
|
||||
port = core.CFG[section][inputCategory]["port"]
|
||||
|
|
@ -41,7 +41,7 @@ class autoProcessComics(object):
|
|||
url = "%s%s:%s%s/post_process" % (protocol, host, port, web_root)
|
||||
if not server_responding(url):
|
||||
logger.error("Server did not respond. Exiting", section)
|
||||
return [1, "%s: Failed to post-process - %s did not respond." % (section, section) ]
|
||||
return [1, "%s: Failed to post-process - %s did not respond." % (section, section)]
|
||||
|
||||
inputName, dirName = convert_to_ascii(inputName, dirName)
|
||||
clean_name, ext = os.path.splitext(inputName)
|
||||
|
|
@ -64,18 +64,20 @@ class autoProcessComics(object):
|
|||
r = requests.get(url, auth=(username, password), params=params, stream=True, verify=False, timeout=(30, 300))
|
||||
except requests.ConnectionError:
|
||||
logger.error("Unable to open URL", section)
|
||||
return [1, "%s: Failed to post-process - Unable to connect to %s" % (section, section) ]
|
||||
return [1, "%s: Failed to post-process - Unable to connect to %s" % (section, section)]
|
||||
for line in r.iter_lines():
|
||||
if line: logger.postprocess("%s" % (line), section)
|
||||
if "Post Processing SUCCESSFUL" in line: success = True
|
||||
if line:
|
||||
logger.postprocess("%s" % (line), section)
|
||||
if "Post Processing SUCCESSFUL" in line:
|
||||
success = True
|
||||
|
||||
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)) ]
|
||||
return [1, "%s: Failed to post-process - Server returned status %s" % (section, str(r.status_code))]
|
||||
|
||||
if success:
|
||||
logger.postprocess("SUCCESS: This issue has been processed successfully",section)
|
||||
return [0, "%s: Successfully post-processed %s" % (section, inputName) ]
|
||||
logger.postprocess("SUCCESS: This issue has been processed successfully", section)
|
||||
return [0, "%s: Successfully post-processed %s" % (section, inputName)]
|
||||
else:
|
||||
logger.warning("The issue does not appear to have successfully processed. Please check your Logs",section)
|
||||
return [1, "%s: Failed to post-process - Returned log from %s was not as expected." % (section, section) ]
|
||||
logger.warning("The issue does not appear to have successfully processed. Please check your Logs", section)
|
||||
return [1, "%s: Failed to post-process - Returned log from %s was not as expected." % (section, section)]
|
||||
|
|
|
|||
|
|
@ -39,13 +39,13 @@ class autoProcessGames(object):
|
|||
url = "%s%s:%s%s/api" % (protocol, host, port, web_root)
|
||||
if not server_responding(url):
|
||||
logger.error("Server did not respond. Exiting", section)
|
||||
return [1, "%s: Failed to post-process - %s did not respond." % (section, section) ]
|
||||
return [1, "%s: Failed to post-process - %s did not respond." % (section, section)]
|
||||
|
||||
inputName, dirName = convert_to_ascii(inputName, dirName)
|
||||
|
||||
fields = inputName.split("-")
|
||||
|
||||
gamezID = fields[0].replace("[","").replace("]","").replace(" ","")
|
||||
gamezID = fields[0].replace("[", "").replace("]", "").replace(" ", "")
|
||||
|
||||
downloadStatus = 'Wanted'
|
||||
if status == 0:
|
||||
|
|
@ -57,33 +57,33 @@ class autoProcessGames(object):
|
|||
params['db_id'] = gamezID
|
||||
params['status'] = downloadStatus
|
||||
|
||||
logger.debug("Opening URL: %s" % (url),section)
|
||||
logger.debug("Opening URL: %s" % (url), section)
|
||||
|
||||
try:
|
||||
r = requests.get(url, params=params, verify=False, timeout=(30, 300))
|
||||
except requests.ConnectionError:
|
||||
logger.error("Unable to open URL")
|
||||
return [1, "%s: Failed to post-process - Unable to connect to %s" % (section, section) ]
|
||||
return [1, "%s: Failed to post-process - Unable to connect to %s" % (section, section)]
|
||||
|
||||
result = r.json()
|
||||
logger.postprocess("%s" % (result),section)
|
||||
logger.postprocess("%s" % (result), section)
|
||||
if library:
|
||||
logger.postprocess("moving files to library: %s" % (library),section)
|
||||
logger.postprocess("moving files to library: %s" % (library), section)
|
||||
try:
|
||||
shutil.move(dirName, os.path.join(library, inputName))
|
||||
except:
|
||||
logger.error("Unable to move %s to %s" % (dirName, os.path.join(library, inputName)), section)
|
||||
return [1, "%s: Failed to post-process - Unable to move files" % (section) ]
|
||||
return [1, "%s: Failed to post-process - Unable to move files" % (section)]
|
||||
else:
|
||||
logger.error("No library specified to move files to. Please edit your configuration.", section)
|
||||
return [1, "%s: Failed to post-process - No library defined in %s" % (section, section) ]
|
||||
return [1, "%s: Failed to post-process - No library defined in %s" % (section, section)]
|
||||
|
||||
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)) ]
|
||||
return [1, "%s: Failed to post-process - Server returned status %s" % (section, str(r.status_code))]
|
||||
elif result['success']:
|
||||
logger.postprocess("SUCCESS: Status for %s has been set to %s in Gamez" % (gamezID, downloadStatus),section)
|
||||
return [0, "%s: Successfully post-processed %s" % (section, inputName) ]
|
||||
logger.postprocess("SUCCESS: Status for %s has been set to %s in Gamez" % (gamezID, downloadStatus), section)
|
||||
return [0, "%s: Successfully post-processed %s" % (section, inputName)]
|
||||
else:
|
||||
logger.error("FAILED: Status for %s has NOT been updated in Gamez" % (gamezID),section)
|
||||
return [1, "%s: Failed to post-process - Returned log from %s was not as expected." % (section, section) ]
|
||||
logger.error("FAILED: Status for %s has NOT been updated in Gamez" % (gamezID), section)
|
||||
return [1, "%s: Failed to post-process - Returned log from %s was not as expected." % (section, section)]
|
||||
|
|
|
|||
|
|
@ -40,7 +40,7 @@ class autoProcessMovie(object):
|
|||
except:
|
||||
logger.error("CouchPotato returned the following non-json data")
|
||||
for line in r.iter_lines():
|
||||
logger.error("%s" %(line))
|
||||
logger.error("%s" % (line))
|
||||
return results
|
||||
|
||||
if not result['success']:
|
||||
|
|
@ -56,7 +56,8 @@ class autoProcessMovie(object):
|
|||
id = result[section]['_id']
|
||||
results[id] = result[section]
|
||||
return results
|
||||
except:pass
|
||||
except:
|
||||
pass
|
||||
|
||||
# Gather release info and proceed with trying to narrow results to one release choice
|
||||
|
||||
|
|
@ -135,7 +136,7 @@ class autoProcessMovie(object):
|
|||
baseURL = "%s%s:%s%s/api/%s" % (protocol, host, port, web_root, apikey)
|
||||
if not server_responding(baseURL):
|
||||
logger.error("Server did not respond. Exiting", section)
|
||||
return [1, "%s: Failed to post-process - %s did not respond." % (section, section) ]
|
||||
return [1, "%s: Failed to post-process - %s did not respond." % (section, section)]
|
||||
|
||||
imdbid = find_imdbid(dirName, inputName)
|
||||
release = self.get_release(baseURL, imdbid, download_id)
|
||||
|
|
@ -210,7 +211,7 @@ class autoProcessMovie(object):
|
|||
dirName = newDirName
|
||||
else:
|
||||
logger.error("Transcoding failed for files in %s" % (dirName), section)
|
||||
return [1, "%s: Failed to post-process - Transcoding failed" % (section) ]
|
||||
return [1, "%s: Failed to post-process - Transcoding failed" % (section)]
|
||||
for video in listMediaFiles(dirName, media=True, audio=False, meta=False, archives=False):
|
||||
if not release and not ".cp(tt" in video and imdbid:
|
||||
videoName, videoExt = os.path.splitext(video)
|
||||
|
|
@ -244,20 +245,20 @@ class autoProcessMovie(object):
|
|||
r = requests.get(url, params=params, verify=False, timeout=(30, 1800))
|
||||
except requests.ConnectionError:
|
||||
logger.error("Unable to open URL", section)
|
||||
return [1, "%s: Failed to post-process - Unable to connect to %s" % (section, 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)) ]
|
||||
return [1, "%s: Failed to post-process - Server returned status %s" % (section, str(r.status_code))]
|
||||
elif result['success']:
|
||||
logger.postprocess("SUCCESS: Finished %s scan for folder %s" % (method, dirName), section)
|
||||
if method == "manage":
|
||||
return [0, "%s: Successfully post-processed %s" % (section, inputName) ]
|
||||
return [0, "%s: Successfully post-processed %s" % (section, inputName)]
|
||||
else:
|
||||
logger.error("FAILED: %s scan was unable to finish for folder %s. exiting!" % (method, dirName),
|
||||
section)
|
||||
return [1, "%s: Failed to post-process - Server did not return success" % (section) ]
|
||||
return [1, "%s: Failed to post-process - Server did not return success" % (section)]
|
||||
|
||||
else:
|
||||
core.FAILED = True
|
||||
|
|
@ -272,7 +273,7 @@ class autoProcessMovie(object):
|
|||
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) ]
|
||||
return [1, "%s: Failed to post-process - Failed download not found in %s" % (section, section)]
|
||||
|
||||
if release_id:
|
||||
logger.postprocess("Setting failed release %s to ignored ..." % (inputName), section)
|
||||
|
|
@ -286,17 +287,17 @@ class autoProcessMovie(object):
|
|||
r = requests.get(url, params=params, verify=False, timeout=(30, 120))
|
||||
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) ]
|
||||
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)) ]
|
||||
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) ]
|
||||
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)
|
||||
|
||||
|
|
@ -307,18 +308,18 @@ class autoProcessMovie(object):
|
|||
r = requests.get(url, params={'media_id': media_id}, verify=False, timeout=(30, 600))
|
||||
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) ]
|
||||
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)) ]
|
||||
return [1, "%s: Failed to post-process - Server returned status %s" % (section, str(r.status_code))]
|
||||
elif result['success']:
|
||||
logger.postprocess("SUCCESS: Snatched the next highest release ...", section)
|
||||
return [0, "%s: Successfully snatched next highest release" % (section) ]
|
||||
return [0, "%s: Successfully snatched next highest release" % (section)]
|
||||
else:
|
||||
logger.postprocess("SUCCESS: Unable to find a new release to snatch now. CP will keep searching!", section)
|
||||
return [0, "%s: No new release found now. %s will keep searching" % (section, section) ]
|
||||
return [0, "%s: No new release found now. %s will keep searching" % (section, section)]
|
||||
|
||||
# Added a release that was not in the wanted list so confirm rename successful by finding this movie media.list.
|
||||
if not release:
|
||||
|
|
@ -333,24 +334,24 @@ class autoProcessMovie(object):
|
|||
try:
|
||||
if release_id is None and release_status_old is None: # we didn't have a release before, but now we do.
|
||||
logger.postprocess("SUCCESS: Movie %s has now been added to CouchPotato" % (imdbid), section)
|
||||
return [0, "%s: Successfully post-processed %s" % (section, inputName) ]
|
||||
return [0, "%s: Successfully post-processed %s" % (section, inputName)]
|
||||
|
||||
release_status_new = release[release_id]['status']
|
||||
if release_status_new != release_status_old:
|
||||
logger.postprocess("SUCCESS: Release %s has now been marked with a status of [%s]" % (
|
||||
inputName, str(release_status_new).upper()), section)
|
||||
return [0, "%s: Successfully post-processed %s" % (section, inputName) ]
|
||||
return [0, "%s: Successfully post-processed %s" % (section, inputName)]
|
||||
except:
|
||||
pass
|
||||
if not os.path.isdir(dirName):
|
||||
logger.postprocess("SUCCESS: Input Directory [%s] has been processed and removed" % (
|
||||
dirName), section)
|
||||
return [0, "%s: Successfully post-processed %s" % (section, inputName) ]
|
||||
return [0, "%s: Successfully post-processed %s" % (section, inputName)]
|
||||
|
||||
elif not listMediaFiles(dirName, media=True, audio=False, meta=False, archives=True):
|
||||
logger.postprocess("SUCCESS: Input Directory [%s] has no remaining media files. This has been fully processed." % (
|
||||
dirName), section)
|
||||
return [0, "%s: Successfully post-processed %s" % (section, inputName) ]
|
||||
return [0, "%s: Successfully post-processed %s" % (section, inputName)]
|
||||
|
||||
# pause and let CouchPotatoServer catch its breath
|
||||
time.sleep(10 * wait_for)
|
||||
|
|
@ -359,4 +360,4 @@ class autoProcessMovie(object):
|
|||
logger.warning(
|
||||
"%s does not appear to have changed status after %s minutes, Please check your logs." % (inputName, wait_for),
|
||||
section)
|
||||
return [1, "%s: Failed to post-process - No change in status" % (section) ]
|
||||
return [1, "%s: Failed to post-process - No change in status" % (section)]
|
||||
|
|
|
|||
|
|
@ -66,11 +66,10 @@ class autoProcessMusic(object):
|
|||
else:
|
||||
protocol = "http://"
|
||||
|
||||
|
||||
url = "%s%s:%s%s/api" % (protocol,host,port,web_root)
|
||||
url = "%s%s:%s%s/api" % (protocol, host, port, web_root)
|
||||
if not server_responding(url):
|
||||
logger.error("Server did not respond. Exiting", section)
|
||||
return [1, "%s: Failed to post-process - %s did not respond." % (section, section) ]
|
||||
return [1, "%s: Failed to post-process - %s did not respond." % (section, section)]
|
||||
|
||||
if not os.path.isdir(dirName) and os.path.isfile(dirName): # If the input directory is a file, assume single file download and split dir/name.
|
||||
dirName = os.path.split(os.path.normpath(dirName))[0]
|
||||
|
|
@ -106,43 +105,43 @@ class autoProcessMusic(object):
|
|||
|
||||
release_status = self.get_status(url, apikey, dirName)
|
||||
if not release_status:
|
||||
logger.error("Could not find a status for %s, is it in the wanted list ?" % (inputName),section)
|
||||
logger.error("Could not find a status for %s, is it in the wanted list ?" % (inputName), section)
|
||||
|
||||
logger.debug("Opening URL: %s with PARAMS: %s" % (url, params), section)
|
||||
|
||||
try:
|
||||
r = requests.get(url, params=params, verify=False, timeout=(30, 300))
|
||||
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) ]
|
||||
logger.error("Unable to open URL %s" % (url), section)
|
||||
return [1, "%s: Failed to post-process - Unable to connect to %s" % (section, section)]
|
||||
|
||||
logger.debug("Result: %s" % (r.text),section)
|
||||
logger.debug("Result: %s" % (r.text), section)
|
||||
|
||||
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)) ]
|
||||
return [1, "%s: Failed to post-process - Server returned status %s" % (section, str(r.status_code))]
|
||||
elif r.text == "OK":
|
||||
logger.postprocess("SUCCESS: Post-Processing started for %s in folder %s ..." % (inputName, dirName),section)
|
||||
logger.postprocess("SUCCESS: Post-Processing started for %s in folder %s ..." % (inputName, dirName), section)
|
||||
else:
|
||||
logger.error("FAILED: Post-Processing has NOT started for %s in folder %s. exiting!" % (inputName, dirName),section)
|
||||
return [1, "%s: Failed to post-process - Returned log from %s was not as expected." % (section, section) ]
|
||||
logger.error("FAILED: Post-Processing has NOT started for %s in folder %s. exiting!" % (inputName, dirName), section)
|
||||
return [1, "%s: Failed to post-process - Returned log from %s was not as expected." % (section, section)]
|
||||
|
||||
else:
|
||||
logger.warning("FAILED DOWNLOAD DETECTED", section)
|
||||
return [1, "%s: Failed to post-process. %s does not support failed downloads" % (section, section) ]
|
||||
return [1, "%s: Failed to post-process. %s does not support failed downloads" % (section, section)]
|
||||
|
||||
# we will now wait for this album to be processed before returning to TorrentToMedia and unpausing.
|
||||
timeout = time.time() + 60 * wait_for
|
||||
while time.time() < timeout:
|
||||
current_status = self.get_status(url, apikey, dirName)
|
||||
if current_status is not None and current_status != release_status: # Something has changed. CPS must have processed this movie.
|
||||
logger.postprocess("SUCCESS: This release is now marked as status [%s]" % (current_status),section)
|
||||
return [0, "%s: Successfully post-processed %s" % (section, inputName) ]
|
||||
logger.postprocess("SUCCESS: This release is now marked as status [%s]" % (current_status), section)
|
||||
return [0, "%s: Successfully post-processed %s" % (section, inputName)]
|
||||
if not os.path.isdir(dirName):
|
||||
logger.postprocess("SUCCESS: The input directory %s has been removed Processing must have finished." % (dirName),section)
|
||||
return [0, "%s: Successfully post-processed %s" % (section, inputName) ]
|
||||
logger.postprocess("SUCCESS: The input directory %s has been removed Processing must have finished." % (dirName), section)
|
||||
return [0, "%s: Successfully post-processed %s" % (section, inputName)]
|
||||
time.sleep(10 * wait_for)
|
||||
|
||||
# The status hasn't changed. uTorrent can resume seeding now.
|
||||
logger.warning("The music album does not appear to have changed status after %s minutes. Please check your Logs" % (wait_for),section)
|
||||
return [1, "%s: Failed to post-process - No change in wanted status" % (section) ]
|
||||
logger.warning("The music album does not appear to have changed status after %s minutes. Please check your Logs" % (wait_for), section)
|
||||
return [1, "%s: Failed to post-process - No change in wanted status" % (section)]
|
||||
|
|
|
|||
|
|
@ -51,7 +51,7 @@ class autoProcessTV(object):
|
|||
except:
|
||||
return False
|
||||
|
||||
def processEpisode(self, section, dirName, inputName=None, failed=False, clientAgent = "manual", download_id=None, inputCategory=None, failureLink=None):
|
||||
def processEpisode(self, section, dirName, inputName=None, failed=False, clientAgent="manual", download_id=None, inputCategory=None, failureLink=None):
|
||||
host = core.CFG[section][inputCategory]["host"]
|
||||
port = core.CFG[section][inputCategory]["port"]
|
||||
try:
|
||||
|
|
@ -66,9 +66,9 @@ class autoProcessTV(object):
|
|||
web_root = core.CFG[section][inputCategory]["web_root"]
|
||||
except:
|
||||
web_root = ""
|
||||
if not server_responding("%s%s:%s%s" % (protocol,host,port,web_root)):
|
||||
if not server_responding("%s%s:%s%s" % (protocol, host, port, web_root)):
|
||||
logger.error("Server did not respond. Exiting", section)
|
||||
return [1, "%s: Failed to post-process - %s did not respond." % (section, section) ]
|
||||
return [1, "%s: Failed to post-process - %s did not respond." % (section, section)]
|
||||
|
||||
# auto-detect correct fork
|
||||
fork, fork_params = autoFork(section, inputCategory)
|
||||
|
|
@ -136,7 +136,7 @@ class autoProcessTV(object):
|
|||
if e.errno != errno.EEXIST:
|
||||
raise
|
||||
|
||||
if not 'process_method' in fork_params or (clientAgent in ['nzbget','sabnzbd'] and nzbExtractionBy != "Destination"):
|
||||
if not 'process_method' in fork_params or (clientAgent in ['nzbget', 'sabnzbd'] and nzbExtractionBy != "Destination"):
|
||||
if inputName:
|
||||
process_all_exceptions(inputName, dirName)
|
||||
inputName, dirName = convert_to_ascii(inputName, dirName)
|
||||
|
|
@ -200,7 +200,7 @@ class autoProcessTV(object):
|
|||
dirName = newDirName
|
||||
else:
|
||||
logger.error("FAILED: Transcoding failed for files in %s" % (dirName), section)
|
||||
return [1, "%s: Failed to post-process - Transcoding failed" % (section) ]
|
||||
return [1, "%s: Failed to post-process - Transcoding failed" % (section)]
|
||||
|
||||
# configure SB params to pass
|
||||
fork_params['quiet'] = 1
|
||||
|
|
@ -235,7 +235,7 @@ class autoProcessTV(object):
|
|||
del fork_params[param]
|
||||
|
||||
# delete any unused params so we don't pass them to SB by mistake
|
||||
[fork_params.pop(k) for k,v in fork_params.items() if v is None]
|
||||
[fork_params.pop(k) for k, v in fork_params.items() if v is None]
|
||||
|
||||
if status == 0:
|
||||
logger.postprocess("SUCCESS: The download succeeded, sending a post-process request", section)
|
||||
|
|
@ -247,27 +247,27 @@ class autoProcessTV(object):
|
|||
logger.postprocess("FAILED: The download failed. Sending 'failed' process request to %s branch" % (fork), section)
|
||||
elif section == "NzbDrone":
|
||||
logger.postprocess("FAILED: The download failed. Sending failed download to %s for CDH processing" % (fork), section)
|
||||
return [1, "%s: Downlaod Failed. Sending back to %s" % (section, section) ] # Return as failed to flag this in the downloader.
|
||||
return [1, "%s: Downlaod Failed. Sending back to %s" % (section, section)] # Return as failed to flag this in the downloader.
|
||||
else:
|
||||
logger.postprocess("FAILED: The download failed. %s branch does not handle failed downloads. Nothing to process" % (fork), section)
|
||||
if delete_failed and os.path.isdir(dirName) and not os.path.dirname(dirName) == dirName:
|
||||
logger.postprocess("Deleting failed files and folder %s" % (dirName), section)
|
||||
rmDir(dirName)
|
||||
return [1, "%s: Failed to post-process. %s does not support failed downloads" % (section, section) ] # Return as failed to flag this in the downloader.
|
||||
return [1, "%s: Failed to post-process. %s does not support failed downloads" % (section, section)] # Return as failed to flag this in the downloader.
|
||||
|
||||
url = None
|
||||
if section == "SickBeard":
|
||||
url = "%s%s:%s%s/home/postprocess/processEpisode" % (protocol,host,port,web_root)
|
||||
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)
|
||||
url2 = "%s%s:%s%s/api/config/downloadClient" % (protocol, host, port, web_root)
|
||||
headers = {"X-Api-Key": apikey}
|
||||
# params = {'sortKey': 'series.title', 'page': 1, 'pageSize': 1, 'sortDir': 'asc'}
|
||||
if remote_path:
|
||||
logger.debug("remote_path: %s" % (remoteDir(dirName)),section)
|
||||
logger.debug("remote_path: %s" % (remoteDir(dirName)), section)
|
||||
data = {"name": "DownloadedEpisodesScan", "path": remoteDir(dirName), "downloadClientId": download_id}
|
||||
else:
|
||||
logger.debug("path: %s" % (dirName),section)
|
||||
logger.debug("path: %s" % (dirName), section)
|
||||
data = {"name": "DownloadedEpisodesScan", "path": dirName, "downloadClientId": download_id}
|
||||
if not download_id:
|
||||
data.pop("downloadClientId")
|
||||
|
|
@ -277,7 +277,7 @@ class autoProcessTV(object):
|
|||
if section == "SickBeard":
|
||||
logger.debug("Opening URL: %s with params: %s" % (url, str(fork_params)), section)
|
||||
s = requests.Session()
|
||||
login = "%s%s:%s%s/login" % (protocol,host,port,web_root)
|
||||
login = "%s%s:%s%s/login" % (protocol, host, port, web_root)
|
||||
login_params = {'username': username, 'password': password}
|
||||
s.post(login, data=login_params, stream=True, verify=False, timeout=(30, 60))
|
||||
r = s.get(url, auth=(username, password), params=fork_params, stream=True, verify=False, timeout=(30, 1800))
|
||||
|
|
@ -286,11 +286,11 @@ class autoProcessTV(object):
|
|||
r = requests.post(url, data=data, headers=headers, stream=True, verify=False, timeout=(30, 1800))
|
||||
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) ]
|
||||
return [1, "%s: Failed to post-process - Unable to connect to %s" % (section, section)]
|
||||
|
||||
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)) ]
|
||||
return [1, "%s: Failed to post-process - Server returned status %s" % (section, str(r.status_code))]
|
||||
|
||||
Success = False
|
||||
Started = False
|
||||
|
|
@ -314,11 +314,11 @@ class autoProcessTV(object):
|
|||
Started = False
|
||||
|
||||
if status != 0 and delete_failed and not os.path.dirname(dirName) == dirName:
|
||||
logger.postprocess("Deleting failed files and folder %s" % (dirName),section)
|
||||
logger.postprocess("Deleting failed files and folder %s" % (dirName), section)
|
||||
rmDir(dirName)
|
||||
|
||||
if Success:
|
||||
return [0, "%s: Successfully post-processed %s" % (section, inputName) ]
|
||||
return [0, "%s: Successfully post-processed %s" % (section, inputName)]
|
||||
elif section == "NzbDrone" and Started:
|
||||
n = 0
|
||||
params = {}
|
||||
|
|
@ -333,18 +333,18 @@ class autoProcessTV(object):
|
|||
logger.debug("The Scan command return status: %s" % (command_status), section)
|
||||
if not os.path.exists(dirName):
|
||||
logger.debug("The directory %s has been removed. Renaming was successful." % (dirName), section)
|
||||
return [0, "%s: Successfully post-processed %s" % (section, inputName) ]
|
||||
return [0, "%s: Successfully post-processed %s" % (section, inputName)]
|
||||
elif command_status and command_status in ['completed']:
|
||||
logger.debug("The Scan command has completed successfully. Renaming was successful.", section)
|
||||
return [0, "%s: Successfully post-processed %s" % (section, inputName) ]
|
||||
return [0, "%s: Successfully post-processed %s" % (section, inputName)]
|
||||
elif command_status and command_status in ['failed']:
|
||||
logger.debug("The Scan command has failed. Renaming was not successful.", section)
|
||||
#return [1, "%s: Failed to post-process %s" % (section, inputName) ]
|
||||
# return [1, "%s: Failed to post-process %s" % (section, inputName) ]
|
||||
if self.CDH(url2, headers):
|
||||
logger.debug("The Scan command did not return status completed, but complete Download Handling is enabled. Passing back to %s." % (section), section)
|
||||
return [status, "%s: Complete DownLoad Handling is enabled. Passing back to %s" % (section, section) ]
|
||||
return [status, "%s: Complete DownLoad Handling is enabled. Passing back to %s" % (section, section)]
|
||||
else:
|
||||
logger.warning("The Scan command did not return a valid status. Renaming was not successful.", section)
|
||||
return [1, "%s: Failed to post-process %s" % (section, inputName) ]
|
||||
return [1, "%s: Failed to post-process %s" % (section, inputName)]
|
||||
else:
|
||||
return [1, "%s: Failed to post-process - Returned log from %s was not as expected." % (section, section) ] # We did not receive Success confirmation.
|
||||
return [1, "%s: Failed to post-process - Returned log from %s was not as expected." % (section, section)] # We did not receive Success confirmation.
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue