youtube-dl

commit ff29bf81f852941cd7bcef1c051c77eccd4857bc
parent b25f7533975d7463cc772e9d106802ef29252796
Author: Yen Chi Hsuan <yan12125@gmail.com>
Date:   Tue, 10 Nov 2015 12:54:02 +0800

[jsinterp] Support alternative function definition form

Diffstat:
M
test/test_jsinterp.py
 | 
3
+++
M
youtube_dl/jsinterp.py
 | 
4
++--

2 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/test/test_jsinterp.py b/test/test_jsinterp.py
@@ -19,6 +19,9 @@ class TestJSInterpreter(unittest.TestCase):
         jsi = JSInterpreter('function x3(){return 42;}')
         self.assertEqual(jsi.call_function('x3'), 42)
 
+        jsi = JSInterpreter('var x5 = function(){return 42;}')
+        self.assertEqual(jsi.call_function('x5'), 42)
+
     def test_calc(self):
         jsi = JSInterpreter('function x4(a){return 2*a+1;}')
         self.assertEqual(jsi.call_function('x4', 3), 7)
diff --git a/youtube_dl/jsinterp.py b/youtube_dl/jsinterp.py
@@ -232,10 +232,10 @@ class JSInterpreter(object):
     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>[^}]+)\}''' % (
-                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)