From 09e83daa142ea8db44166ca37252b138cd211acb Mon Sep 17 00:00:00 2001 From: Mort Yao Date: Fri, 28 Sep 2012 03:27:21 +0200 Subject: [PATCH] fix #6: YouTube --- you_get/downloader/youtube.py | 36 +++++++++++++---------------------- 1 file changed, 13 insertions(+), 23 deletions(-) diff --git a/you_get/downloader/youtube.py b/you_get/downloader/youtube.py index 918508c..e1ab7e2 100644 --- a/you_get/downloader/youtube.py +++ b/you_get/downloader/youtube.py @@ -5,19 +5,17 @@ __all__ = ['youtube_download', 'youtube_download_by_id'] from ..common import * def youtube_download_by_id(id, title = None, output_dir = '.', merge = True, info_only = False): - try: - url = parse.parse_qs(parse.unquote(request.urlopen('http://www.youtube.com/get_video_info?&video_id=' + id).read().decode('utf-8')))['url_encoded_fmt_stream_map'][0][4:] - except: - html = request.urlopen('http://www.youtube.com/watch?v=' + id).read().decode('utf-8') - url = parse.parse_qs(parse.unquote(html))['url_encoded_fmt_stream_map'][0][4:] - if not url.startswith('http://'): - codec = r1(r'yt.preload.start\("http:\\/\\/([^\\]+)\\/crossdomain.xml"\)', html) - signature = r1(r'signature=([^\\]+)\\', html) - urls = parse.parse_qs(parse.unquote(html))['url'] - for u in urls: - if u.startswith('http://' + codec): - url = "%s&signature=%s" % (u, signature) - break + html = request.urlopen('http://www.youtube.com/watch?v=' + id).read().decode('utf-8') + + title = r1(r'"title": "([^"]+)"', html) + title = unicodize(title) + title = parse.unquote(title) + title = escape_file_path(title) + + url = r1(r'crossdomain.xml"\);yt.preload.start\("([^"]+)"\)', html) + url = unicodize(url) + url = re.sub(r'\\/', '/', url) + url = re.sub(r'generate_204', 'videoplayback', url) type, ext, size = url_info(url) @@ -28,16 +26,8 @@ def youtube_download_by_id(id, title = None, output_dir = '.', merge = True, inf def youtube_download(url, output_dir = '.', merge = True, info_only = False): id = parse.parse_qs(parse.urlparse(url).query)['v'][0] assert id - try: - title = parse.parse_qs(parse.unquote(request.urlopen('http://www.youtube.com/get_video_info?&video_id=' + id).read().decode('utf-8')))['title'][0] - except: - html = get_html(url, 'utf-8') - title = r1(r'"title": "([^"]+)"', html) - title = unicodize(title) - assert title - title = parse.unquote(title) - title = escape_file_path(title) - youtube_download_by_id(id, title, output_dir, merge = merge, info_only = info_only) + + youtube_download_by_id(id, None, output_dir, merge = merge, info_only = info_only) site_info = "YouTube.com" download = youtube_download -- GitLab