[youtube] Fix chapters extraction (closes #26005)
authorSergey M․ <dstftw@gmail.com>
Mon, 16 Nov 2020 21:28:35 +0000 (04:28 +0700)
committerSergey M․ <dstftw@gmail.com>
Mon, 16 Nov 2020 21:28:35 +0000 (04:28 +0700)
youtube_dl/extractor/youtube.py

index 22af03832b4eb15c1da52bd0b0ac4ff8ef672314..1a395b6e12f0ef64f0b60693502a48bda8519001 100644 (file)
@@ -1465,21 +1465,11 @@ class YoutubeIE(YoutubeBaseInfoExtractor):
     def _extract_chapters_from_json(self, webpage, video_id, duration):
         if not webpage:
             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
         chapters_list = try_get(
-            response,
+            data,
             lambda x: x['playerOverlays']
                        ['playerOverlayRenderer']
                        ['decoratedPlayerBarRenderer']