Mirrors
/
yt-dlp
mirror of https://github.com/yt-dlp/yt-dlp.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[jsinterp] Fix `_separate` 

Ref: https://github.com/yt-dlp/yt-dlp/issues/4635#issuecomment-1231126941
This commit is contained in:
pukkandan 2022-08-30 15:57:17 +05:30
parent 224b5a35f7
commit c4b2df872d
No known key found for this signature in database
GPG Key ID: 7EEE9E1E817D0A39
4 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
test/test_youtube_signature.py
View File

@ -118,6 +118,10 @@ _NSIG_TESTS = [
'https://www.youtube.com/s/player/dc0c6770/player_ias.vflset/en_US/base.js', 'https://www.youtube.com/s/player/dc0c6770/player_ias.vflset/en_US/base.js',
'5EHDMgYLV6HPGk_Mu-kk', 'n9lUJLHbxUI0GQ', '5EHDMgYLV6HPGk_Mu-kk', 'n9lUJLHbxUI0GQ',
), ),
(
'https://www.youtube.com/s/player/113ca41c/player_ias.vflset/en_US/base.js',
'cgYl-tlYkhjT7A', 'hI7BBr2zUgcmMg',
),
] ]

2
yt_dlp/extractor/youtube.py
View File

@ -2670,7 +2670,7 @@ class YoutubeIE(YoutubeBaseInfoExtractor):
def _extract_n_function_code(self, video_id, player_url): def _extract_n_function_code(self, video_id, player_url):
player_id = self._extract_player_info(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) jscode = func_code or self._load_player(video_id, player_url)
jsi = JSInterpreter(jscode) jsi = JSInterpreter(jscode)

4
yt_dlp/jsinterp.py
View File

@ -226,7 +226,7 @@ class JSInterpreter:
@staticmethod @staticmethod
def _separate(expr, delim=',', max_split=None): def _separate(expr, delim=',', max_split=None):
OP_CHARS = '+-*/%&|^=<>!,;' OP_CHARS = '+-*/%&|^=<>!,;{}()[]:'
if not expr: if not expr:
return return
counters = {k: 0 for k in _MATCHING_PARENS.values()} counters = {k: 0 for k in _MATCHING_PARENS.values()}
@ -243,7 +243,7 @@ class JSInterpreter:
elif in_quote == '/' and char in '[]': elif in_quote == '/' and char in '[]':
in_regex_char_group = char == '[' in_regex_char_group = char == '['
escaping = not escaping and in_quote and 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: if char != delim[pos] or any(counters.values()) or in_quote:
pos = 0 pos = 0

2
yt_dlp/version.py
View File

@ -1,6 +1,6 @@
# Autogenerated by devscripts/update-version.py # Autogenerated by devscripts/update-version.py
__version__ = '2022.08.19.1' __version__ = '2022.08.19.2'
RELEASE_GIT_HEAD = '48c88e088' RELEASE_GIT_HEAD = '48c88e088'