Merge branch 'bilibili' of https://github.com/PeterDing/youtube-dl into PeterDing-bilibili

This commit is contained in:
Yen Chi Hsuan 2016-09-05 13:47:24 +08:00
commit 95843da529
No known key found for this signature in database
GPG Key ID: 3FDDD575826C5C30

View File

@ -12,9 +12,13 @@
unified_timestamp, unified_timestamp,
) )
HEADERS = {
'Content-Type': 'application/x-www-form-urlencoded; charset=UTF-8',
}
class BiliBiliIE(InfoExtractor): class BiliBiliIE(InfoExtractor):
_VALID_URL = r'https?://www\.bilibili\.(?:tv|com)/video/av(?P<id>\d+)' _VALID_URL = r'https?://(www.|bangumi.|)bilibili\.(?:tv|com)/(video/av|anime/v/)(?P<id>\d+)'
_TESTS = [{ _TESTS = [{
'url': 'http://www.bilibili.tv/video/av1074402/', 'url': 'http://www.bilibili.tv/video/av1074402/',
@ -77,6 +81,17 @@ class BiliBiliIE(InfoExtractor):
'skip_download': True, 'skip_download': True,
}, },
'expected_warnings': ['upload time'], 'expected_warnings': ['upload time'],
}, {
'url': 'http://bangumi.bilibili.com/anime/v/40068',
'md5': '08d539a0884f3deb7b698fb13ba69696',
'info_dict': {
'id': '40068',
'ext': 'mp4',
'duration': 1402.357,
'title': '混沌武士 : 第7集 四面楚歌 A Risky Racket',
'description': "故事发生在日本的江户时代。风是一个小酒馆的打工女。一日酒馆里来了一群恶霸虽然他们的举动令风十分不满但是毕竟风只是一届女流无法对他们采取什么行动只能在心里嘟哝。这时酒家里又进来了个“不良份子”无幻说以50个丸子帮她搞定这群人风觉得他莫名其妙也就没多搭理他。而在这时风因为一个意外而将茶水泼在了恶霸头领——龙次郎身上。愤怒的恶霸们欲将风的手指砍掉风在无奈中大喊道“丸子100个”……   另一方面,龙次郎的父亲也就是当地的代官,依仗自己有着雄厚的保镖实力,在当地欺压穷人,当看到一穷人无法交齐足够的钱过桥时,欲下令将其杀死,武士仁看不惯这一幕,于是走上前,与代官的保镖交手了……   酒馆内因为风答应给无幻100个团子无幻将恶霸们打败了就在这时仁进来了。好战的无幻立刻向仁发了战书最后两败俱伤被代官抓入牢房预计第二天斩首……   得知该状况的风,为报救命之恩,来到了刑场,利用烟花救出了无幻和仁。而风则以救命恩人的身份,命令二人和她一起去寻找带着向日葵香味的武士……(by百科)",
'thumbnail': 're:^http?://.+\.jpg',
},
}] }]
_APP_KEY = '6f90a59ac58a4123' _APP_KEY = '6f90a59ac58a4123'
@ -84,13 +99,20 @@ class BiliBiliIE(InfoExtractor):
def _real_extract(self, url): def _real_extract(self, url):
video_id = self._match_id(url) video_id = self._match_id(url)
webpage = self._download_webpage(url, video_id) webpage = self._download_webpage(url, video_id)
cid = compat_parse_qs(self._search_regex( _is_episode = 'anime/v' in url
[r'EmbedPlayer\([^)]+,\s*"([^"]+)"\)', if not _is_episode:
r'<iframe[^>]+src="https://secure\.bilibili\.com/secure,([^"]+)"'], cid = compat_parse_qs(self._search_regex(
webpage, 'player parameters'))['cid'][0] [r'EmbedPlayer\([^)]+,\s*"([^"]+)"\)',
r'<iframe[^>]+src="https://secure\.bilibili\.com/secure,([^"]+)"'],
webpage, 'player parameters'))['cid'][0]
else:
url_t = 'http://bangumi.bilibili.com/web_api/get_source'
js = self._download_json(url_t, video_id,
data='episode_id=%s' % video_id,
headers=HEADERS)
cid = js['result']['cid']
payload = 'appkey=%s&cid=%s&otype=json&quality=2&type=mp4' % (self._APP_KEY, cid) payload = 'appkey=%s&cid=%s&otype=json&quality=2&type=mp4' % (self._APP_KEY, cid)
sign = hashlib.md5((payload + self._BILIBILI_KEY).encode('utf-8')).hexdigest() sign = hashlib.md5((payload + self._BILIBILI_KEY).encode('utf-8')).hexdigest()
@ -125,6 +147,10 @@ def _real_extract(self, url):
description = self._html_search_meta('description', webpage) description = self._html_search_meta('description', webpage)
timestamp = unified_timestamp(self._html_search_regex( timestamp = unified_timestamp(self._html_search_regex(
r'<time[^>]+datetime="([^"]+)"', webpage, 'upload time', fatal=False)) r'<time[^>]+datetime="([^"]+)"', webpage, 'upload time', fatal=False))
if _is_episode:
thumbnail = self._html_search_meta('og:image', webpage)
else:
thumbnail = self._html_search_meta('thumbnailUrl', webpage)
# TODO 'view_count' requires deobfuscating Javascript # TODO 'view_count' requires deobfuscating Javascript
info = { info = {
@ -132,7 +158,7 @@ def _real_extract(self, url):
'title': title, 'title': title,
'description': description, 'description': description,
'timestamp': timestamp, 'timestamp': timestamp,
'thumbnail': self._html_search_meta('thumbnailUrl', webpage), 'thumbnail': thumbnail,
'duration': float_or_none(video_info.get('timelength'), scale=1000), 'duration': float_or_none(video_info.get('timelength'), scale=1000),
} }