Akkariin/youtube-dl
1
0
Fork 0
mirror of https://github.com/l1ving/youtube-dl synced 2025-02-09 11:03:16 +08:00
Code Issues Releases Wiki Activity

[adobepass] support both of DIRECTV NOW's login schemes at the same time

Browse Source
This commit is contained in:
Niklas 2018-10-06 19:40:45 +02:00
parent 0a7a52560a
commit 8625f1c68b
No known key found for this signature in database
GPG Key ID: C7070AE8E74845B8
1 changed files with 19 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
youtube_dl/extractor/adobepass.py
View File

@ -27,8 +27,8 @@ MSO_INFO = {
}, },
'ATTOTT': { 'ATTOTT': {
'name': 'DIRECTV NOW', 'name': 'DIRECTV NOW',
'username_field': 'userid', 'username_field': 'email',
'password_field': 'password', 'password_field': 'loginpassword',
}, },
'Rogers': { 'Rogers': {
'name': 'Rogers', 'name': 'Rogers',
@ -1355,15 +1355,17 @@ class AdobePassIE(InfoExtractor):
token_expires = unified_timestamp(re.sub(r'[_ ]GMT', '', xml_text(token, date_ele))) token_expires = unified_timestamp(re.sub(r'[_ ]GMT', '', xml_text(token, date_ele)))
return token_expires and token_expires <= int(time.time()) return token_expires and token_expires <= int(time.time())
def post_form(form_page_res, note, data={}): def post_form(form_page_res, note, data={}, fatal=True):
form_page, urlh = form_page_res form_page, urlh = form_page_res
post_url = self._html_search_regex(r'<form[^>]+action=(["\'])(?P<url>.+?)\1', form_page, 'post url', group='url') post_url = self._html_search_regex(r'<form[^>]+action=(["\'])(?P<url>.+?)\1', form_page, 'post url', group='url', fatal=fatal)
if not post_url:
return None
if not re.match(r'https?://', post_url): if not re.match(r'https?://', post_url):
post_url = compat_urlparse.urljoin(urlh.geturl(), post_url) post_url = compat_urlparse.urljoin(urlh.geturl(), post_url)
form_data = self._hidden_inputs(form_page) form_data = self._hidden_inputs(form_page)
form_data.update(data) form_data.update(data)
return self._download_webpage_handle( return self._download_webpage_handle(
post_url, video_id, note, data=urlencode_postdata(form_data), headers={ post_url, video_id, note, data=urlencode_postdata(form_data), fatal=fatal, headers={
'Content-Type': 'application/x-www-form-urlencoded', 'Content-Type': 'application/x-www-form-urlencoded',
}) })
@ -1504,9 +1506,13 @@ class AdobePassIE(InfoExtractor):
provider_login_page_res = post_form( provider_login_page_res = post_form(
provider_redirect_page_res, self._DOWNLOADING_LOGIN_PAGE) provider_redirect_page_res, self._DOWNLOADING_LOGIN_PAGE)
# The DIRECTV NOW login is usually JavaScript-based, but the mvpd_confirm_page_res = post_form(provider_login_page_res, 'Logging in', {
# needed form data can be extracted from a script block. mso_info.get('username_field', 'username'): username,
if mso_id == 'ATTOTT': mso_info.get('password_field', 'password'): password,
}, fatal=mso_id != 'ATTOTT')
# Sometimes, DIRECTV NOW uses a JavaScript-based login.
if mso_id == 'ATTOTT' and not mvpd_confirm_page_res:
provider_login_page, urlh = provider_login_page_res provider_login_page, urlh = provider_login_page_res
login_widget_data_json = self._html_search_regex( login_widget_data_json = self._html_search_regex(
r'var LoginWidgetAdditionalAttr = (.*)//-->', r'var LoginWidgetAdditionalAttr = (.*)//-->',
@ -1522,8 +1528,8 @@ class AdobePassIE(InfoExtractor):
form_data = login_widget_data['formSubmitParams'] form_data = login_widget_data['formSubmitParams']
form_data.update({ form_data.update({
mso_info.get('username_field', 'username'): username, 'userid': username,
mso_info.get('password_field', 'password'): password, 'password': password,
'remember_me': 'Y', 'remember_me': 'Y',
}) })
@ -1531,17 +1537,13 @@ class AdobePassIE(InfoExtractor):
post_url, video_id, 'Logging in', data=urlencode_postdata(form_data), headers={ post_url, video_id, 'Logging in', data=urlencode_postdata(form_data), headers={
'Content-Type': 'application/x-www-form-urlencoded', 'Content-Type': 'application/x-www-form-urlencoded',
}) })
else:
mvpd_confirm_page_res = post_form(provider_login_page_res, 'Logging in', {
mso_info.get('username_field', 'username'): username,
mso_info.get('password_field', 'password'): password,
})
if mso_id != 'Rogers': if mso_id != 'Rogers':
mvpd_continue_page_res = post_form(mvpd_confirm_page_res, 'Confirming Login') mvpd_continue_page_res = post_form(mvpd_confirm_page_res, 'Confirming Login')
# DIRECTV NOW requires another form based redirect to be followed. # DIRECTV NOW requires another form-based redirect to be
if mso_id == 'ATTOTT': # followed if the JavaScript-based login was required.
if mso_id == 'ATTOTT' and not mvpd_confirm_page_res:
post_form(mvpd_continue_page_res, 'Continuing login') post_form(mvpd_continue_page_res, 'Continuing login')
session = self._download_webpage( session = self._download_webpage(