diff options
| author | dirkf <fieldhouse@gmx.net> | 2022-04-15 16:07:09 +0100 |
|---|---|---|
| committer | dirkf <fieldhouse@gmx.net> | 2022-04-15 16:07:09 +0100 |
| commit | a0068bd6bec16008bda7a39caecccbf84881c603 (patch) | |
| tree | 533b355f36f60d7e0856c4f014287b177dd6dfc7 | |
| parent | b764dbe7730bc5b0a4f30f4f89fd85e096d0c4a0 (diff) | |
| download | youtube-dl-a0068bd6bec16008bda7a39caecccbf84881c603.tar.gz youtube-dl-a0068bd6bec16008bda7a39caecccbf84881c603.tar.xz youtube-dl-a0068bd6bec16008bda7a39caecccbf84881c603.zip | |
[Youtube] Fix "n" descrambling for player fae06c11
Resolves #30856.
| -rw-r--r-- | youtube_dl/extractor/youtube.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/youtube_dl/extractor/youtube.py b/youtube_dl/extractor/youtube.py index 41695a561..ff6c7b0f8 100644 --- a/youtube_dl/extractor/youtube.py +++ b/youtube_dl/extractor/youtube.py @@ -1464,15 +1464,15 @@ 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): - target = r'(?P<nfunc>[a-zA-Z0-9$]{3})(?:\[(?P<idx>\d+)\])?' + target = r'(?P<nfunc>[a-zA-Z_$][\w$]*)(?:\[(?P<idx>\d+)\])?' nfunc_and_idx = self._search_regex( - r'\.get\("n"\)\)&&\(b=(%s)\([a-zA-Z0-9]\)' % (target, ), + r'\.get\("n"\)\)&&\(b=(%s)\([\w$]+\)' % (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, + r'var %s\s*=\s*(\[.+?\]);' % (re.escape(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): |