support new JS variable name

[youtube-cgi] / youtube.cgi

diff --git a/youtube.cgi b/youtube.cgi
index 5e612d4084dd1f22ccc5d884dffefdd0ef2ec7f5..2d3fcee1dd8be28b663db4baeb27ac59ca1c2cfa 100755 (executable)
--- a/youtube.cgi
+++ b/youtube.cgi
@@ -4,7 +4,6 @@ from __future__ import division
 
 import cookielib
 import cgi
-import itertools
 import json
 from lxml import html
 import os
@@ -134,6 +133,11 @@ def get_player_config(doc):
                                p2 = line.rfind(";")
                                if p1 >= 0 and p2 > 0:
                                        return json.loads(line[p1+1:p2])
+                       if "ytplayer.config =" in line:
+                               p1 = line.find("ytplayer.config =")
+                               p2 = line.rfind(";")
+                               if p1 >= 0 and p2 > 0:
+                                       return json.loads(line[p1+18:p2])
                        if "'PLAYER_CONFIG': " in line:
                                p1 = line.find(":")
                                if p1 >= 0:
@@ -142,25 +146,28 @@ def get_player_config(doc):
                                        return player_config
 
 def get_best_video(player_config):
-       url_data = urlparse.parse_qs(player_config["args"]["url_encoded_fmt_stream_map"])
-       url_data = itertools.izip_longest(
-               url_data["url"],
-               url_data["type"],
-               url_data["quality"],
-               url_data.get("sig", []),
-       )
+       url_data_list = player_config["args"]["url_encoded_fmt_stream_map"].split(",")
+
        best_url = None
        best_quality = None
        best_extension = None
-       for video_url, mimetype, quality, signature in url_data:
-               mimetype = mimetype.split(";")[0]
+       for url_data in url_data_list:
+               url_data = urlparse.parse_qs(url_data)
+               video_url = url_data["url"][0]
+               mimetype = url_data["type"][0].split(";")[0]
+               quality = url_data["quality"][0]
+               signature = url_data["sig"][0]
+
+               if quality not in QUALITIES:
+                       continue
                if mimetype not in MIMETYPES:
                        continue
+
                extension = MIMETYPES[mimetype]
-               quality = QUALITIES.get(quality.split(",")[0], -1)
+               quality = QUALITIES.get(quality, -1)
+               video_url = append_to_qs(video_url, {"signature": signature})
+
                if best_quality is None or quality > best_quality:
-                       if signature:
-                               video_url = append_to_qs(video_url, {"signature": signature})
                        best_url = video_url
                        best_quality = quality
                        best_extension = extension
@@ -238,27 +245,32 @@ def pp_size(size):
 
 def copy_with_progress(content_length, infile, outfile):
        def print_status():
+               rate = 0
+               if now != last_ts:
+                       rate = last_bytes_read / (now - last_ts)
                sys.stdout.write("\33[2K\r")
                sys.stdout.write("%s / %s (%s/sec)" % (
                        pp_size(bytes_read),
                        pp_size(content_length),
-                       pp_size(bytes_read / (now - start_ts)),
+                       pp_size(rate),
                ))
                sys.stdout.flush()
 
-       start_ts = time.time()
        last_ts = 0
+       last_bytes_read = 0
        bytes_read = 0
        while True:
                now = time.time()
                if now - last_ts > 0.5:
-                       last_ts = now
                        print_status()
+                       last_ts = now
+                       last_bytes_read = 0
 
                buf = infile.read(32768)
                if not buf:
                        break
                outfile.write(buf)
+               last_bytes_read += len(buf)
                bytes_read += len(buf)
 
        # Newline at the end
@@ -298,7 +310,7 @@ def main():
 
                try:
                        copy_with_progress(content_length, video_data, outfile)
-               except IOError:
+               except IOError, e:
                        print
 
                video_data.close()
@@ -308,7 +320,8 @@ def main():
                        if old_offset == offset:
                                time.sleep(1)
                        print "Restarting download from", pp_size(offset)
-                       continue
+               else:
+                       break
 
        outfile.close()