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

add support for multi-part zip/rar #100

Browse source
This commit is contained in:
Clinton Hall 2013-03-24 16:31:00 -07:00
parent 32547e88fd
commit c1b17acf0d
1 changed files with 3 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

4
extractor/extractor.py
View file

@ -52,7 +52,7 @@ def extract(filePath, outputDestination):
sevenzipLocation = os.path.normpath(os.path.join(os.path.dirname(sys.argv[0]), 'extractor/bin/' + platform + '/7z.exe')) sevenzipLocation = os.path.normpath(os.path.join(os.path.dirname(sys.argv[0]), 'extractor/bin/' + platform + '/7z.exe'))
if not os.path.exists(sevenzipLocation): if not os.path.exists(sevenzipLocation):
Logger.error("EXTRACTOR: Could not find 7-zip, Exiting") Logger.error("EXTRACTOR: Could not find 7-zip, Exiting")
sys.exit(-1) return False
else: else:
if not os.path.exists(chplocation): if not os.path.exists(chplocation):
cmd_7zip = [sevenzipLocation, "x", "-y"] cmd_7zip = [sevenzipLocation, "x", "-y"]
@ -99,6 +99,8 @@ def extract(filePath, outputDestination):
# Check if this is a tar # Check if this is a tar
if os.path.splitext(ext[0])[1] == ".tar": if os.path.splitext(ext[0])[1] == ".tar":
cmd = EXTRACT_COMMANDS[".tar" + ext[1]] cmd = EXTRACT_COMMANDS[".tar" + ext[1]]
elif ext[1] in (".1", ".01", ".001") and os.path.splitext(ext[0])[1] in (".rar", ".zip", ".7z"): #support for *.zip.001, *.zip.002 etc.
cmd = EXTRACT_COMMANDS[os.path.splitext(ext[0])[1]]
else: else:
if ext[1] in EXTRACT_COMMANDS: if ext[1] in EXTRACT_COMMANDS:
cmd = EXTRACT_COMMANDS[ext[1]] cmd = EXTRACT_COMMANDS[ext[1]]