ignore stereo3d videos

[youtube-cgi] / youtube.cgi

diff --git a/youtube.cgi b/youtube.cgi
index 3530fed37524dae22219659f1900143f58005ac5..fef9beb175adf9799c3093d2911aae6feca1ed35 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:
@@ -193,6 +196,8 @@ def get_best_video(player_config):
                mimetype = url_data["type"][0].split(";")[0]
                quality = url_data["quality"][0]
 
+               if url_data.has_key("stereo3d"):
+                       continue
                if quality not in QUALITIES:
                        continue
                if mimetype not in MIMETYPES:
@@ -207,9 +212,13 @@ def get_best_video(player_config):
                video_url = url_data["url"][0]
                if "sig" in url_data:
                        signature = url_data["sig"][0]
-               else:
+               elif "s" in url_data:
                        signature = decode_signature(js_url, url_data["s"][0])
-               video_url = append_to_qs(video_url, {"signature": signature})
+               else:
+                       signature = None
+
+               if signature:
+                       video_url = append_to_qs(video_url, {"signature": signature})
 
                best_url = video_url
                best_quality = quality