aboutsummaryrefslogtreecommitdiff
path: root/youtube_dl/jsinterp.py
diff options
context:
space:
mode:
authordirkf <fieldhouse@gmx.net>2023-06-18 00:52:18 +0100
committerdirkf <fieldhouse@gmx.net>2023-06-18 00:52:18 +0100
commit07af47960f3bb262ead02490ce65c8c45c01741e (patch)
tree4ffa97b814c1909b4e36fb5ba959a385eb5c80e9 /youtube_dl/jsinterp.py
parentae8ba2c31977b68b75221f80c488c0b12385269c (diff)
downloadyoutube-dl-07af47960f3bb262ead02490ce65c8c45c01741e.tar.xz
[YouTube] Improve fix for ae8ba2c
Thx: https://github.com/yt-dlp/yt-dlp/commit/01aba25
Diffstat (limited to 'youtube_dl/jsinterp.py')
-rw-r--r--youtube_dl/jsinterp.py21
1 files changed, 12 insertions, 9 deletions
diff --git a/youtube_dl/jsinterp.py b/youtube_dl/jsinterp.py
index 00f219440..1ba9c3d67 100644
--- a/youtube_dl/jsinterp.py
+++ b/youtube_dl/jsinterp.py
@@ -940,15 +940,18 @@ class JSInterpreter(object):
def extract_object(self, objname):
_FUNC_NAME_RE = r'''(?:[a-zA-Z$0-9]+|"[a-zA-Z$0-9]+"|'[a-zA-Z$0-9]+')'''
obj = {}
- obj_m = re.search(
- r'''(?xs)
- (?:{0}\s*\.\s*{1}|{1}\s*=\s*\{{\s*
- (?P<fields>({2}\s*:\s*function\s*\(.*?\)\s*\{{.*?}}(?:,\s*)?)*)
- }}\s*);
- '''.format(_NAME_RE, re.escape(objname), _FUNC_NAME_RE),
- self.code)
- fields = obj_m and obj_m.group('fields')
- if fields is None:
+ fields = None
+ for obj_m in re.finditer(
+ r'''(?xs)
+ {0}\s*\.\s*{1}|{1}\s*=\s*\{{\s*
+ (?P<fields>({2}\s*:\s*function\s*\(.*?\)\s*\{{.*?}}(?:,\s*)?)*)
+ }}\s*;
+ '''.format(_NAME_RE, re.escape(objname), _FUNC_NAME_RE),
+ self.code):
+ fields = obj_m.group('fields')
+ if fields:
+ break
+ else:
raise self.Exception('Could not find object ' + objname)
# Currently, it only supports function definitions
fields_m = re.finditer(