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

Try to obtain --ap-mso from .netrc

Browse Source
This commit is contained in:
Six 2017-04-05 18:26:10 -07:00
parent 7f04386b89
commit 634386777a
1 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
youtube_dl/extractor/adobepass.py
View File

@ -1362,11 +1362,17 @@ class AdobePassIE(InfoExtractor):
if not authn_token: if not authn_token:
# TODO add support for other TV Providers # TODO add support for other TV Providers
mso_id = self._downloader.params.get('ap_mso') mso_id = self._downloader.params.get('ap_mso')
if not mso_id: if mso_id:
raise_mvpd_required() username, password = self._get_login_info('ap_username', 'ap_password', mso_id)
username, password = self._get_login_info('ap_username', 'ap_password', mso_id) if not username or not password:
if not username or not password: raise_mvpd_required()
raise_mvpd_required() else:
for mso in MSO_INFO:
username, password = self._get_login_info('ap_username', 'ap_password', mso_id)
if username and password:
break
if not username or not password:
raise_mvpd_required()
mso_info = MSO_INFO[mso_id] mso_info = MSO_INFO[mso_id]
provider_redirect_page_res = self._download_webpage_handle( provider_redirect_page_res = self._download_webpage_handle(