Merge 8e753e9633 into ac817bc83e

yt_dlp/extractor/atresplayer.py

@@ -8,7 +8,7 @@ from ..utils import (
 
 
 class AtresPlayerIE(InfoExtractor):
-    _VALID_URL = r'https?://(?:www\.)?atresplayer\.com/[^/]+/[^/]+/[^/]+/[^/]+/(?P<display_id>.+?)_(?P<id>[0-9a-f]{24})'
+    _VALID_URL = r'https?://(?:www\.)?atresplayer\.com/[^/]+/[^/]+/[^/]+(?:/[^/]+)?/(?P<display_id>.+?)_(?P<id>[0-9a-f]{24})'
     _NETRC_MACHINE = 'atresplayer'
     _TESTS = [
         {
@@ -31,40 +31,46 @@ class AtresPlayerIE(InfoExtractor):
             'only_matching': True,
         },
     ]
-    _API_BASE = 'https://api.atresplayer.com/'
 
     def _handle_error(self, e, code):
         if isinstance(e.cause, HTTPError) and e.cause.status == code:
             error = self._parse_json(e.cause.response.read(), None)
             if error.get('error') == 'required_registered':
                 self.raise_login_required()
+            if error.get('error') == 'invalid_request':
+                raise ExtractorError('Authentication failed', expected=True)
             raise ExtractorError(error['error_description'], expected=True)
         raise
 
     def _perform_login(self, username, password):
-        self._request_webpage(
-            self._API_BASE + 'login', None, 'Downloading login page')
-
         try:
-            target_url = self._download_json(
-                'https://account.atresmedia.com/api/login', None,
+            self._download_webpage(
+                'https://account.atresplayer.com/auth/v1/login', None,
                 'Logging in', headers={
                     'Content-Type': 'application/x-www-form-urlencoded'
                 }, data=urlencode_postdata({
                     'username': username,
                     'password': password,
-                }))['targetUrl']
+                }))
         except ExtractorError as e:
             self._handle_error(e, 400)
 
-        self._request_webpage(target_url, None, 'Following Target URL')
-
     def _real_extract(self, url):
         display_id, video_id = self._match_valid_url(url).groups()
 
+        page = self._download_webpage(url, video_id, 'Downloading video page')
+        preloaded_state_regex = r'window\.__PRELOADED_STATE__\s*=\s*(\{(.*?)\});'
+        preloaded_state_text = self._html_search_regex(preloaded_state_regex, page, 'preloaded state')
+        preloaded_state = self._parse_json(preloaded_state_text, video_id)
+        link_info = next(iter(preloaded_state['links'].values()))
+
+        try:
+            metadata = self._download_json(link_info['href'], video_id)
+        except ExtractorError as e:
+            self._handle_error(e, 403)
+
         try:
-            episode = self._download_json(
-                self._API_BASE + 'client/v1/player/episode/' + video_id, video_id)
+            episode = self._download_json(metadata['urlVideo'], video_id)
         except ExtractorError as e:
             self._handle_error(e, 403)
 
@@ -78,12 +84,16 @@ class AtresPlayerIE(InfoExtractor):
                 continue
             src_type = source.get('type')
             if src_type == 'application/vnd.apple.mpegurl':
-                formats, subtitles = self._extract_m3u8_formats(
+                new_formats, new_subtitles = self._extract_m3u8_formats_and_subtitles(
                     src, video_id, 'mp4', 'm3u8_native',
                     m3u8_id='hls', fatal=False)
             elif src_type == 'application/dash+xml':
-                formats, subtitles = self._extract_mpd_formats(
+                new_formats, new_subtitles = self._extract_mpd_formats_and_subtitles(
                     src, video_id, mpd_id='dash', fatal=False)
+            if new_formats:
+                formats.extend(new_formats)
+            if new_subtitles:
+                subtitles = self._merge_subtitles(subtitles, new_subtitles)
 
         heartbeat = episode.get('heartbeat') or {}
         omniture = episode.get('omniture') or {}