R-yan/l1ving_youtube-dl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[acfun] use vid in acfun:video

Browse Source
This commit is contained in:
Dr. PO 2017-08-23 12:55:12 +08:00
parent efaecff5c7
commit 40166318d6
1 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
youtube_dl/extractor/acfun.py
View File

@ -146,21 +146,20 @@ class AcFunVideoIE(_AcFunBaseIE):
api = 'http://player.acfun.cn/flash_data?vid={vid}&ct=85&ev=3&sign={sign}&time={time}' api = 'http://player.acfun.cn/flash_data?vid={vid}&ct=85&ev=3&sign={sign}&time={time}'
flash_data = self._download_json( flash_data = self._download_json(
api.format(vid=vid, sign=sign, time=int(time.time()*1000)), api.format(vid=vid, sign=sign, time=int(time.time()*1000)),
video_id, note='Downloading video flash data: vid=%s' % vid, video_id, note=False, headers={'Referer': ref})
headers={'Referer': ref})
encrypted = base64.b64decode(flash_data['data']) encrypted = base64.b64decode(flash_data['data'])
decrypted = self._yk_t('8bdc7e1a', encrypted) decrypted = self._yk_t('8bdc7e1a', encrypted)
return json.loads(decrypted.decode('utf8')) return json.loads(decrypted.decode('utf8'))
def _acfun_video(self, video, url, title, video_id): def _acfun_video(self, vid, url, title, video_id):
info = self._download_json( info = self._download_json(
'http://www.acfun.cn/video/getVideo.aspx?id={}'.format(video[2:]), 'http://www.acfun.cn/video/getVideo.aspx?id={}'.format(vid),
video_id, note='Downloading video part info') video_id, note='Downloading video part info: id=%s' % vid)
if not info['success']: if not info['success']:
raise ExtractorError(info['result'], expected=True, video_id=video_id) raise ExtractorError(info['result'], expected=True, video_id=video_id)
sourceType = info['sourceType'] sourceType = info['sourceType']
if 'zhuzhan' == sourceType: if 'zhuzhan' == sourceType:
return self._acfun_video_zhuzhan(video, info, url, title, video_id) return self._acfun_video_zhuzhan(vid, info, url, title, video_id)
sourceId = info['sourceId'] sourceId = info['sourceId']
new_url = None new_url = None
if sourceType in ('youku', 'youku2'): if sourceType in ('youku', 'youku2'):
@ -198,7 +197,7 @@ class AcFunVideoIE(_AcFunBaseIE):
} for sidx, stream in enumerate(streams) if idx < segs_len[sidx]] } for sidx, stream in enumerate(streams) if idx < segs_len[sidx]]
seconds = streams[0]['segs'][idx]['seconds'] if same_len else None seconds = streams[0]['segs'][idx]['seconds'] if same_len else None
entries.append({ entries.append({
'id': '%s_seg%d' % (vid, idx), 'id': 'av%s_seg%d' % (vid, idx),
'title': title, 'title': title,
'formats': formats, 'formats': formats,
'duration': float_or_none(seconds), 'duration': float_or_none(seconds),
@ -214,7 +213,7 @@ class AcFunVideoIE(_AcFunBaseIE):
parsed_url = compat_urllib_parse_urlparse(url) parsed_url = compat_urllib_parse_urlparse(url)
query = compat_parse_qs(parsed_url.query) query = compat_parse_qs(parsed_url.query)
title = query['title'][0] if 'title' in query else video_id title = query['title'][0] if 'title' in query else video_id
vid = 'av' + query['vid'][0] vid = query['vid'][0]
return self._acfun_video(vid, url, title, video_id) return self._acfun_video(vid, url, title, video_id)