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

cleanup

Browse source
This commit is contained in:
Clinton Hall 2013-03-01 09:48:20 -08:00
parent 9d6f8ee418
commit c9ca8d7560
1 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

6
extractor/extractor.py
View file

@ -49,7 +49,7 @@ def extract(dirpath, file, outputDestination):
else: else:
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: Couldnt find 7-zip, Exiting") Logger.error("EXTRACTOR: Could not find 7-zip, Exiting")
sys.exit(-1) sys.exit(-1)
else: else:
cmd_7zip = [sevenzipLocation, "x", "-y"] cmd_7zip = [sevenzipLocation, "x", "-y"]
@ -106,7 +106,7 @@ def extract(dirpath, file, outputDestination):
create_destination(outputDestination) create_destination(outputDestination)
Logger.info("Extracting %s to %s", filePath, outputDestination) Logger.info("Extracting %s to %s", filePath, outputDestination)
Logger.debug("Extracting %s %s %s %s", cmd[0], cmd[1], filePath, outputDestination) Logger.debug("Extracting %s %s %s", cmd, filePath, outputDestination)
pwd = os.getcwd() # Get our Present Working Directory pwd = os.getcwd() # Get our Present Working Directory
os.chdir(outputDestination) # Not all unpack commands accept full paths, so just extract into this directory os.chdir(outputDestination) # Not all unpack commands accept full paths, so just extract into this directory
try: # now works same for nt and *nix try: # now works same for nt and *nix
@ -117,6 +117,6 @@ def extract(dirpath, file, outputDestination):
else: else:
Logger.error("EXTRACTOR: Extraction failed for %s. 7zip result was %s", filePath, res) Logger.error("EXTRACTOR: Extraction failed for %s. 7zip result was %s", filePath, res)
except: except:
Logger.error("EXTRACTOR: Extraction failed for %s. Could not call command %s %s %s %s", filePath, cmd[0], cmd[1], filePath) Logger.error("EXTRACTOR: Extraction failed for %s. Could not call command %s", filePath, cmd)
os.chdir(pwd) # Go back to our Original Working Directory os.chdir(pwd) # Go back to our Original Working Directory
return True return True