mirror/yt-dlp
1
0
Fork 0
mirror of https://github.com/yt-dlp/yt-dlp.git synced 2025-05-16 17:05:41 -05:00
Code Activity

[utils] js_to_json: Make function less fatal (#12715)

Browse source 
Authored by: seproDev
This commit is contained in:
sepro 2025-03-24 22:28:47 +01:00 committed by GitHub
parent b7fbb5a0a1
commit 9491b44032
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
test/test_utils.py
View file

@ -1260,6 +1260,7 @@ def test_js_to_json_edgecases(self):
def test_js_to_json_malformed(self): def test_js_to_json_malformed(self):
self.assertEqual(js_to_json('42a1'), '42"a1"') self.assertEqual(js_to_json('42a1'), '42"a1"')
self.assertEqual(js_to_json('42a-1'), '42"a"-1') self.assertEqual(js_to_json('42a-1'), '42"a"-1')
self.assertEqual(js_to_json('{a: `${e("")}`}'), '{"a": "\\"e\\"(\\"\\")"}')
def test_js_to_json_template_literal(self): def test_js_to_json_template_literal(self):
self.assertEqual(js_to_json('`Hello ${name}`', {'name': '"world"'}), '"Hello world"') self.assertEqual(js_to_json('`Hello ${name}`', {'name': '"world"'}), '"Hello world"')

3
yt_dlp/utils/_utils.py
View file

@ -2767,7 +2767,8 @@ def process_escape(match):
def template_substitute(match): def template_substitute(match):
evaluated = js_to_json(match.group(1), vars, strict=strict) evaluated = js_to_json(match.group(1), vars, strict=strict)
if evaluated[0] == '"': if evaluated[0] == '"':
return json.loads(evaluated) with contextlib.suppress(json.JSONDecodeError):
return json.loads(evaluated)
return evaluated return evaluated
def fix_kv(m): def fix_kv(m):