mirror of
https://github.com/soimort/you-get.git
synced 2025-02-03 00:33:58 +03:00
Merge branch 'bug-fix' of https://github.com/radaiming/you-get into radaiming-bug-fix
This commit is contained in:
commit
629f029c64
@ -6,9 +6,9 @@ from ..common import *
|
|||||||
|
|
||||||
def qq_download_by_id(id, title = None, output_dir = '.', merge = True, info_only = False):
|
def qq_download_by_id(id, title = None, output_dir = '.', merge = True, info_only = False):
|
||||||
url = 'http://vsrc.store.qq.com/%s.flv' % id
|
url = 'http://vsrc.store.qq.com/%s.flv' % id
|
||||||
|
|
||||||
_, _, size = url_info(url)
|
_, _, size = url_info(url)
|
||||||
|
|
||||||
print_info(site_info, title, 'flv', size)
|
print_info(site_info, title, 'flv', size)
|
||||||
if not info_only:
|
if not info_only:
|
||||||
download_urls([url], title, 'flv', size, output_dir = output_dir, merge = merge)
|
download_urls([url], title, 'flv', size, output_dir = output_dir, merge = merge)
|
||||||
@ -17,31 +17,39 @@ def qq_download(url, output_dir = '.', merge = True, info_only = False):
|
|||||||
if re.match(r'http://v.qq.com/([^\?]+)\?vid', url):
|
if re.match(r'http://v.qq.com/([^\?]+)\?vid', url):
|
||||||
aid = r1(r'(.*)\.html', url)
|
aid = r1(r'(.*)\.html', url)
|
||||||
vid = r1(r'http://v.qq.com/[^\?]+\?vid=(\w+)', 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):
|
if re.match(r'http://y.qq.com/([^\?]+)\?vid', url):
|
||||||
vid = r1(r'http://y.qq.com/[^\?]+\?vid=(\w+)', url)
|
vid = r1(r'http://y.qq.com/[^\?]+\?vid=(\w+)', url)
|
||||||
|
|
||||||
url = "http://v.qq.com/page/%s.html" % vid
|
url = "http://v.qq.com/page/%s.html" % vid
|
||||||
|
|
||||||
r_url = r1(r'<meta http-equiv="refresh" content="0;url=([^"]*)', get_html(url))
|
r_url = r1(r'<meta http-equiv="refresh" content="0;url=([^"]*)', get_html(url))
|
||||||
if r_url:
|
if r_url:
|
||||||
aid = r1(r'(.*)\.html', r_url)
|
aid = r1(r'(.*)\.html', r_url)
|
||||||
url = "%s/%s.html" % (aid, vid)
|
url = "%s/%s.html" % (aid, vid)
|
||||||
|
|
||||||
if re.match(r'http://static.video.qq.com/.*vid=', url):
|
if re.match(r'http://static.video.qq.com/.*vid=', url):
|
||||||
vid = r1(r'http://static.video.qq.com/.*vid=(\w+)', url)
|
vid = r1(r'http://static.video.qq.com/.*vid=(\w+)', url)
|
||||||
url = "http://v.qq.com/page/%s.html" % vid
|
url = "http://v.qq.com/page/%s.html" % vid
|
||||||
|
|
||||||
|
if re.match(r'http://v.qq.com/cover/.*\.html', url):
|
||||||
|
html = get_html(url)
|
||||||
|
vid = r1(r'vid:"([^"]+)"', html)
|
||||||
|
url = 'http://sns.video.qq.com/tvideo/fcgi-bin/video?vid=%s' % vid
|
||||||
|
|
||||||
html = get_html(url)
|
html = get_html(url)
|
||||||
|
|
||||||
title = r1(r'title:"([^"]+)"', html)
|
title = match1(html, r'<title>(.+?)</title>', r'title:"([^"]+)"')[0].strip()
|
||||||
assert title
|
assert title
|
||||||
title = unescape_html(title)
|
title = unescape_html(title)
|
||||||
title = escape_file_path(title)
|
title = escape_file_path(title)
|
||||||
|
|
||||||
id = r1(r'vid:"([^"]+)"', html)
|
try:
|
||||||
|
id = vid
|
||||||
|
except:
|
||||||
|
id = r1(r'vid:"([^"]+)"', html)
|
||||||
|
|
||||||
qq_download_by_id(id, title, output_dir = output_dir, merge = merge, info_only = info_only)
|
qq_download_by_id(id, title, output_dir = output_dir, merge = merge, info_only = info_only)
|
||||||
|
|
||||||
site_info = "QQ.com"
|
site_info = "QQ.com"
|
||||||
|
Loading…
Reference in New Issue
Block a user