mirror of https://github.com/yt-dlp/yt-dlp.git
[jsinterp] Fix `_separate`
Ref: https://github.com/yt-dlp/yt-dlp/issues/4635#issuecomment-1231126941
This commit is contained in:
parent
224b5a35f7
commit
c4b2df872d
|
@ -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',
|
||||
),
|
||||
]
|
||||
|
||||
|
||||
|
|
|
@ -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)
|
||||
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
# Autogenerated by devscripts/update-version.py
|
||||
|
||||
__version__ = '2022.08.19.1'
|
||||
__version__ = '2022.08.19.2'
|
||||
|
||||
RELEASE_GIT_HEAD = '48c88e088'
|
||||
|
||||
|
|
Loading…
Reference in New Issue