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

[acfun] fix "unexpected keyword argument 'json_output'"

Browse Source
This commit is contained in:
Mort Yao 2015-09-30 22:03:39 +02:00
parent d9f77021b8
commit 5cdbbd9291
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/you_get/extractors/acfun.py
View File

@ -21,7 +21,7 @@ def get_srt_lock_json(id):
url = 'http://comment.acfun.tv/%s_lock.json' % id url = 'http://comment.acfun.tv/%s_lock.json' % id
return get_html(url) return get_html(url)
def acfun_download_by_vid(vid, title=None, output_dir='.', merge=True, info_only=False): def acfun_download_by_vid(vid, title=None, output_dir='.', merge=True, info_only=False, **kwargs):
info = json.loads(get_html('http://www.acfun.tv/video/getVideo.aspx?id=' + vid)) info = json.loads(get_html('http://www.acfun.tv/video/getVideo.aspx?id=' + vid))
sourceType = info['sourceType'] sourceType = info['sourceType']
sourceId = info['sourceId'] sourceId = info['sourceId']
@ -109,7 +109,7 @@ def acfun_download_by_vid(vid, title=None, output_dir='.', merge=True, info_only
#except: #except:
#pass #pass
def acfun_download(url, output_dir = '.', merge = True, info_only = False ,**kwargs): def acfun_download(url, output_dir='.', merge=True, info_only=False, **kwargs):
assert re.match(r'http://[^\.]+.acfun.[^\.]+/\D/\D\D(\d+)', url) assert re.match(r'http://[^\.]+.acfun.[^\.]+/\D/\D\D(\d+)', url)
html = get_html(url) html = get_html(url)