From 51d2c730543028d85c60c9fd0bad53995f392d9e Mon Sep 17 00:00:00 2001 From: Labrys Date: Tue, 31 May 2016 12:02:40 -0400 Subject: [PATCH] Use `format()` instead of `%` for string formatting --- core/autoProcess/autoProcessComics.py | 20 ++--- core/autoProcess/autoProcessGames.py | 30 +++---- core/autoProcess/autoProcessMovie.py | 112 +++++++++++++------------- core/autoProcess/autoProcessMusic.py | 44 +++++----- core/autoProcess/autoProcessTV.py | 90 ++++++++++----------- 5 files changed, 148 insertions(+), 148 deletions(-) diff --git a/core/autoProcess/autoProcessComics.py b/core/autoProcess/autoProcessComics.py index 1a0fb43f..b6e5b6ee 100644 --- a/core/autoProcess/autoProcessComics.py +++ b/core/autoProcess/autoProcessComics.py @@ -14,7 +14,7 @@ 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)] + return [1, "{0}: Failed to post-process. {1} does not support failed downloads".format(section, section)] host = core.CFG[section][inputCategory]["host"] port = core.CFG[section][inputCategory]["port"] @@ -25,10 +25,10 @@ class autoProcessComics(object): remote_path = int(core.CFG[section][inputCategory].get("remote_path"), 0) protocol = "https://" if ssl else "http://" - url = "%s%s:%s%s/post_process" % (protocol, host, port, web_root) + url = "{0}{1}:{2}{3}/post_process".format(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, "{0}: Failed to post-process - {1} did not respond.".format(section, section)] inputName, dirName = convert_to_ascii(inputName, dirName) clean_name, ext = os.path.splitext(inputName) @@ -44,25 +44,25 @@ class autoProcessComics(object): success = False - logger.debug("Opening URL: %s" % (url), section) + logger.debug("Opening URL: {0}".format(url), section) try: 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, "{0}: Failed to post-process - Unable to connect to {1}".format(section, section)] for line in r.iter_lines(): if line: - logger.postprocess("%s" % (line), section) + logger.postprocess("{0}".format(line), section) if "Post Processing SUCCESSFUL" in line: success = True if r.status_code not 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))] + logger.error("Server returned status {0}".format(r.status_code), section) + return [1, "{0}: Failed to post-process - Server returned status {1}".format(section, r.status_code)] if success: logger.postprocess("SUCCESS: This issue has been processed successfully", section) - return [0, "%s: Successfully post-processed %s" % (section, inputName)] + return [0, "{0}: Successfully post-processed {1}".format(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)] + return [1, "{0}: Failed to post-process - Returned log from {1} was not as expected.".format(section, section)] diff --git a/core/autoProcess/autoProcessGames.py b/core/autoProcess/autoProcessGames.py index 336c48b3..ada32b11 100644 --- a/core/autoProcess/autoProcessGames.py +++ b/core/autoProcess/autoProcessGames.py @@ -23,10 +23,10 @@ class autoProcessGames(object): web_root = core.CFG[section][inputCategory].get("web_root", "") protocol = "https://" if ssl else "http://" - url = "%s%s:%s%s/api" % (protocol, host, port, web_root) + url = "{0}{1}:{2}{3}/api".format(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, "{0}: Failed to post-process - {1} did not respond.".format(section, section)] inputName, dirName = convert_to_ascii(inputName, dirName) @@ -43,33 +43,33 @@ class autoProcessGames(object): 'status': downloadStatus } - logger.debug("Opening URL: %s" % (url), section) + logger.debug("Opening URL: {0}".format(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, "{0}: Failed to post-process - Unable to connect to {1}".format(section, section)] result = r.json() - logger.postprocess("%s" % (result), section) + logger.postprocess("{0}".format(result), section) if library: - logger.postprocess("moving files to library: %s" % (library), section) + logger.postprocess("moving files to library: {0}".format(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)] + logger.error("Unable to move {0} to {1}".format(dirName, os.path.join(library, inputName)), section) + return [1, "{0}: Failed to post-process - Unable to move files".format(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, "{0}: Failed to post-process - No library defined in {1}".format(section, section)] if r.status_code not 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))] + logger.error("Server returned status {0}".format(r.status_code), section) + return [1, "{0}: Failed to post-process - Server returned status {1}".format(section, 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 {0} has been set to {1} in Gamez".format(gamezID, downloadStatus), section) + return [0, "{0}: Successfully post-processed {1}".format(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 {0} has NOT been updated in Gamez".format(gamezID), section) + return [1, "{0}: Failed to post-process - Returned log from {1} was not as expected.".format(section, section)] diff --git a/core/autoProcess/autoProcessMovie.py b/core/autoProcess/autoProcessMovie.py index 3ded9d24..2c7dce17 100644 --- a/core/autoProcess/autoProcessMovie.py +++ b/core/autoProcess/autoProcessMovie.py @@ -27,12 +27,12 @@ class autoProcessMovie(object): params['id'] = release_id or imdbid url = baseURL + cmd - logger.debug("Opening URL: %s with PARAMS: %s" % (url, params)) + logger.debug("Opening URL: {0} with PARAMS: {1}".format(url, params)) try: r = requests.get(url, params=params, verify=False, timeout=(30, 60)) except requests.ConnectionError: - logger.error("Unable to open URL %s" % url) + logger.error("Unable to open URL {0}".format(url)) return results try: @@ -41,14 +41,14 @@ class autoProcessMovie(object): # ValueError catches simplejson's JSONDecodeError and json's ValueError logger.error("CouchPotato returned the following non-json data") for line in r.iter_lines(): - logger.error("%s" % (line)) + logger.error("{0}".format(line)) return results if not result['success']: if 'error' in result: logger.error(str(result['error'])) else: - logger.error("no media found for id %s" % (params['id'])) + logger.error("no media found for id {0}".format(params['id'])) return results # Gather release info and return it back, no need to narrow results @@ -117,10 +117,10 @@ class autoProcessMovie(object): extract = int(section[inputCategory].get("extract", 0)) protocol = "https://" if ssl else "http://" - baseURL = "%s%s:%s%s/api/%s" % (protocol, host, port, web_root, apikey) + baseURL = "{0}{1}:{2}{3}/api/{4}".format(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, "{0}: Failed to post-process - {1} did not respond.".format(section, section)] imdbid = find_imdbid(dirName, inputName) release = self.get_release(baseURL, imdbid, download_id) @@ -154,7 +154,7 @@ class autoProcessMovie(object): inputName, dirName = convert_to_ascii(inputName, dirName) if not listMediaFiles(dirName, media=True, audio=False, meta=False, archives=False) and listMediaFiles(dirName, media=False, audio=False, meta=False, archives=True) and extract: - logger.debug('Checking for archives to extract in directory: %s' % (dirName)) + logger.debug('Checking for archives to extract in directory: {0}'.format(dirName)) core.extractFiles(dirName) inputName, dirName = convert_to_ascii(inputName, dirName) @@ -169,7 +169,7 @@ class autoProcessMovie(object): good_files += 1 if num_files > 0 and good_files == num_files: if status: - logger.info("Status shown as failed from Downloader, but %s valid video files found. Setting as success." % (str(good_files)), section) + logger.info("Status shown as failed from Downloader, but {0} valid video files found. Setting as success.".format(good_files), section) status = 0 elif num_files > 0 and good_files < num_files: logger.info("Status shown as success from Downloader, but corrupt video files found. Setting as failed.", section) @@ -179,10 +179,10 @@ class autoProcessMovie(object): failureLink += '&corrupt=true' status = 1 elif clientAgent == "manual": - logger.warning("No media files found in directory %s to manually process." % (dirName), section) + logger.warning("No media files found in directory {0} to manually process.".format(dirName), section) return [0, ""] # Success (as far as this script is concerned) else: - logger.warning("No media files found in directory %s. Processing this as a failed download" % (dirName), section) + logger.warning("No media files found in directory {0}. Processing this as a failed download".format(dirName), section) status = 1 if 'NZBOP_VERSION' in os.environ and os.environ['NZBOP_VERSION'][0:5] >= '14.0': print('[NZB] MARK=BAD') @@ -191,17 +191,17 @@ class autoProcessMovie(object): if core.TRANSCODE == 1: result, newDirName = transcoder.Transcode_directory(dirName) if result == 0: - logger.debug("Transcoding succeeded for files in %s" % (dirName), section) + logger.debug("Transcoding succeeded for files in {0}".format(dirName), section) dirName = newDirName else: - logger.error("Transcoding failed for files in %s" % (dirName), section) - return [1, "%s: Failed to post-process - Transcoding failed" % (section)] + logger.error("Transcoding failed for files in {0}".format(dirName), section) + return [1, "{0}: Failed to post-process - Transcoding failed".format(section)] for video in listMediaFiles(dirName, media=True, audio=False, meta=False, archives=False): if not release and ".cp(tt" not in video and imdbid: videoName, videoExt = os.path.splitext(video) - video2 = "%s.cp(%s)%s" % (videoName, imdbid, videoExt) + video2 = "{0}.cp({1}){2}".format(videoName, imdbid, videoExt) if not (clientAgent in [core.TORRENT_CLIENTAGENT, 'manual'] and core.USELINK == 'move-sym'): - logger.debug('Renaming: %s to: %s' % (video, video2)) + logger.debug('Renaming: {0} to: {1}'.format(video, video2)) os.rename(video, video2) params = {} @@ -217,91 +217,91 @@ class autoProcessMovie(object): else: command = "/renamer.scan" - url = "%s%s" % (baseURL, command) + url = "{0}{1}".format(baseURL, command) - logger.debug("Opening URL: %s with PARAMS: %s" % (url, params), section) + logger.debug("Opening URL: {0} with PARAMS: {1}".format(url, params), section) - logger.postprocess("Starting %s scan for %s" % (method, inputName), section) + logger.postprocess("Starting {0} scan for {1}".format(method, inputName), section) try: 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, "{0}: Failed to post-process - Unable to connect to {1}".format(section, section)] result = r.json() if r.status_code not 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))] + logger.error("Server returned status {0}".format(r.status_code), section) + return [1, "{0}: Failed to post-process - Server returned status {1}".format(section, r.status_code)] elif result['success']: - logger.postprocess("SUCCESS: Finished %s scan for folder %s" % (method, dirName), section) + logger.postprocess("SUCCESS: Finished {0} scan for folder {1}".format(method, dirName), section) if method == "manage": - return [0, "%s: Successfully post-processed %s" % (section, inputName)] + return [0, "{0}: Successfully post-processed {1}".format(section, inputName)] else: - logger.error("FAILED: %s scan was unable to finish for folder %s. exiting!" % (method, dirName), + logger.error("FAILED: {0} scan was unable to finish for folder {1}. exiting!".format(method, dirName), section) - return [1, "%s: Failed to post-process - Server did not return success" % (section)] + return [1, "{0}: Failed to post-process - Server did not return success".format(section)] else: core.FAILED = True - logger.postprocess("FAILED DOWNLOAD DETECTED FOR %s" % (inputName), section) + logger.postprocess("FAILED DOWNLOAD DETECTED FOR {0}".format(inputName), section) if failureLink: reportNzb(failureLink, clientAgent) 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) + logger.postprocess("Deleting failed files and folder {0}".format(dirName), section) rmDir(dirName) if not release_id and not media_id: - logger.error("Could not find a downloaded movie in the database matching %s, exiting!" % inputName, + logger.error("Could not find a downloaded movie in the database matching {0}, exiting!".format(inputName), section) - return [1, "%s: Failed to post-process - Failed download not found in %s" % (section, section)] + return [1, "{0}: Failed to post-process - Failed download not found in {1}".format(section, section)] if release_id: - logger.postprocess("Setting failed release %s to ignored ..." % (inputName), section) + logger.postprocess("Setting failed release {0} to ignored ...".format(inputName), section) url = baseURL + "/release.ignore" params = {'id': release_id} - logger.debug("Opening URL: %s with PARAMS: %s" % (url, params), section) + logger.debug("Opening URL: {0} with PARAMS: {1}".format(url, params), section) try: 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)] + logger.error("Unable to open URL {0}".format(url), section) + return [1, "{0}: Failed to post-process - Unable to connect to {1}".format(section, section)] result = r.json() if r.status_code not 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))] + logger.error("Server returned status {0}".format(r.status_code), section) + return [1, "{0}: Failed to post-process - Server returned status {1}".format(section, r.status_code)] elif result['success']: - logger.postprocess("SUCCESS: %s has been set to ignored ..." % (inputName), section) + logger.postprocess("SUCCESS: {0} has been set to ignored ...".format(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.warning("FAILED: Unable to set {0} to ignored!".format(inputName), section) + return [1, "{0}: Failed to post-process - Unable to set {1} to ignored".format(section, inputName)] logger.postprocess("Trying to snatch the next highest ranked release.", section) - url = "%s/movie.searcher.try_next" % (baseURL) - logger.debug("Opening URL: %s" % (url), section) + url = "{0}/movie.searcher.try_next".format(baseURL) + logger.debug("Opening URL: {0}".format(url), section) try: 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)] + logger.error("Unable to open URL {0}".format(url), section) + return [1, "{0}: Failed to post-process - Unable to connect to {1}".format(section, section)] result = r.json() if r.status_code not 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))] + logger.error("Server returned status {0}".format(r.status_code), section) + return [1, "{0}: Failed to post-process - Server returned status {1}".format(section, 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, "{0}: Successfully snatched next highest release".format(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, "{0}: No new release found now. {1} will keep searching".format(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: @@ -315,31 +315,31 @@ class autoProcessMovie(object): if release: 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)] + logger.postprocess("SUCCESS: Movie {0} has now been added to CouchPotato".format(imdbid), section) + return [0, "{0}: Successfully post-processed {1}".format(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]" % ( + logger.postprocess("SUCCESS: Release {0} has now been marked with a status of [{1}]".format( inputName, str(release_status_new).upper()), section) - return [0, "%s: Successfully post-processed %s" % (section, inputName)] + return [0, "{0}: Successfully post-processed {1}".format(section, inputName)] except: pass if not os.path.isdir(dirName): - logger.postprocess("SUCCESS: Input Directory [%s] has been processed and removed" % ( + logger.postprocess("SUCCESS: Input Directory [{0}] has been processed and removed".format( dirName), section) - return [0, "%s: Successfully post-processed %s" % (section, inputName)] + return [0, "{0}: Successfully post-processed {1}".format(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." % ( + logger.postprocess("SUCCESS: Input Directory [{0}] has no remaining media files. This has been fully processed.".format( dirName), section) - return [0, "%s: Successfully post-processed %s" % (section, inputName)] + return [0, "{0}: Successfully post-processed {1}".format(section, inputName)] # pause and let CouchPotatoServer catch its breath 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( - "%s does not appear to have changed status after %s minutes, Please check your logs." % (inputName, wait_for), + "{0} does not appear to have changed status after {1} minutes, Please check your logs.".format(inputName, wait_for), section) - return [1, "%s: Failed to post-process - No change in status" % (section)] + return [1, "{0}: Failed to post-process - No change in status".format(section)] diff --git a/core/autoProcess/autoProcessMusic.py b/core/autoProcess/autoProcessMusic.py index 8ea22a3c..f4ec185b 100644 --- a/core/autoProcess/autoProcessMusic.py +++ b/core/autoProcess/autoProcessMusic.py @@ -14,14 +14,14 @@ requests.packages.urllib3.disable_warnings() class autoProcessMusic(object): def get_status(self, url, apikey, dirName): - logger.debug("Attempting to get current status for release:%s" % (os.path.basename(dirName))) + logger.debug("Attempting to get current status for release:{0}".format(os.path.basename(dirName))) params = { 'apikey': apikey, 'cmd': "getHistory" } - logger.debug("Opening URL: %s with PARAMS: %s" % (url, params)) + logger.debug("Opening URL: {0} with PARAMS: {1}".format(url, params)) try: r = requests.get(url, params=params, verify=False, timeout=(30, 120)) @@ -52,10 +52,10 @@ class autoProcessMusic(object): extract = int(section[inputCategory].get("extract", 0)) protocol = "https://" if ssl else "http://" - url = "%s%s:%s%s/api" % (protocol, host, port, web_root) + url = "{0}{1}:{2}{3}/api".format(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, "{0}: Failed to post-process - {1} did not respond.".format(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] @@ -71,7 +71,7 @@ class autoProcessMusic(object): inputName, dirName = convert_to_ascii(inputName, dirName) if not listMediaFiles(dirName, media=False, audio=True, meta=False, archives=False) and listMediaFiles(dirName, media=False, audio=False, meta=False, archives=True) and extract: - logger.debug('Checking for archives to extract in directory: %s' % (dirName)) + logger.debug('Checking for archives to extract in directory: {0}'.format(dirName)) core.extractFiles(dirName) inputName, dirName = convert_to_ascii(inputName, dirName) @@ -89,43 +89,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 {0}, is it in the wanted list ?".format(inputName), section) - logger.debug("Opening URL: %s with PARAMS: %s" % (url, params), section) + logger.debug("Opening URL: {0} with PARAMS: {1}".format(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 {0}".format(url), section) + return [1, "{0}: Failed to post-process - Unable to connect to {1}".format(section, section)] - logger.debug("Result: %s" % (r.text), section) + logger.debug("Result: {0}".format(r.text), section) if r.status_code not 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))] + logger.error("Server returned status {0}".format(r.status_code), section) + return [1, "{0}: Failed to post-process - Server returned status {1}".format(section, 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 {0} in folder {1} ...".format(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 {0} in folder {1}. exiting!".format(inputName, dirName), section) + return [1, "{0}: Failed to post-process - Returned log from {1} was not as expected.".format(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, "{0}: Failed to post-process. {1} does not support failed downloads".format(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 [{0}]".format(current_status), section) + return [0, "{0}: Successfully post-processed {1}".format(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 {0} has been removed Processing must have finished.".format(dirName), section) + return [0, "{0}: Successfully post-processed {1}".format(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 {0} minutes. Please check your Logs".format(wait_for), section) + return [1, "{0}: Failed to post-process - No change in wanted status".format(section)] diff --git a/core/autoProcess/autoProcessTV.py b/core/autoProcess/autoProcessTV.py index 34d10df2..030588a9 100644 --- a/core/autoProcess/autoProcessTV.py +++ b/core/autoProcess/autoProcessTV.py @@ -22,27 +22,27 @@ class autoProcessTV(object): try: r = requests.get(url, params=params, headers=headers, stream=True, verify=False, timeout=(30, 60)) except requests.ConnectionError: - logger.error("Unable to open URL: %s" % url, section) + logger.error("Unable to open URL: {0}".format(url), section) return None if r.status_code not in [requests.codes.ok, requests.codes.created, requests.codes.accepted]: - logger.error("Server returned status %s" % (str(r.status_code)), section) + logger.error("Server returned status {0}".format(r.status_code), section) return None else: try: return r.json()['state'] except (ValueError, KeyError): # ValueError catches simplejson's JSONDecodeError and json's ValueError - logger.error("%s did not return expected json data." % section, section) + logger.error("{0} did not return expected json data.".format(section), section) return None def CDH(self, url2, headers, section="MAIN"): try: r = requests.get(url2, params={}, headers=headers, stream=True, verify=False, timeout=(30, 60)) except requests.ConnectionError: - logger.error("Unable to open URL: %s" % (url2), section) + logger.error("Unable to open URL: {0}".format(url2), section) return False if r.status_code not in [requests.codes.ok, requests.codes.created, requests.codes.accepted]: - logger.error("Server returned status %s" % (str(r.status_code)), section) + logger.error("Server returned status {0}".format(r.status_code), section) return False else: try: @@ -58,9 +58,9 @@ class autoProcessTV(object): web_root = core.CFG[section][inputCategory].get("web_root", "") protocol = "https://" if ssl else "http://" - if not server_responding("%s%s:%s%s" % (protocol, host, port, web_root)): + if not server_responding("{0}{1}:{2}{3}".format(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, "{0}: Failed to post-process - {1} did not respond.".format(section, section)] # auto-detect correct fork fork, fork_params = autoFork(section, inputCategory) @@ -105,7 +105,7 @@ class autoProcessTV(object): # Now check if tv files exist in destination. if not listMediaFiles(dirName, media=True, audio=False, meta=False, archives=False): if listMediaFiles(dirName, media=False, audio=False, meta=False, archives=True) and extract: - logger.debug('Checking for archives to extract in directory: %s' % (dirName)) + logger.debug('Checking for archives to extract in directory: {0}'.format(dirName)) core.extractFiles(dirName) inputName, dirName = convert_to_ascii(inputName, dirName) @@ -135,7 +135,7 @@ class autoProcessTV(object): if failureLink: failureLink += '&corrupt=true' elif clientAgent == "manual": - logger.warning("No media files found in directory %s to manually process." % (dirName), section) + logger.warning("No media files found in directory {0} to manually process.".format(dirName), section) return [0, ""] # Success (as far as this script is concerned) elif nzbExtractionBy == "Destination": logger.info("Check for media files ignored because nzbExtractionBy is set to Destination.") @@ -148,7 +148,7 @@ class autoProcessTV(object): status = 1 failed = 1 else: - logger.warning("No media files found in directory %s. Processing this as a failed download" % (dirName), section) + logger.warning("No media files found in directory {0}. Processing this as a failed download".format(dirName), section) status = 1 failed = 1 if 'NZBOP_VERSION' in os.environ and os.environ['NZBOP_VERSION'][0:5] >= '14.0': @@ -157,11 +157,11 @@ class autoProcessTV(object): if status == 0 and core.TRANSCODE == 1: # only transcode successful downloads result, newDirName = transcoder.Transcode_directory(dirName) if result == 0: - logger.debug("SUCCESS: Transcoding succeeded for files in %s" % (dirName), section) + logger.debug("SUCCESS: Transcoding succeeded for files in {0}".format(dirName), section) dirName = newDirName else: - logger.error("FAILED: Transcoding failed for files in %s" % (dirName), section) - return [1, "%s: Failed to post-process - Transcoding failed" % (section)] + logger.error("FAILED: Transcoding failed for files in {0}".format(dirName), section) + return [1, "{0}: Failed to post-process - Transcoding failed".format(section)] # configure SB params to pass fork_params['quiet'] = 1 @@ -205,30 +205,30 @@ class autoProcessTV(object): if failureLink: reportNzb(failureLink, clientAgent) if 'failed' in fork_params: - logger.postprocess("FAILED: The download failed. Sending 'failed' process request to %s branch" % (fork), section) + logger.postprocess("FAILED: The download failed. Sending 'failed' process request to {0} branch".format(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. + logger.postprocess("FAILED: The download failed. Sending failed download to {0} for CDH processing".format(fork), section) + return [1, "{0}: Downlaod Failed. Sending back to {1}".format(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) + logger.postprocess("FAILED: The download failed. {0} branch does not handle failed downloads. Nothing to process".format(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) + logger.postprocess("Deleting failed files and folder {0}".format(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, "{0}: Failed to post-process. {1} does not support failed downloads".format(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 = "{0}{1}:{2}{3}/home/postprocess/processEpisode".format(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) + url = "{0}{1}:{2}{3}/api/command".format(protocol, host, port, web_root) + url2 = "{0}{1}:{2}{3}/api/config/downloadClient".format(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: {0}".format(remoteDir(dirName)), section) data = {"name": "DownloadedEpisodesScan", "path": remoteDir(dirName), "downloadClientId": download_id} else: - logger.debug("path: %s" % (dirName), section) + logger.debug("path: {0}".format(dirName), section) data = {"name": "DownloadedEpisodesScan", "path": dirName, "downloadClientId": download_id} if not download_id: data.pop("downloadClientId") @@ -236,29 +236,29 @@ class autoProcessTV(object): try: if section == "SickBeard": - logger.debug("Opening URL: %s with params: %s" % (url, str(fork_params)), section) + logger.debug("Opening URL: {0} with params: {1}".format(url, fork_params), section) s = requests.Session() - login = "%s%s:%s%s/login" % (protocol, host, port, web_root) + login = "{0}{1}:{2}{3}/login".format(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)) elif section == "NzbDrone": - logger.debug("Opening URL: %s with data: %s" % (url, str(data)), section) + logger.debug("Opening URL: {0} with data: {1}".format(url, data), section) 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)] + logger.error("Unable to open URL: {0}".format(url), section) + return [1, "{0}: Failed to post-process - Unable to connect to {1}".format(section, section)] if r.status_code not 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))] + logger.error("Server returned status {0}".format(r.status_code), section) + return [1, "{0}: Failed to post-process - Server returned status {1}".format(section, r.status_code)] Success = False Started = False if section == "SickBeard": for line in r.iter_lines(): if line: - logger.postprocess("%s" % (line), section) + logger.postprocess("{0}".format(line), section) if "Moving file from" in line: inputName = os.path.split(line)[1] if "Processing succeeded" in line or "Successfully processed" in line: @@ -267,23 +267,23 @@ class autoProcessTV(object): try: res = json.loads(r.content) scan_id = int(res['id']) - logger.debug("Scan started with id: %s" % (str(scan_id)), section) + logger.debug("Scan started with id: {0}".format(scan_id), section) Started = True except Exception as e: - logger.warning("No scan id was returned due to: %s" % (e), section) + logger.warning("No scan id was returned due to: {0}".format(e), section) scan_id = None 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 {0}".format(dirName), section) rmDir(dirName) if Success: - return [0, "%s: Successfully post-processed %s" % (section, inputName)] + return [0, "{0}: Successfully post-processed {1}".format(section, inputName)] elif section == "NzbDrone" and Started: n = 0 params = {} - url = url + "/" + str(scan_id) + url = "{0}/{1}".format(url, scan_id) while n < 6: # set up wait_for minutes to see if command completes.. time.sleep(10 * wait_for) command_status = self.command_complete(url, params, headers, section) @@ -291,21 +291,21 @@ class autoProcessTV(object): break n += 1 if command_status: - logger.debug("The Scan command return status: %s" % (command_status), section) + logger.debug("The Scan command return status: {0}".format(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)] + logger.debug("The directory {0} has been removed. Renaming was successful.".format(dirName), section) + return [0, "{0}: Successfully post-processed {1}".format(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, "{0}: Successfully post-processed {1}".format(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) ] if self.CDH(url2, headers, section=section): - 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)] + logger.debug("The Scan command did not return status completed, but complete Download Handling is enabled. Passing back to {0}.".format(section), section) + return [status, "{0}: Complete DownLoad Handling is enabled. Passing back to {1}".format(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, "{0}: Failed to post-process {1}".format(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, "{0}: Failed to post-process - Returned log from {1} was not as expected.".format(section, section)] # We did not receive Success confirmation.