Fixes issues with extracting and linking of archives.

Fixes other issues from previous update.
This commit is contained in:
echel0n 2014-04-24 23:41:26 -07:00
commit f5f0ff6e10
7 changed files with 64 additions and 51 deletions

View file

@ -72,9 +72,8 @@ def extract(filePath, outputDestination):
# Create outputDestination folder
nzbtomedia.makeDir(outputDestination)
passwordsfile = nzbtomedia.CFG["passwords"]["PassWordFile"]
if passwordsfile != "" and os.path.isfile(os.path.normpath(passwordsfile)):
passwords = [line.strip() for line in open(os.path.normpath(passwordsfile))]
if nzbtomedia.PASSWORDSFILE != "" and os.path.isfile(os.path.normpath(nzbtomedia.PASSWORDSFILE)):
passwords = [line.strip() for line in open(os.path.normpath(nzbtomedia.PASSWORDSFILE))]
else:
passwords = []
nzbtomedia.logger.info("Extracting %s to %s" % (filePath, outputDestination))