From 634386777ad7a7dd6cfd8181cba34f2904e0acc0 Mon Sep 17 00:00:00 2001 From: Six Date: Wed, 5 Apr 2017 18:26:10 -0700 Subject: [PATCH] Try to obtain --ap-mso from .netrc --- youtube_dl/extractor/adobepass.py | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/youtube_dl/extractor/adobepass.py b/youtube_dl/extractor/adobepass.py index 1b2d364ca..e4825210b 100644 --- a/youtube_dl/extractor/adobepass.py +++ b/youtube_dl/extractor/adobepass.py @@ -1362,11 +1362,17 @@ class AdobePassIE(InfoExtractor): if not authn_token: # TODO add support for other TV Providers mso_id = self._downloader.params.get('ap_mso') - if not mso_id: - raise_mvpd_required() - username, password = self._get_login_info('ap_username', 'ap_password', mso_id) - if not username or not password: - raise_mvpd_required() + if mso_id: + username, password = self._get_login_info('ap_username', 'ap_password', mso_id) + if not username or not password: + 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] provider_redirect_page_res = self._download_webpage_handle(