R-yan/l1ving_youtube-dl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[youtube]: fix #13123

Browse Source
This commit is contained in:
kobi 2017-05-18 17:40:41 +03:00
parent 650bd94716
commit 15de2c9233
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
youtube_dl/jsinterp.py
View File

@ -123,6 +123,12 @@ class JSInterpreter(object):
m = re.match( m = re.match(
r'(?P<var>%s)\.(?P<member>[^(]+)(?:\(+(?P<args>[^()]*)\))?$' % _NAME_RE, r'(?P<var>%s)\.(?P<member>[^(]+)(?:\(+(?P<args>[^()]*)\))?$' % _NAME_RE,
expr) expr)
if not m:
m = re.match(
r'(?P<var>%s)\[\"(?P<member>[^(]+)\"\](?:\(+(?P<args>[^()]*)\))?$' % _NAME_RE,
expr)
if m: if m:
variable = m.group('var') variable = m.group('var')
member = m.group('member') member = m.group('member')
@ -214,13 +220,13 @@ class JSInterpreter(object):
obj = {} obj = {}
obj_m = re.search( obj_m = re.search(
(r'(?<!this\.)%s\s*=\s*\{' % re.escape(objname)) + (r'(?<!this\.)%s\s*=\s*\{' % re.escape(objname)) +
r'\s*(?P<fields>([a-zA-Z$0-9]+\s*:\s*function\(.*?\)\s*\{.*?\}(?:,\s*)?)*)' + r'\s*(?P<fields>\"?([a-zA-Z$0-9]+\"?\s*:\s*function\(.*?\)\s*\{.*?\}(?:,\s*)?)*)' +
r'\}\s*;', r'\}\s*;',
self.code) self.code)
fields = obj_m.group('fields') fields = obj_m.group('fields')
# Currently, it only supports function definitions # Currently, it only supports function definitions
fields_m = re.finditer( fields_m = re.finditer(
r'(?P<key>[a-zA-Z$0-9]+)\s*:\s*function' r'\"?(?P<key>[a-zA-Z$0-9]+)\"?\s*:\s*function'
r'\((?P<args>[a-z,]+)\){(?P<code>[^}]+)}', r'\((?P<args>[a-z,]+)\){(?P<code>[^}]+)}',
fields) fields)
for f in fields_m: for f in fields_m: