sam/AutomatedFanfic
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Added catches for config file in case the option is not present in the config file. Also touches config file if passed in. Should probably have an option to generate a blank config file.

Browse Source
This commit is contained in:
MrTyton 2016-09-07 07:44:50 -04:00
parent 3a8851c3ea
commit e9c919e604
1 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
fanficdownload-cleaned.py
View File

@ -156,22 +156,28 @@ if __name__ == "__main__":
(options, args) = option_parser.parse_args() (options, args) = option_parser.parse_args()
if options.config: if options.config:
touch(options.config)
config = ConfigParser(allow_no_value=True) config = ConfigParser(allow_no_value=True)
config.read(options.config) config.read(options.config)
updater = lambda option, newval : newval if newval != "" else option updater = lambda option, newval : newval if newval != "" else option
try: options.user = updater(options.user, config.get('login', 'user').strip())
except: pass
options.user = updater(options.user, config.get('login', 'user').strip()) try: options.password = updater(options.password, config.get('login', 'password').strip())
except: pass
options.password = updater(options.password, config.get('login', 'password').strip()) try: options.server = updater(options.server, config.get('login', 'server').strip())
except: pass
options.server = updater(options.server, config.get('login', 'server').strip()) try: options.mailbox = updater(options.mailbox, config.get('login', 'mailbox').strip())
except: pass
options.mailbox = updater(options.mailbox, config.get('login', 'mailbox').strip()) try: options.library = updater(options.library, config.get('locations', 'library').strip())
except: pass
options.library = updater(options.library, config.get('locations', 'library').strip()) try: options.input = updater(options.input, config.get('locations', 'input').strip())
except: pass
options.input = updater(options.input, config.get('locations', 'input').strip())
if not (options.user or options.password): if not (options.user or options.password):
raise ValueError("User or Password not given") raise ValueError("User or Password not given")