R-yan/l1ving_youtube-dl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

First draft of libsecret support (fixed formatting).

Browse Source
This commit is contained in:
Aleksei Kovura 2017-11-05 18:12:39 +03:00
parent 58ab35d1cb
commit a2cfa80198
1 changed files with 5 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
youtube_dl/__init__.py
View File

@ -50,14 +50,8 @@ from .YoutubeDL import YoutubeDL
def _real_main(argv=None): def _real_main(argv=None):
LIBSECRET_SCHEMA = Secret.Schema.new("io.github.rg3.youtube-dl.Store", LIBSECRET_SCHEMA = Secret.Schema.new("io.github.rg3.youtube-dl.Store", Secret.SchemaFlags.DONT_MATCH_NAME, {"user-name": Secret.SchemaAttributeType.STRING, "domain-name": Secret.SchemaAttributeType.STRING})
Secret.SchemaFlags.DONT_MATCH_NAME,
{
"user-name": Secret.SchemaAttributeType.STRING,
"domain-name": Secret.SchemaAttributeType.STRING
}
)
# Compatibility fixes for Windows # Compatibility fixes for Windows
if sys.platform == 'win32': if sys.platform == 'win32':
# https://github.com/rg3/youtube-dl/issues/820 # https://github.com/rg3/youtube-dl/issues/820
@ -159,14 +153,14 @@ def _real_main(argv=None):
if len(all_domains) > 1: if len(all_domains) > 1:
parser.error('You passed URLs from more than one domain - supplying credentials from command line is not supported in this case.') parser.error('You passed URLs from more than one domain - supplying credentials from command line is not supported in this case.')
domain_name = all_domains.pop() domain_name = all_domains.pop()
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)
if password is None: if password is None:
print("Password for domain " + domain_name + " and user name " + opts.username + " not found in the keyring.") print("Password for domain " + domain_name + " and user name " + opts.username + " not found in the keyring.")
supplied_password = compat_getpass('Type account password and press [Return]: ') supplied_password = compat_getpass('Type account password and press [Return]: ')
attributes = { "user-name": opts.username, "domain-name": domain_name } attributes = {"user-name": opts.username, "domain-name": domain_name}
label = "Youtube-dl: " + domain_name + " password" label = "Youtube-dl: " + domain_name + " password"
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.password_from_keyring is False:
opts.password = compat_getpass('Type account password and press [Return]: ') opts.password = compat_getpass('Type account password and press [Return]: ')