mirror of
https://github.com/clinton-hall/nzbToMedia.git
synced 2025-08-14 10:36:52 -07:00
Fix quotes - standardize to single-quoted strings
This commit is contained in:
Labrys of Knossos
parent
85b4e22046
commit
c5343889fb
30 changed files with 1257 additions and 1257 deletions
|
|
@ -16,32 +16,32 @@ def extract(file_path, output_destination):
|
|||
# Using Windows
|
||||
if platform.system() == 'Windows':
|
||||
if not os.path.exists(core.SEVENZIP):
|
||||
core.logger.error("EXTRACTOR: Could not find 7-zip, Exiting")
|
||||
core.logger.error('EXTRACTOR: Could not find 7-zip, Exiting')
|
||||
return False
|
||||
wscriptlocation = os.path.join(os.environ['WINDIR'], 'system32', 'wscript.exe')
|
||||
invislocation = os.path.join(core.APP_ROOT, 'core', 'extractor', 'bin', 'invisible.vbs')
|
||||
cmd_7zip = [wscriptlocation, invislocation, str(core.SHOWEXTRACT), core.SEVENZIP, "x", "-y"]
|
||||
ext_7zip = [".rar", ".zip", ".tar.gz", "tgz", ".tar.bz2", ".tbz", ".tar.lzma", ".tlz", ".7z", ".xz"]
|
||||
cmd_7zip = [wscriptlocation, invislocation, str(core.SHOWEXTRACT), core.SEVENZIP, 'x', '-y']
|
||||
ext_7zip = ['.rar', '.zip', '.tar.gz', 'tgz', '.tar.bz2', '.tbz', '.tar.lzma', '.tlz', '.7z', '.xz']
|
||||
extract_commands = dict.fromkeys(ext_7zip, cmd_7zip)
|
||||
# Using unix
|
||||
else:
|
||||
required_cmds = ["unrar", "unzip", "tar", "unxz", "unlzma", "7zr", "bunzip2"]
|
||||
required_cmds = ['unrar', 'unzip', 'tar', 'unxz', 'unlzma', '7zr', 'bunzip2']
|
||||
# ## Possible future suport:
|
||||
# gunzip: gz (cmd will delete original archive)
|
||||
# ## the following do not extract to dest dir
|
||||
# ".xz": ["xz", "-d --keep"],
|
||||
# ".lzma": ["xz", "-d --format=lzma --keep"],
|
||||
# ".bz2": ["bzip2", "-d --keep"],
|
||||
# '.xz': ['xz', '-d --keep'],
|
||||
# '.lzma': ['xz', '-d --format=lzma --keep'],
|
||||
# '.bz2': ['bzip2', '-d --keep'],
|
||||
|
||||
extract_commands = {
|
||||
".rar": ["unrar", "x", "-o+", "-y"],
|
||||
".tar": ["tar", "-xf"],
|
||||
".zip": ["unzip"],
|
||||
".tar.gz": ["tar", "-xzf"], ".tgz": ["tar", "-xzf"],
|
||||
".tar.bz2": ["tar", "-xjf"], ".tbz": ["tar", "-xjf"],
|
||||
".tar.lzma": ["tar", "--lzma", "-xf"], ".tlz": ["tar", "--lzma", "-xf"],
|
||||
".tar.xz": ["tar", "--xz", "-xf"], ".txz": ["tar", "--xz", "-xf"],
|
||||
".7z": ["7zr", "x"],
|
||||
'.rar': ['unrar', 'x', '-o+', '-y'],
|
||||
'.tar': ['tar', '-xf'],
|
||||
'.zip': ['unzip'],
|
||||
'.tar.gz': ['tar', '-xzf'], '.tgz': ['tar', '-xzf'],
|
||||
'.tar.bz2': ['tar', '-xjf'], '.tbz': ['tar', '-xjf'],
|
||||
'.tar.lzma': ['tar', '--lzma', '-xf'], '.tlz': ['tar', '--lzma', '-xf'],
|
||||
'.tar.xz': ['tar', '--xz', '-xf'], '.txz': ['tar', '--xz', '-xf'],
|
||||
'.7z': ['7zr', 'x'],
|
||||
}
|
||||
# Test command exists and if not, remove
|
||||
if not os.getenv('TR_TORRENT_DIR'):
|
||||
|
|
@ -51,39 +51,39 @@ def extract(file_path, output_destination):
|
|||
stderr=devnull): # note, returns 0 if exists, or 1 if doesn't exist.
|
||||
for k, v in extract_commands.items():
|
||||
if cmd in v[0]:
|
||||
if not call(["which", "7zr"], stdout=devnull, stderr=devnull): # we do have "7zr"
|
||||
extract_commands[k] = ["7zr", "x", "-y"]
|
||||
elif not call(["which", "7z"], stdout=devnull, stderr=devnull): # we do have "7z"
|
||||
extract_commands[k] = ["7z", "x", "-y"]
|
||||
elif not call(["which", "7za"], stdout=devnull, stderr=devnull): # we do have "7za"
|
||||
extract_commands[k] = ["7za", "x", "-y"]
|
||||
if not call(['which', '7zr'], stdout=devnull, stderr=devnull): # we do have '7zr'
|
||||
extract_commands[k] = ['7zr', 'x', '-y']
|
||||
elif not call(['which', '7z'], stdout=devnull, stderr=devnull): # we do have '7z'
|
||||
extract_commands[k] = ['7z', 'x', '-y']
|
||||
elif not call(['which', '7za'], stdout=devnull, stderr=devnull): # we do have '7za'
|
||||
extract_commands[k] = ['7za', 'x', '-y']
|
||||
else:
|
||||
core.logger.error("EXTRACTOR: {cmd} not found, "
|
||||
"disabling support for {feature}".format
|
||||
core.logger.error('EXTRACTOR: {cmd} not found, '
|
||||
'disabling support for {feature}'.format
|
||||
(cmd=cmd, feature=k))
|
||||
del extract_commands[k]
|
||||
devnull.close()
|
||||
else:
|
||||
core.logger.warning("EXTRACTOR: Cannot determine which tool to use when called from Transmission")
|
||||
core.logger.warning('EXTRACTOR: Cannot determine which tool to use when called from Transmission')
|
||||
|
||||
if not extract_commands:
|
||||
core.logger.warning("EXTRACTOR: No archive extracting programs found, plugin will be disabled")
|
||||
core.logger.warning('EXTRACTOR: No archive extracting programs found, plugin will be disabled')
|
||||
|
||||
ext = os.path.splitext(file_path)
|
||||
cmd = []
|
||||
if ext[1] in (".gz", ".bz2", ".lzma"):
|
||||
if ext[1] in ('.gz', '.bz2', '.lzma'):
|
||||
# Check if this is a tar
|
||||
if os.path.splitext(ext[0])[1] == ".tar":
|
||||
cmd = extract_commands[".tar{ext}".format(ext=ext[1])]
|
||||
elif ext[1] in (".1", ".01", ".001") and os.path.splitext(ext[0])[1] in (".rar", ".zip", ".7z"):
|
||||
if os.path.splitext(ext[0])[1] == '.tar':
|
||||
cmd = extract_commands['.tar{ext}'.format(ext=ext[1])]
|
||||
elif ext[1] in ('.1', '.01', '.001') and os.path.splitext(ext[0])[1] in ('.rar', '.zip', '.7z'):
|
||||
cmd = extract_commands[os.path.splitext(ext[0])[1]]
|
||||
elif ext[1] in (".cb7", ".cba", ".cbr", ".cbt", ".cbz"): # don't extract these comic book archives.
|
||||
elif ext[1] in ('.cb7', '.cba', '.cbr', '.cbt', '.cbz'): # don't extract these comic book archives.
|
||||
return False
|
||||
else:
|
||||
if ext[1] in extract_commands:
|
||||
cmd = extract_commands[ext[1]]
|
||||
else:
|
||||
core.logger.debug("EXTRACTOR: Unknown file type: {ext}".format
|
||||
core.logger.debug('EXTRACTOR: Unknown file type: {ext}'.format
|
||||
(ext=ext[1]))
|
||||
return False
|
||||
|
||||
|
|
@ -95,9 +95,9 @@ def extract(file_path, output_destination):
|
|||
else:
|
||||
passwords = []
|
||||
|
||||
core.logger.info("Extracting {file} to {destination}".format
|
||||
core.logger.info('Extracting {file} to {destination}'.format
|
||||
(file=file_path, destination=output_destination))
|
||||
core.logger.debug("Extracting {cmd} {file} {destination}".format
|
||||
core.logger.debug('Extracting {cmd} {file} {destination}'.format
|
||||
(cmd=cmd, file=file_path, destination=output_destination))
|
||||
|
||||
orig_files = []
|
||||
|
|
@ -121,35 +121,35 @@ def extract(file_path, output_destination):
|
|||
else:
|
||||
cmd = core.NICENESS + cmd
|
||||
cmd2 = cmd
|
||||
cmd2.append("-p-") # don't prompt for password.
|
||||
cmd2.append('-p-') # don't prompt for password.
|
||||
p = Popen(cmd2, stdout=devnull, stderr=devnull, startupinfo=info) # should extract files fine.
|
||||
res = p.wait()
|
||||
if res == 0: # Both Linux and Windows return 0 for successful.
|
||||
core.logger.info("EXTRACTOR: Extraction was successful for {file} to {destination}".format
|
||||
core.logger.info('EXTRACTOR: Extraction was successful for {file} to {destination}'.format
|
||||
(file=file_path, destination=output_destination))
|
||||
success = 1
|
||||
elif len(passwords) > 0:
|
||||
core.logger.info("EXTRACTOR: Attempting to extract with passwords")
|
||||
core.logger.info('EXTRACTOR: Attempting to extract with passwords')
|
||||
for password in passwords:
|
||||
if password == "": # if edited in windows or otherwise if blank lines.
|
||||
if password == '': # if edited in windows or otherwise if blank lines.
|
||||
continue
|
||||
cmd2 = cmd
|
||||
# append password here.
|
||||
passcmd = "-p{pwd}".format(pwd=password)
|
||||
passcmd = '-p{pwd}'.format(pwd=password)
|
||||
cmd2.append(passcmd)
|
||||
p = Popen(cmd2, stdout=devnull, stderr=devnull, startupinfo=info) # should extract files fine.
|
||||
res = p.wait()
|
||||
if (res >= 0 and platform == 'Windows') or res == 0:
|
||||
core.logger.info("EXTRACTOR: Extraction was successful "
|
||||
"for {file} to {destination} using password: {pwd}".format
|
||||
core.logger.info('EXTRACTOR: Extraction was successful '
|
||||
'for {file} to {destination} using password: {pwd}'.format
|
||||
(file=file_path, destination=output_destination, pwd=password))
|
||||
success = 1
|
||||
break
|
||||
else:
|
||||
continue
|
||||
except Exception:
|
||||
core.logger.error("EXTRACTOR: Extraction failed for {file}. "
|
||||
"Could not call command {cmd}".format
|
||||
core.logger.error('EXTRACTOR: Extraction failed for {file}. '
|
||||
'Could not call command {cmd}'.format
|
||||
(file=file_path, cmd=cmd))
|
||||
os.chdir(pwd)
|
||||
return False
|
||||
|
|
@ -175,7 +175,7 @@ def extract(file_path, output_destination):
|
|||
pass
|
||||
return True
|
||||
else:
|
||||
core.logger.error("EXTRACTOR: Extraction failed for {file}. "
|
||||
"Result was {result}".format
|
||||
core.logger.error('EXTRACTOR: Extraction failed for {file}. '
|
||||
'Result was {result}'.format
|
||||
(file=file_path, result=res))
|
||||
return False
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue