From: James Bunton <jamesbunton@delx.net.au>
Date: Tue, 4 Feb 2014 20:22:02 +0000 (+1100)
Subject: fixes for youtube changes
X-Git-Url: https://code.delx.au/youtube-cgi/commitdiff_plain/3c8016a90cf19f0a07c56a5bb245906266b299ca

fixes for youtube changes
---

diff --git a/youtube.cgi b/youtube.cgi
index 3530fed..6a5a92e 100755
--- 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: