diff options
| author | pukkandan <pukkandan.ytdlp@gmail.com> | 2022-08-30 15:57:17 +0530 |
|---|---|---|
| committer | pukkandan <pukkandan.ytdlp@gmail.com> | 2022-08-30 16:06:40 +0530 |
| commit | c4b2df872d0ab49da939bf8bda001fa4e2d2ea06 (patch) | |
| tree | 9e69eaaa395a8ee459a2a9ed6980fc09db11c353 | |
| parent | 224b5a35f7f17fec5639608d31074b8048369385 (diff) | |
| download | hypervideo-pre-c4b2df872d0ab49da939bf8bda001fa4e2d2ea06.tar.lz hypervideo-pre-c4b2df872d0ab49da939bf8bda001fa4e2d2ea06.tar.xz hypervideo-pre-c4b2df872d0ab49da939bf8bda001fa4e2d2ea06.zip | |
[jsinterp] Fix `_separate`
Ref: https://github.com/yt-dlp/yt-dlp/issues/4635#issuecomment-1231126941
| -rw-r--r-- | test/test_youtube_signature.py | 4 | ||||
| -rw-r--r-- | yt_dlp/extractor/youtube.py | 2 | ||||
| -rw-r--r-- | yt_dlp/jsinterp.py | 4 | ||||
| -rw-r--r-- | yt_dlp/version.py | 2 |
4 files changed, 8 insertions, 4 deletions
diff --git a/test/test_youtube_signature.py b/test/test_youtube_signature.py index 2f124a738..717c94954 100644 --- a/test/test_youtube_signature.py +++ b/test/test_youtube_signature.py @@ -118,6 +118,10 @@ _NSIG_TESTS = [ 'https://www.youtube.com/s/player/dc0c6770/player_ias.vflset/en_US/base.js', '5EHDMgYLV6HPGk_Mu-kk', 'n9lUJLHbxUI0GQ', ), + ( + 'https://www.youtube.com/s/player/113ca41c/player_ias.vflset/en_US/base.js', + 'cgYl-tlYkhjT7A', 'hI7BBr2zUgcmMg', + ), ] diff --git a/yt_dlp/extractor/youtube.py b/yt_dlp/extractor/youtube.py index d66732c2f..b30dadf9f 100644 --- a/yt_dlp/extractor/youtube.py +++ b/yt_dlp/extractor/youtube.py @@ -2670,7 +2670,7 @@ class YoutubeIE(YoutubeBaseInfoExtractor): def _extract_n_function_code(self, video_id, player_url): player_id = self._extract_player_info(player_url) - func_code = self.cache.load('youtube-nsig', player_id, after='2022.08.19') + func_code = self.cache.load('youtube-nsig', player_id, after='2022.08.19.1') jscode = func_code or self._load_player(video_id, player_url) jsi = JSInterpreter(jscode) diff --git a/yt_dlp/jsinterp.py b/yt_dlp/jsinterp.py index 1995e9d0e..cadb013a3 100644 --- a/yt_dlp/jsinterp.py +++ b/yt_dlp/jsinterp.py @@ -226,7 +226,7 @@ class JSInterpreter: @staticmethod def _separate(expr, delim=',', max_split=None): - OP_CHARS = '+-*/%&|^=<>!,;' + OP_CHARS = '+-*/%&|^=<>!,;{}()[]:' if not expr: return counters = {k: 0 for k in _MATCHING_PARENS.values()} @@ -243,7 +243,7 @@ class JSInterpreter: elif in_quote == '/' and char in '[]': in_regex_char_group = char == '[' escaping = not escaping and in_quote and char == '\\' - after_op = not in_quote and char in OP_CHARS or (char == ' ' and after_op) + after_op = not in_quote and char in OP_CHARS or (char.isspace() and after_op) if char != delim[pos] or any(counters.values()) or in_quote: pos = 0 diff --git a/yt_dlp/version.py b/yt_dlp/version.py index 1ded15df4..8bfe0a09b 100644 --- a/yt_dlp/version.py +++ b/yt_dlp/version.py @@ -1,6 +1,6 @@ # Autogenerated by devscripts/update-version.py -__version__ = '2022.08.19.1' +__version__ = '2022.08.19.2' RELEASE_GIT_HEAD = '48c88e088' |