github/nzbToMedia
1
0
Fork 0
mirror of https://github.com/clinton-hall/nzbToMedia.git synced 2025-08-19 12:59:36 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

support 7z binary. fixes #351

Browse source
This commit is contained in:
clinton-hall 2014-04-28 11:51:28 +09:30
commit dbdbb21fae
1 changed files with 7 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

11
nzbtomedia/extractor/extractor.py
View file

@ -44,10 +44,13 @@ def extract(filePath, outputDestination):
if not os.getenv('TR_TORRENT_DIR'): if not os.getenv('TR_TORRENT_DIR'):
for cmd in required_cmds: for cmd in required_cmds:
if call(['which', cmd]): #note, returns 0 if exists, or 1 if doesn't exist. if call(['which', cmd]): #note, returns 0 if exists, or 1 if doesn't exist.
for k, v in EXTRACT_COMMANDS.items(): if cmd == "7zr" and not call(["which", "7z"]): # we do have "7z" command
if cmd in v[0]: EXTRACT_COMMANDS[".7z"] = ["7z", "x"]
nzbtomedia.logger.error("EXTRACTOR: %s not found, disabling support for %s" % (cmd, k)) else:
del EXTRACT_COMMANDS[k] for k, v in EXTRACT_COMMANDS.items():
if cmd in v[0]:
nzbtomedia.logger.error("EXTRACTOR: %s not found, disabling support for %s" % (cmd, k))
del EXTRACT_COMMANDS[k]
else: else:
nzbtomedia.logger.warning("EXTRACTOR: Cannot determine which tool to use when called from Transmission") nzbtomedia.logger.warning("EXTRACTOR: Cannot determine which tool to use when called from Transmission")