PublicMirrors/you-get
1
0
Fork 0
mirror of https://github.com/soimort/you-get.git synced 2025-02-12 04:55:21 +03:00
Code Issues Actions Packages Projects Releases 1 Wiki Activity

Merge branch 'develop' of https://github.com/soimort/you-get into develop

Browse Source
This commit is contained in:
Valdemar Erk 2017-01-10 12:32:08 +01:00
commit 69a54bfd2c
2 changed files with 22 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/you_get/extractors/qq.py
View File

@ -76,6 +76,13 @@ def qq_download(url, output_dir='.', merge=True, info_only=False, **kwargs):
qieDownload(url, output_dir=output_dir, merge=merge, info_only=info_only) qieDownload(url, output_dir=output_dir, merge=merge, info_only=info_only)
return return
if 'mp.weixin.qq.com/s?' in url:
content = get_html(url)
vids = matchall(content, [r'\bvid=(\w+)'])
for vid in vids:
qq_download_by_vid(vid, vid, output_dir, merge, info_only)
return
#do redirect #do redirect
if 'v.qq.com/page' in url: if 'v.qq.com/page' in url:
# for URLs like this: # for URLs like this:
@ -101,8 +108,6 @@ def qq_download(url, output_dir='.', merge=True, info_only=False, **kwargs):
title = match1(content, r'"title":"([^"]+)"') if not title else title title = match1(content, r'"title":"([^"]+)"') if not title else title
title = vid if not title else title #general fallback title = vid if not title else title #general fallback
qq_download_by_vid(vid, title, output_dir, merge, info_only) qq_download_by_vid(vid, title, output_dir, merge, info_only)
site_info = "QQ.com" site_info = "QQ.com"

6
src/you_get/extractors/youku.py
View File

@ -143,9 +143,9 @@ class Youku(VideoExtractor):
}) })
else: else:
proxy_handler = request.ProxyHandler({}) proxy_handler = request.ProxyHandler({})
opener = request.build_opener(ssl_context, cookie_handler, proxy_handler) for handler in (ssl_context, cookie_handler, proxy_handler):
opener.addheaders = [('Cookie','__ysuid={}'.format(time.time()))] request._opener.add_handler(handler)
request.install_opener(opener) request._opener.addheaders = [('Cookie','__ysuid={}'.format(time.time()))]
assert self.url or self.vid assert self.url or self.vid