w/youtube-dl
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

[bilibili] Fix extraction (Closes #4660)

Browse source
This commit is contained in:
Sergey M․ 2015-01-08 01:33:22 +06:00
parent c5d666d374
commit 58a84b8cb6
1 changed files with 29 additions and 38 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

67
youtube_dl/extractor/bilibili.py
View file

@ -4,9 +4,7 @@ from __future__ import unicode_literals
import re import re
from .common import InfoExtractor from .common import InfoExtractor
from ..compat import compat_parse_qs
from ..utils import ( from ..utils import (
ExtractorError,
int_or_none, int_or_none,
unified_strdate, unified_strdate,
) )
@ -54,45 +52,38 @@ class BiliBiliIE(InfoExtractor):
thumbnail = self._html_search_meta( thumbnail = self._html_search_meta(
'thumbnailUrl', video_code, 'thumbnail', fatal=False) 'thumbnailUrl', video_code, 'thumbnail', fatal=False)
player_params = compat_parse_qs(self._html_search_regex( cid = self._search_regex(r'cid=(\d+)', webpage, 'cid')
r'<iframe .*?class="player" src="https://secure\.bilibili\.(?:tv|com)/secure,([^"]+)"',
webpage, 'player params'))
if 'cid' in player_params: lq_doc = self._download_xml(
cid = player_params['cid'][0] 'http://interface.bilibili.com/v_cdn_play?appkey=1&cid=%s' % cid,
video_id,
note='Downloading LQ video info'
)
lq_durl = lq_doc.find('./durl')
formats = [{
'format_id': 'lq',
'quality': 1,
'url': lq_durl.find('./url').text,
'filesize': int_or_none(
lq_durl.find('./size'), get_attr='text'),
}]
lq_doc = self._download_xml( hq_doc = self._download_xml(
'http://interface.bilibili.cn/v_cdn_play?cid=%s' % cid, 'http://interface.bilibili.com/playurl?appkey=1&cid=%s' % cid,
video_id, video_id,
note='Downloading LQ video info' note='Downloading HQ video info',
) fatal=False,
lq_durl = lq_doc.find('.//durl') )
formats = [{ if hq_doc is not False:
'format_id': 'lq', hq_durl = hq_doc.find('./durl')
'quality': 1, formats.append({
'url': lq_durl.find('./url').text, 'format_id': 'hq',
'quality': 2,
'ext': 'flv',
'url': hq_durl.find('./url').text,
'filesize': int_or_none( 'filesize': int_or_none(
lq_durl.find('./size'), get_attr='text'), hq_durl.find('./size'), get_attr='text'),
}] })
hq_doc = self._download_xml(
'http://interface.bilibili.cn/playurl?cid=%s' % cid,
video_id,
note='Downloading HQ video info',
fatal=False,
)
if hq_doc is not False:
hq_durl = hq_doc.find('.//durl')
formats.append({
'format_id': 'hq',
'quality': 2,
'ext': 'flv',
'url': hq_durl.find('./url').text,
'filesize': int_or_none(
hq_durl.find('./size'), get_attr='text'),
})
else:
raise ExtractorError('Unsupported player parameters: %r' % (player_params,))
self._sort_formats(formats) self._sort_formats(formats)
return { return {