projects
/
youtube-dl
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge pull request #7320 from remitamine/adobetv
[youtube-dl]
/
youtube_dl
/
jsinterp.py
diff --git
a/youtube_dl/jsinterp.py
b/youtube_dl/jsinterp.py
index 0e0c7d90d5aa2fbb8039dddf642ac4692f2974a7..2191e8b8956563830245b574702dc68e6a3b8dbd 100644
(file)
--- a/
youtube_dl/jsinterp.py
+++ b/
youtube_dl/jsinterp.py
@@
-214,7
+214,7
@@
class JSInterpreter(object):
obj = {}
obj_m = re.search(
(r'(?:var\s+)?%s\s*=\s*\{' % re.escape(objname)) +
obj = {}
obj_m = re.search(
(r'(?:var\s+)?%s\s*=\s*\{' % re.escape(objname)) +
- r'\s*(?P<fields>([a-zA-Z$0-9]+\s*:\s*function\(.*?\)\s*\{.*?\})*)' +
+ r'\s*(?P<fields>([a-zA-Z$0-9]+\s*:\s*function\(.*?\)\s*\{.*?\}
(?:,\s*)?
)*)' +
r'\}\s*;',
self.code)
fields = obj_m.group('fields')
r'\}\s*;',
self.code)
fields = obj_m.group('fields')
@@
-232,10
+232,10
@@
class JSInterpreter(object):
def extract_function(self, funcname):
func_m = re.search(
r'''(?x)
def extract_function(self, funcname):
func_m = re.search(
r'''(?x)
- (?:function\s+%s|[{;]%s\s*=\s*function)\s*
+ (?:function\s+%s|[{;]%s\s*=\s*function
|var\s+%s\s*=\s*function
)\s*
\((?P<args>[^)]*)\)\s*
\{(?P<code>[^}]+)\}''' % (
\((?P<args>[^)]*)\)\s*
\{(?P<code>[^}]+)\}''' % (
- re.escape(funcname), re.escape(funcname)),
+ re.escape(funcname), re.escape(funcname)
, re.escape(funcname)
),
self.code)
if func_m is None:
raise ExtractorError('Could not find JS function %r' % funcname)
self.code)
if func_m is None:
raise ExtractorError('Could not find JS function %r' % funcname)