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

[jsinterp] Handling comments - my first try

Browse Source
This commit is contained in:
sulyi 2016-11-21 11:36:38 +01:00
parent cc17865bc4
commit 1736a72438
2 changed files with 18 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
test/test_jsinterp.py
View File

@ -74,7 +74,7 @@ class TestJSInterpreter(unittest.TestCase):
def test_comments(self): def test_comments(self):
'Skipping: Not yet fully implemented' 'Skipping: Not yet fully implemented'
return # return
jsi = JSInterpreter(''' jsi = JSInterpreter('''
function x() { function x() {
var x = /* 1 + */ 2; var x = /* 1 + */ 2;

18
youtube_dl/jsinterp.py
View File

@ -241,7 +241,23 @@ class JSInterpreter(object):
raise ExtractorError('Could not find JS function %r' % funcname) raise ExtractorError('Could not find JS function %r' % funcname)
argnames = func_m.group('args').split(',') argnames = func_m.group('args').split(',')
return self.build_function(argnames, func_m.group('code')) def validate_token(m):
if m.group(0).startswith('/*') and m.group(0).endswith('*/'):
return ''
elif (m.group(0).startswith('"') and m.group(0).endswith('"') or
m.group(0).startswith('\'') and m.group(0).endswith('\'')):
return m.group(0)
else:
# This shouldn't happen
return m.group(0)
# no comment
code = re.sub(r'''(?sx)
"(?:[^"\\]*(?:\\\\|\\['"nurtbfx/\n]))*[^"\\]*"|
'(?:[^'\\]*(?:\\\\|\\['"nurtbfx/\n]))*[^'\\]*'|
/\*(?:(?!\*/)(?:\n|.))*\*/''', validate_token, func_m.group('code'))
return self.build_function(argnames, code)
def extract_arguments(self, call): def extract_arguments(self, call):
pattern = re.escape(call) if call.endswith(')') else r'%s\s*\(' % re.escape(call) pattern = re.escape(call) if call.endswith(')') else r'%s\s*\(' % re.escape(call)