about summary refs log tree commit diff
path: root/youtube_dl/extractor/youtube.py
diff options
context:
space:
mode:
authordirkf <fieldhouse@gmx.net>2022-02-01 14:39:03 +0000
committerGitHub <noreply@github.com>2022-02-01 14:39:03 +0000
commit1e677567cd083d43f55daef0cc74e5fa24575ae3 (patch)
treec722b452dd1b947a95d7cf701e0cc7daabeaca9d /youtube_dl/extractor/youtube.py
parentaf9e72507ea38e5ab3fa2751ed09ec88021260cb (diff)
downloadyoutube-dl-1e677567cd083d43f55daef0cc74e5fa24575ae3.tar.gz
youtube-dl-1e677567cd083d43f55daef0cc74e5fa24575ae3.tar.xz
youtube-dl-1e677567cd083d43f55daef0cc74e5fa24575ae3.zip
[YouTube] Fix n-sig for player e06dea74 (#30582)
From yt-dl commit 48416bc
Diffstat (limited to 'youtube_dl/extractor/youtube.py')
-rw-r--r--youtube_dl/extractor/youtube.py14
1 files changed, 11 insertions, 3 deletions
diff --git a/youtube_dl/extractor/youtube.py b/youtube_dl/extractor/youtube.py
index 63918924d..7943b94f9 100644
--- a/youtube_dl/extractor/youtube.py
+++ b/youtube_dl/extractor/youtube.py
@@ -28,6 +28,7 @@ from ..utils import (
     dict_get,
     float_or_none,
     int_or_none,
+    js_to_json,
     mimetype2ext,
     parse_codecs,
     parse_duration,
@@ -1391,9 +1392,16 @@ class YoutubeIE(YoutubeBaseInfoExtractor):
     # 2. https://code.videolan.org/videolan/vlc/-/blob/4fb284e5af69aa9ac2100ccbdd3b88debec9987f/share/lua/playlist/youtube.lua#L116
     # 3. https://github.com/ytdl-org/youtube-dl/issues/30097#issuecomment-950157377
     def _extract_n_function_name(self, jscode):
-        return self._search_regex(
-            (r'\.get\("n"\)\)&&\(b=(?P<nfunc>[a-zA-Z0-9$]{3})\([a-zA-Z0-9]\)',),
-            jscode, 'Initial JS player n function name', group='nfunc')
+        target = r'(?P<nfunc>[a-zA-Z0-9$]{3})(?:\[(?P<idx>\d+)\])?'
+        nfunc_and_idx = self._search_regex(
+            r'\.get\("n"\)\)&&\(b=(%s)\([a-zA-Z0-9]\)' % (target, ),
+            jscode, 'Initial JS player n function name')
+        nfunc, idx = re.match(target, nfunc_and_idx).group('nfunc', 'idx')
+        if not idx:
+            return nfunc
+        return self._parse_json(self._search_regex(
+            r'var %s\s*=\s*(\[.+?\]);' % (nfunc, ), jscode,
+            'Initial JS player n function list ({nfunc}[{idx}])'.format(**locals())), nfunc, transform_source=js_to_json)[int(idx)]
 
     def _extract_n_function(self, video_id, player_url):
         player_id = self._extract_player_info(player_url)