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

[ap] improve adobe pass names and parse error handling

Browse source
This commit is contained in:
Remita Amine 2016-09-14 18:58:47 +01:00
parent 0002962f3f
commit 797c636bcb
4 changed files with 15 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

9
youtube_dl/extractor/adobepass.py
View file

@ -72,8 +72,8 @@ class AdobePassIE(InfoExtractor):
def raise_mvpd_required():
raise ExtractorError(
'This video is only available for users of participating TV providers. '
'Use --ap-mso-id to specify Adobe Pass Multiple-system operator Identifier '
'and --netrc to provide account credentials.', expected=True)
'Use --ap-mso to specify Adobe Pass Multiple-system operator Identifier '
'and --ap-username and --ap-password or --netrc to provide account credentials.', expected=True)
mvpd_headers = {
'ap_42': 'anonymous',
@ -91,12 +91,9 @@ class AdobePassIE(InfoExtractor):
authn_token = None
if not authn_token:
# TODO add support for other TV Providers
mso_id = self._downloader.params.get('ap_mso_id')
mso_id = self._downloader.params.get('ap_mso')
if not mso_id:
raise_mvpd_required()
if mso_id not in MSO_INFO:
raise ExtractorError(
'Unsupported TV Provider, use --list-ap-mso-ids to get a list of supported TV Providers' % mso_id, expected=True)
username, password = self._get_login_info('ap_username', 'ap_password', mso_id)
if not username or not password:
raise_mvpd_required()