github/nzbToMedia
1
0
Fork 0
mirror of https://github.com/clinton-hall/nzbToMedia.git synced 2025-07-15 09:42:54 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

cleanup and fixes

Browse source 
- cleaned up logger messages
- SIZE_CUTOFF moved to config
- useLink changed to true/false (easier to understand)
- removed which.py (included in extractor.py)
- added a check in the extractor to support transmission (otherwise it
will fail), but note that it will not be able to check if an command is
executable
This commit is contained in:
Joel Kåberg 2013-03-01 10:55:51 +01:00
parent 51226573f9
commit f41b576967
5 changed files with 43 additions and 50 deletions
Download patch file Download diff file Expand all files Collapse all files

16
extractor/extractor.py
View file

@ -73,12 +73,16 @@ def extract(dirpath, file, outputDestination):
".7z": ["7zr", "x"],
}
# Test command exists and if not, remove
for cmd in required_cmds:
if call(['which', cmd]): #note, returns 0 if exists, or 1 if doesn't exist.
for k, v in EXTRACT_COMMANDS.items():
if cmd in v[0]:
Logger.error("EXTRACTOR: %s not found, disabling support for %s", cmd, k)
del EXTRACT_COMMANDS[k]
if not os.getenv('TR_TORRENT_DIR'):
for cmd in required_cmds:
if call(['which', cmd]): #note, returns 0 if exists, or 1 if doesn't exist.
for k, v in EXTRACT_COMMANDS.items():
if cmd in v[0]:
Logger.error("EXTRACTOR: %s not found, disabling support for %s", cmd, k)
del EXTRACT_COMMANDS[k]
else:
Logger.warn("EXTRACTOR: Cannot determine which tool to use when called from Transmission")
if not EXTRACT_COMMANDS:
Logger.warn("EXTRACTOR: No archive extracting programs found, plugin will be disabled")