fixes for youtube changes

[youtube-cgi] / youtube.cgi

diff --git a/youtube.cgi b/youtube.cgi
index 3530fed37524dae22219659f1900143f58005ac5..6a5a92ee2b59f8c061d7ebbf7b658d6c26d59302 100755 (executable)
--- a/youtube.cgi
+++ b/youtube.cgi
@@ -79,6 +79,9 @@ urlopener = urllib2.build_opener(urllib2.HTTPCookieProcessor(cookiejar))
 referrer = ""
 
 def urlopen(url, offset=None):
+       if url.startswith("//"):
+               url = "http:" + url
+
        global referrer
        req = urllib2.Request(url)
        if referrer:
@@ -146,11 +149,11 @@ def get_player_config(doc):
                                        return player_config
 
 def extract_function(output, script, func_name):
-       p1 = script.find("function " + func_name)
+       p1 = script.find("function " + func_name + "(")
        p2 = script.find("}", p1)
        code = script[p1:p2+1]
        output.append(code)
-       deps = re.findall(R"[^\.]\b([a-zA-Z]+)\(", code)
+       deps = re.findall(R"[^\.][= ]([\$0-9a-zA-Z]+)\(", code)
        deps = set(deps)
        deps.remove(func_name)
        for dep in deps: