Renamed libsecret option from "--password-from-keyring" to "--keyring".
This commit is contained in:
parent
a2cfa80198
commit
ce0148424a
@ -147,7 +147,7 @@ def _real_main(argv=None):
|
|||||||
parser.error('auto number start must be positive or 0')
|
parser.error('auto number start must be positive or 0')
|
||||||
if opts.usetitle and opts.useid:
|
if opts.usetitle and opts.useid:
|
||||||
parser.error('using title conflicts with using video ID')
|
parser.error('using title conflicts with using video ID')
|
||||||
if opts.username is not None and opts.password is None and opts.password_from_keyring is True:
|
if opts.username is not None and opts.password is None and opts.keyring is True:
|
||||||
# extract domain names, check if all videos are from the same domain.
|
# extract domain names, check if all videos are from the same domain.
|
||||||
all_domains = set(map(lambda url: compat_urllib_parse.urlparse(url).netloc, all_urls))
|
all_domains = set(map(lambda url: compat_urllib_parse.urlparse(url).netloc, all_urls))
|
||||||
if len(all_domains) > 1:
|
if len(all_domains) > 1:
|
||||||
@ -162,7 +162,7 @@ def _real_main(argv=None):
|
|||||||
Secret.password_store_sync(LIBSECRET_SCHEMA, attributes, Secret.COLLECTION_DEFAULT, label, supplied_password, None)
|
Secret.password_store_sync(LIBSECRET_SCHEMA, attributes, Secret.COLLECTION_DEFAULT, label, supplied_password, None)
|
||||||
password = Secret.password_lookup_sync(LIBSECRET_SCHEMA, {"user-name": opts.username, "domain-name": domain_name}, None)
|
password = Secret.password_lookup_sync(LIBSECRET_SCHEMA, {"user-name": opts.username, "domain-name": domain_name}, None)
|
||||||
opts.password = password
|
opts.password = password
|
||||||
if opts.username is not None and opts.password is None and opts.password_from_keyring is False:
|
if opts.username is not None and opts.password is None and opts.keyring is False:
|
||||||
opts.password = compat_getpass('Type account password and press [Return]: ')
|
opts.password = compat_getpass('Type account password and press [Return]: ')
|
||||||
if opts.ap_username is not None and opts.ap_password is None:
|
if opts.ap_username is not None and opts.ap_password is None:
|
||||||
opts.ap_password = compat_getpass('Type TV provider account password and press [Return]: ')
|
opts.ap_password = compat_getpass('Type TV provider account password and press [Return]: ')
|
||||||
|
@ -367,9 +367,9 @@ def parseOpts(overrideArguments=None):
|
|||||||
dest='videopassword', metavar='PASSWORD',
|
dest='videopassword', metavar='PASSWORD',
|
||||||
help='Video password (vimeo, smotri, youku)')
|
help='Video password (vimeo, smotri, youku)')
|
||||||
authentication.add_option(
|
authentication.add_option(
|
||||||
'--password-from-keyring',
|
'--keyring',
|
||||||
action='store_true', dest='password_from_keyring', default=False,
|
action='store_true', dest='keyring', default=False,
|
||||||
help='Retrieve/store password from keyring. Experimental.')
|
help='Retrieve password from keyring. Experimental.')
|
||||||
|
|
||||||
adobe_pass = optparse.OptionGroup(parser, 'Adobe Pass Options')
|
adobe_pass = optparse.OptionGroup(parser, 'Adobe Pass Options')
|
||||||
adobe_pass.add_option(
|
adobe_pass.add_option(
|
||||||
|
Loading…
x
Reference in New Issue
Block a user