schmittlauch/youtube-dl
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

[adobepass] add specific options for adobe pass authentication

Browse source 
- add --ap-username and --ap-password option to specify
TV provider username and password in the cmd line
- add --ap-retries option to limit the number of retries
- add --list-ap-msi-ids to list the supported TV Providers
This commit is contained in:
Remita Amine 2016-09-13 22:16:01 +01:00
parent 8414c2da31
commit 1b6712ab23
5 changed files with 155 additions and 104 deletions
Download patch file Download diff file Expand all files Collapse all files

10
youtube_dl/extractor/common.py
View file

@ -680,7 +680,7 @@ class InfoExtractor(object):
return (username, password)
def _get_login_info(self):
def _get_login_info(self, username_option='username', password_option='password', netrc_machine=None):
"""
Get the login info as (username, password)
It will look in the netrc file using the _NETRC_MACHINE value
@ -694,11 +694,11 @@ class InfoExtractor(object):
downloader_params = self._downloader.params
# Attempt to use provided username and password or .netrc data
if downloader_params.get('username') is not None:
username = downloader_params['username']
password = downloader_params['password']
if downloader_params.get(username_option) is not None:
username = downloader_params[username_option]
password = downloader_params[password_option]
else:
username, password = self._get_netrc_login_info()
username, password = self._get_netrc_login_info(netrc_machine)
return (username, password)