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

change passwords to read from external list. fixes #211

Browse source
This commit is contained in:
clinton-hall 2013-12-11 13:13:06 +10:30
commit 86abf0f78c
2 changed files with 19 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

6
autoProcessMedia.cfg.sample
View file

@ -154,9 +154,9 @@ delay = 120
convert = 0
[passwords]
#Set a list of passwords to be used for extraction attempts. e.g
#password1 = password
#password2 = secret
# enter the full path to a text file containing passwords to be used for extraction attempts.
# In the passwords file, every password should be on a new line
PassWordFile =
# Logging configuration
[loggers]

25
extractor/extractor.py
View file

@ -112,6 +112,16 @@ def extract(filePath, outputDestination):
# Create outputDestination folder
create_destination(outputDestination)
config = ConfigParser.ConfigParser()
configFilename = os.path.join(os.path.dirname(sys.argv[0]), "autoProcessMedia.cfg")
Logger.info("MAIN: Loading config from %s", configFilename)
config.read(configFilename)
passwordsfile = config.get("passwords", "PassWordFile")
if passwordsfile != "" and os.path.isfile(os.path.normpath(passwordsfile)):
passwords = [line.strip() for line in open(os.path.normpath(passwordsfile))]
else:
passwords = []
Logger.info("Extracting %s to %s", filePath, outputDestination)
Logger.debug("Extracting %s %s %s", cmd, filePath, outputDestination)
pwd = os.getcwd() # Get our Present Working Directory
@ -124,23 +134,20 @@ def extract(filePath, outputDestination):
res = p.wait()
if (res >= 0 and os.name == 'nt') or res == 0: # for windows chp returns process id if successful or -1*Error code. Linux returns 0 for successful.
Logger.info("EXTRACTOR: Extraction was successful for %s to %s", filePath, outputDestination)
else:
elif len(passwords) > 0:
Logger.info("EXTRACTOR: Attempting to extract with passwords")
pass_success = int(0)
passwords = ConfigParser.ConfigParser()
passwordsfile = os.path.join(os.path.dirname(sys.argv[0]), 'autoProcessMedia.cfg')
passwords.read(passwordsfile)
passwordslist = passwords.items('passwords')
for item in passwordslist:
option, password = item
for password in passwords:
if password == "": # if edited in windows or otherwise if blank lines.
continue
cmd2 = cmd
#append password here.
passcmd = "-p" + password
cmd2.append(passcmd)
p = Popen(cmd2) # should extract files fine.
res = p.wait()
if res >= 0: # for windows chp returns process id if successful or -1*Error code. Linux returns 0 for successful.
Logger.info("EXTRACTOR: Extraction was successful for %s to %s", filePath, outputDestination)
if (res >= 0 and os.name == 'nt') or res == 0: # for windows chp returns process id if successful or -1*Error code. Linux returns 0 for successful.
Logger.info("EXTRACTOR: Extraction was successful for %s to %s using password: %s", filePath, outputDestination, password)
pass_success = int(1)
break
else: