diff --git a/youtube_dl/extractor/adobepass.py b/youtube_dl/extractor/adobepass.py index 1cf2dcbf3..3062d93dd 100644 --- a/youtube_dl/extractor/adobepass.py +++ b/youtube_dl/extractor/adobepass.py @@ -135,6 +135,9 @@ MSO_INFO = { 'ara010': { 'name': 'ATC Communications' }, + 'auth_atlanticbb_net': { + 'name': 'Atlantic Broadband' + }, 'she030-02': { 'name': 'Ayersville Communications' }, @@ -1491,6 +1494,51 @@ class AdobePassIE(InfoExtractor): }), headers={ 'Content-Type': 'application/x-www-form-urlencoded' }) + elif mso_id == 'auth_atlanticbb_net': + provider_redirect_page, urlh = provider_redirect_page_res + provider_refresh_redirect_url = extract_redirect_url( + provider_redirect_page, url=urlh.geturl()) + provider_refresh_redirect_url = "%s&history=4" % urlh.geturl() + provider_redirect_page_res = self._download_webpage_handle( + provider_refresh_redirect_url, video_id, + 'Downloading Provider Redirect Page (meta refresh)') + provider_redirect_page, urlh = provider_redirect_page_res + provider_refresh_redirect_url = "%s&history=4" % urlh.geturl() + provider_redirect_page_res = self._download_webpage_handle( + provider_refresh_redirect_url, video_id, + 'Downloading Provider Redirect Page (meta refresh 2)') + provider_login_page_res = post_form( + provider_redirect_page_res, self._DOWNLOADING_LOGIN_PAGE) + 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, + }) + mvpd_confirm_page, urlh = mvpd_confirm_page_res + provider_refresh_redirect_url = self._search_regex(r'url=([^"]+)',mvpd_confirm_page,'after login redirect') + provider_redirect_page_res = self._download_webpage_handle( + provider_refresh_redirect_url, video_id, + 'Downloading Provider Redirect Page (meta refresh 3)') + provider_redirect_page, urlh = provider_redirect_page_res + provider_refresh_redirect_url = "%s&history=8" % urlh.geturl() + provider_redirect_page_res = self._download_webpage_handle( + provider_refresh_redirect_url, video_id, + 'Downloading Provider Redirect Page (meta refresh 4)') + provider_redirect_page, urlh = provider_redirect_page_res + provider_redirect_page_res = post_form( + provider_redirect_page_res, 'After login saml post') + provider_redirect_page, urlh = provider_redirect_page_res + provider_refresh_redirect_url = self._search_regex(r'url=([^"]+)',provider_redirect_page,'after login redirect 2') + provider_redirect_page_res = self._download_webpage_handle( + provider_refresh_redirect_url, video_id, + 'Downloading Provider Redirect Page (meta refresh 5)') + provider_redirect_page, urlh = provider_redirect_page_res + provider_refresh_redirect_url = "%s&history=9" % urlh.geturl() + provider_redirect_page_res = self._download_webpage_handle( + provider_refresh_redirect_url, video_id, + 'Downloading Provider Redirect Page (meta refresh 6)') + provider_redirect_page_res = post_form( + provider_redirect_page_res, 'After login saml post 2') + provider_redirect_page, urlh = provider_redirect_page_res else: # Some providers (e.g. DIRECTV NOW) have another meta refresh # based redirect that should be followed. diff --git a/youtube_dl/extractor/bravotv.py b/youtube_dl/extractor/bravotv.py index a25d500e4..05b3fdceb 100644 --- a/youtube_dl/extractor/bravotv.py +++ b/youtube_dl/extractor/bravotv.py @@ -12,49 +12,53 @@ from ..utils import ( class BravoTVIE(AdobePassIE): _VALID_URL = r'https?://(?:www\.)?bravotv\.com/(?:[^/]+/)+(?P[^/?#]+)' _TESTS = [{ - 'url': 'http://www.bravotv.com/last-chance-kitchen/season-5/videos/lck-ep-12-fishy-finale', - 'md5': '9086d0b7ef0ea2aabc4781d75f4e5863', + 'url': 'https://www.bravotv.com/the-real-housewives-of-beverly-hills/season-9/episode-1/videos/lisa-rinna-thinks-denise-richards', + 'md5': 'f8098a7c034fcb1b52ec8b3631803589', 'info_dict': { - 'id': 'zHyk1_HU_mPy', + 'id': 'PPhoit2pxdh0', 'ext': 'mp4', - 'title': 'LCK Ep 12: Fishy Finale', - 'description': 'S13/E12: Two eliminated chefs have just 12 minutes to cook up a delicious fish dish.', + 'title': 'Lisa Rinna Thinks Denise Richards Will Fit in Well With This Group', + 'description': 'Denise goes back a long way with Rinna, and now the other ladies have a chance to meet her.', 'uploader': 'NBCU-BRAV', - 'upload_date': '20160302', - 'timestamp': 1456945320, + 'upload_date': '20190204', + 'timestamp': 1549302120, } }, { 'url': 'http://www.bravotv.com/below-deck/season-3/ep-14-reunion-part-1', 'only_matching': True, + }, { + 'url': 'https://www.bravotv.com/top-chef/season-16/episode-11/videos/lck-ep-12-the-final-knockout', + 'only_matching': True, }] def _real_extract(self, url): display_id = self._match_id(url) webpage = self._download_webpage(url, display_id) settings = self._parse_json(self._search_regex( - r'jQuery\.extend\(Drupal\.settings\s*,\s*({.+?})\);', webpage, 'drupal settings'), + r']+?data-drupal-selector="drupal-settings-json"[^>]*?>({.+?})', webpage, 'drupal settings'), display_id) info = {} query = { 'mbr': 'true', } - account_pid, release_pid = [None] * 2 - tve = settings.get('sharedTVE') + account_pid, release_pid, release_pid2 = [None] * 3 + tve = settings.get('ls_tve') if tve: query['manifest'] = 'm3u' account_pid = 'HNK2IC' release_pid = tve['release_pid'] + release_pid2 = self._search_regex(r']+pdk-player[^>]+data-url="[^\?]+/([^\?/]+)\?', webpage, 'pdk-player') if tve.get('entitlement') == 'auth': - adobe_pass = settings.get('adobePass', {}) + adobe_pass = settings.get('tve_adobe_auth', {}) resource = self._get_mvpd_resource( adobe_pass.get('adobePassResourceId', 'bravo'), - tve['title'], release_pid, tve.get('rating')) + tve['title'], release_pid2 if release_pid2 else release_pid, tve.get('rating')) query['auth'] = self._extract_mvpd_auth( - url, release_pid, adobe_pass.get('adobePassRequestorId', 'bravo'), resource) + url, release_pid2 if release_pid2 else release_pid, adobe_pass.get('adobePassRequestorId', 'bravo'), resource) else: - shared_playlist = settings['shared_playlist'] - account_pid = shared_playlist['account_pid'] - metadata = shared_playlist['video_metadata'][shared_playlist['default_clip']] + ls_playlist = settings['ls_playlist'] + account_pid = ls_playlist['account_pid'] + metadata = ls_playlist['video_metadata'][ls_playlist['default_clip']] release_pid = metadata['release_pid'] info.update({ 'title': metadata['title'], @@ -65,10 +69,12 @@ class BravoTVIE(AdobePassIE): query['switch'] = 'progressive' info.update({ '_type': 'url_transparent', - 'id': release_pid, + 'id': release_pid2 if release_pid2 else release_pid, 'url': smuggle_url(update_url_query( + 'http://link.theplatform.com/s/%s/media/%s' % (account_pid, release_pid2), + query), {'force_smil_url': True}) if release_pid2 else smuggle_url(update_url_query( 'http://link.theplatform.com/s/%s/%s' % (account_pid, release_pid), - query), {'force_smil_url': True}), + query), {'force_smil_url': True}) if release_pid else ls_playlist['player_base_url'], 'ie_key': 'ThePlatform', }) return info