From: James Bunton Date: Thu, 15 Dec 2016 19:39:01 +0000 (+1100) Subject: Fix to handle function call in expression instead of statement X-Git-Url: https://code.delx.au/youtube-cgi/commitdiff_plain/355b35ee4520e5c0f84edb6cbc54c5d80bd9143b Fix to handle function call in expression instead of statement --- diff --git a/youtube.cgi b/youtube.cgi index 2ad3b70..338fac5 100755 --- a/youtube.cgi +++ b/youtube.cgi @@ -142,7 +142,8 @@ def extract_js(script): def find_func_name(script): FUNC_NAME = R"([a-zA-Z0-9$]+)" FUNC_PARAMS = R"(\([a-zA-Z]+\.s\))" - PATTERN = FUNC_NAME + FUNC_PARAMS + ";" + TERMINATOR = R"[,;]" + PATTERN = FUNC_NAME + FUNC_PARAMS + TERMINATOR match = re.search(PATTERN, script) func_name = match.groups()[0]