fyb/calcurse-edge
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

calcurse-caldav: Add --password command line argument

Browse Source 
The "--password" argument overrides the corresponding option in the
config file.

Signed-off-by: Randy Ramos <rramos1295@gmail.com>
Signed-off-by: Lukas Fleischer <lfleischer@calcurse.org>
This commit is contained in:
Randy Ramos 2017-09-30 00:53:13 -04:00 committed by Lukas Fleischer
parent 164d6efcb7
commit efd76a0d99
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
contrib/caldav/calcurse-caldav.py
View File

@ -470,6 +470,9 @@ parser.add_argument('--syncdb', action='store', dest='syncdbfn',
parser.add_argument('--hookdir', action='store', dest='hookdir', parser.add_argument('--hookdir', action='store', dest='hookdir',
default=hookdir, default=hookdir,
help='path to the calcurse-caldav hooks directory') help='path to the calcurse-caldav hooks directory')
parser.add_argument('--password', action='store', dest='password',
default=None,
help='password for basic authentication')
parser.add_argument('--authcode', action='store', dest='authcode', parser.add_argument('--authcode', action='store', dest='authcode',
default=None, default=None,
help='auth code for OAuth2 authentication') help='auth code for OAuth2 authentication')
@ -485,6 +488,7 @@ configfn = args.configfn
lockfn = args.lockfn lockfn = args.lockfn
syncdbfn = args.syncdbfn syncdbfn = args.syncdbfn
hookdir = args.hookdir hookdir = args.hookdir
password = args.password
authcode = args.authcode authcode = args.authcode
verbose = args.verbose verbose = args.verbose
debug = args.debug debug = args.debug
@ -534,10 +538,8 @@ if config.has_option('Auth', 'UserName'):
else: else:
username = None username = None
if config.has_option('Auth', 'Password'): if config.has_option('Auth', 'Password') and not password:
password = config.get('Auth', 'Password') password = config.get('Auth', 'Password')
else:
password = None
if config.has_section('CustomHeaders'): if config.has_section('CustomHeaders'):
custom_headers = dict(config.items('CustomHeaders')) custom_headers = dict(config.items('CustomHeaders'))