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

[qq] fix regression by 4c116c6; add guard for bad json

Browse Source
This commit is contained in:
MaxwellGoblin 2017-09-13 15:00:58 +08:00
parent 2a250cbcb4
commit 51a1a1e318
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -34,6 +34,9 @@ def qq_download_by_vid(vid, title, output_dir='.', merge=True, info_only=False):
part_info = get_content(key_api) part_info = get_content(key_api)
key_json = json.loads(match1(part_info, r'QZOutputJson=(.*)')[:-1]) key_json = json.loads(match1(part_info, r'QZOutputJson=(.*)')[:-1])
if key_json.get('key') is None: if key_json.get('key') is None:
if part == 1:
log.wtf(key_json['msg'])
else:
log.w(key_json['msg']) log.w(key_json['msg'])
break break
vkey = key_json['key'] vkey = key_json['key']
@ -135,7 +138,9 @@ def qq_download(url, output_dir='.', merge=True, info_only=False, **kwargs):
else: else:
content = get_content(url) content = get_content(url)
vid = parse_qs(urlparse(url).query).get('vid') #for links specified vid like http://v.qq.com/cover/p/ps6mnfqyrfo7es3.html?vid=q0181hpdvo5 vid = parse_qs(urlparse(url).query).get('vid') #for links specified vid like http://v.qq.com/cover/p/ps6mnfqyrfo7es3.html?vid=q0181hpdvo5
vid = vid[0] if vid else match1(content, r'v?id"*\s*:\s*"\s*([^"]+)"') #general fallback vid = vid[0] if vid else match1(content, r'vid"*\s*:\s*"\s*([^"]+)"') #general fallback
if vid is None:
vid = match1(content, r'id"*\s*:\s*"(.+?)"')
title = match1(content,r'<a.*?id\s*=\s*"%s".*?title\s*=\s*"(.+?)".*?>'%vid) title = match1(content,r'<a.*?id\s*=\s*"%s".*?title\s*=\s*"(.+?)".*?>'%vid)
title = match1(content, r'title">([^"]+)</p>') if not title else title title = match1(content, r'title">([^"]+)</p>') if not title else title
title = match1(content, r'"title":"([^"]+)"') if not title else title title = match1(content, r'"title":"([^"]+)"') if not title else title