Parcourir la source

[youtube] Fix chapters extraction (closes #26005)

Sergey M․ il y a 4 ans
Parent
commit
7d509c613b
1 fichiers modifiés avec 3 ajouts et 13 suppressions
  1. 3 13
      youtube_dl/extractor/youtube.py

+ 3 - 13
youtube_dl/extractor/youtube.py

@@ -1465,21 +1465,11 @@ class YoutubeIE(YoutubeBaseInfoExtractor):
     def _extract_chapters_from_json(self, webpage, video_id, duration):
     def _extract_chapters_from_json(self, webpage, video_id, duration):
         if not webpage:
         if not webpage:
             return
             return
-        player = self._parse_json(
-            self._search_regex(
-                r'RELATED_PLAYER_ARGS["\']\s*:\s*({.+})\s*,?\s*\n', webpage,
-                'player args', default='{}'),
-            video_id, fatal=False)
-        if not player or not isinstance(player, dict):
-            return
-        watch_next_response = player.get('watch_next_response')
-        if not isinstance(watch_next_response, compat_str):
-            return
-        response = self._parse_json(watch_next_response, video_id, fatal=False)
-        if not response or not isinstance(response, dict):
+        data = self._extract_yt_initial_data(video_id, webpage)
+        if not data or not isinstance(data, dict):
             return
             return
         chapters_list = try_get(
         chapters_list = try_get(
-            response,
+            data,
             lambda x: x['playerOverlays']
             lambda x: x['playerOverlays']
                        ['playerOverlayRenderer']
                        ['playerOverlayRenderer']
                        ['decoratedPlayerBarRenderer']
                        ['decoratedPlayerBarRenderer']