From 906dc686128880aa2cc464c4cfc860acc103e12d Mon Sep 17 00:00:00 2001 From: TRaSH Date: Tue, 7 Jan 2020 22:13:45 +0100 Subject: [PATCH] Update HashRenamer.py Python3 Compatible fix --- NZBGet/scripts/HashRenamer/HashRenamer.py | 50 +++++++++++------------ 1 file changed, 25 insertions(+), 25 deletions(-) diff --git a/NZBGet/scripts/HashRenamer/HashRenamer.py b/NZBGet/scripts/HashRenamer/HashRenamer.py index c4e83ed4b..d2957d263 100644 --- a/NZBGet/scripts/HashRenamer/HashRenamer.py +++ b/NZBGet/scripts/HashRenamer/HashRenamer.py @@ -1,9 +1,9 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 # ############################################################################## # Title: HashRenamer.py # -# Author(s): l3uddz # -# URL: https://github.com/cloudbox/cloudbox # +# Author(s): l3uddz, desimaniac # +# URL: https://github.com/l3uddz/nzbgetScripts # # Description: Renames hashed media files to match the source NZB. # # -- # # Part of the Cloudbox project: https://cloudbox.works # @@ -44,50 +44,50 @@ NZBGET_POSTPROCESS_NONE = 95 ############################################################ def do_check(): - if not os.environ.has_key('NZBOP_SCRIPTDIR'): - print "This script can only be called from NZBGet (11.0 or later)." + if 'NZBOP_SCRIPTDIR' not in os.environ: + print("This script can only be called from NZBGet (11.0 or later).") sys.exit(0) if os.environ['NZBOP_VERSION'][0:5] < '11.0': - print "[ERROR] NZBGet Version %s is not supported. Please update NZBGet." % (str(os.environ['NZBOP_VERSION'])) + print("[ERROR] NZBGet Version %s is not supported. Please update NZBGet." % (str(os.environ['NZBOP_VERSION']))) sys.exit(0) - print "Script triggered from NZBGet Version %s." % (str(os.environ['NZBOP_VERSION'])) + print("Script triggered from NZBGet Version %s." % (str(os.environ['NZBOP_VERSION']))) status = 0 if 'NZBPP_TOTALSTATUS' in os.environ: if not os.environ['NZBPP_TOTALSTATUS'] == 'SUCCESS': - print "[ERROR] Download failed with status %s." % (os.environ['NZBPP_STATUS']) + print("[ERROR] Download failed with status %s." % (os.environ['NZBPP_STATUS'])) status = 1 else: # Check par status if os.environ['NZBPP_PARSTATUS'] == '1' or os.environ['NZBPP_PARSTATUS'] == '4': - print "[ERROR] Par-repair failed, setting status \"failed\"." + print("[ERROR] Par-repair failed, setting status \"failed\".") status = 1 # Check unpack status if os.environ['NZBPP_UNPACKSTATUS'] == '1': - print "[ERROR] Unpack failed, setting status \"failed\"." + print("[ERROR] Unpack failed, setting status \"failed\".") status = 1 if os.environ['NZBPP_UNPACKSTATUS'] == '0' and os.environ['NZBPP_PARSTATUS'] == '0': # Unpack was skipped due to nzb-file properties or due to errors during par-check if os.environ['NZBPP_HEALTH'] < 1000: - print "[ERROR] Download health is compromised and Par-check/repair disabled or no .par2 files found. " \ - "Setting status \"failed\"." - print "[ERROR] Please check your Par-check/repair settings for future downloads." + print("[ERROR] Download health is compromised and Par-check/repair disabled or no .par2 files found. " \ + "Setting status \"failed\".") + print("[ERROR] Please check your Par-check/repair settings for future downloads.") status = 1 else: - print "[ERROR] Par-check/repair disabled or no .par2 files found, and Unpack not required. Health is " \ - "ok so handle as though download successful." - print "[WARNING] Please check your Par-check/repair settings for future downloads." + print("[ERROR] Par-check/repair disabled or no .par2 files found, and Unpack not required. Health is " \ + "ok so handle as though download successful.") + print("[WARNING] Please check your Par-check/repair settings for future downloads.") # Check if destination directory exists (important for reprocessing of history items) if not os.path.isdir(os.environ['NZBPP_DIRECTORY']): - print "[ERROR] Nothing to post-process: destination directory", os.environ[ - 'NZBPP_DIRECTORY'], "doesn't exist. Setting status \"failed\"." + print("[ERROR] Nothing to post-process: destination directory", os.environ[ + 'NZBPP_DIRECTORY'], "doesn't exist. Setting status \"failed\".") status = 1 # All checks done, now launching the script. @@ -153,16 +153,16 @@ if nzb_name is None: sys.exit(NZBGET_POSTPROCESS_ERROR) nzb_name = nzb_name.replace('.nzb', '') -print("[INFO] Using \"%s\" for hashed filenames" % nzb_name) -print("[INFO] Scanning \"%s\" for hashed filenames" % directory) +print(("[INFO] Using \"%s\" for hashed filenames" % nzb_name)) +print(("[INFO] Scanning \"%s\" for hashed filenames" % directory)) # scan for files found_files = find_files(directory) if not found_files: - print("[INFO] No files were found in \"%s\"" % directory) + print(("[INFO] No files were found in \"%s\"" % directory)) sys.exit(NZBGET_POSTPROCESS_NONE) else: - print("[INFO] Found %d files to check for hashed filenames" % len(found_files)) + print(("[INFO] Found %d files to check for hashed filenames" % len(found_files))) # loop files checking for file hash moved_files = 0 for found_file_path in found_files: @@ -173,13 +173,13 @@ else: # is this a file hash if is_file_hash(file_name): new_file_path = os.path.join(dir_name, "%s.%s" % (nzb_name, file_ext)) - print("[INFO] Moving \"%s\" to \"%s\"" % (found_file_path, new_file_path)) + print(("[INFO] Moving \"%s\" to \"%s\"" % (found_file_path, new_file_path))) try: shutil.move(found_file_path, new_file_path) moved_files += 1 except Exception: - print("[ERROR] Failed moving \"%s\" to \"%s\"" % (found_file_path, new_file_path)) + print(("[ERROR] Failed moving \"%s\" to \"%s\"" % (found_file_path, new_file_path))) - print("[INFO] Finished processing \"%s\", moved %d files" % (directory, moved_files)) + print(("[INFO] Finished processing \"%s\", moved %d files" % (directory, moved_files))) sys.exit(NZBGET_POSTPROCESS_SUCCESS) \ No newline at end of file