PublicMirrors/you-get
1
0
Fork 0
mirror of https://github.com/soimort/you-get.git synced 2025-02-09 11:42:30 +03:00
Code Issues Actions Packages Projects Releases 1 Wiki Activity

Merge branch 'bug-fix' of https://github.com/radaiming/you-get into radaiming-bug-fix

Browse Source
This commit is contained in:
Mort Yao 2014-01-05 20:27:23 +01:00
commit 629f029c64
1 changed files with 21 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/you_get/extractor/qq.py
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): 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)
@ -33,13 +33,21 @@ def qq_download(url, output_dir = '.', merge = True, info_only = False):
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)
try:
id = vid
except:
id = r1(r'vid:"([^"]+)"', html) 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)