fix 404 of "%s/%s.html" in qq.py

This commit is contained in:
Ming Dai 2013-12-31 21:49:20 +08:00
parent f66af0d56c
commit da72974fa2

View File

@ -17,7 +17,7 @@ def qq_download(url, output_dir = '.', merge = True, info_only = False):
if re.match(r'http://v.qq.com/([^\?]+)\?vid', url):
aid = r1(r'(.*)\.html', url)
vid = r1(r'http://v.qq.com/[^\?]+\?vid=(\w+)', url)
url = "%s/%s.html" % (aid, vid)
url = 'http://sns.video.qq.com/tvideo/fcgi-bin/video?vid=%s' % vid
if re.match(r'http://y.qq.com/([^\?]+)\?vid', url):
vid = r1(r'http://y.qq.com/[^\?]+\?vid=(\w+)', url)
@ -35,12 +35,12 @@ def qq_download(url, output_dir = '.', merge = True, info_only = False):
html = get_html(url)
title = r1(r'title:"([^"]+)"', html)
title = match1(html, r'<title>(.+?)</title>', r'title:"([^"]+)"')[0].strip()
assert title
title = unescape_html(title)
title = escape_file_path(title)
id = r1(r'vid:"([^"]+)"', html)
id = vid
qq_download_by_id(id, title, output_dir = output_dir, merge = merge, info_only = info_only)