Akkariin/youtube-dl
1
0
Fork 0
mirror of https://github.com/l1ving/youtube-dl synced 2025-03-09 21:47:17 +08:00
Code Issues Releases Wiki Activity

[bilibili] Follow youtube-dl coding conventions

Browse Source
This commit is contained in:
snylonue 2020-03-11 15:27:09 +08:00
parent dccbdb63a6
commit e59daf797c
1 changed files with 16 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
youtube_dl/extractor/bilibili.py
View File

@ -20,6 +20,7 @@ from ..utils import (
unified_timestamp, unified_timestamp,
unsmuggle_url, unsmuggle_url,
urlencode_postdata, urlencode_postdata,
try_get,
) )
md5 = lambda s: hashlib.md5(s.encode('utf-8')).hexdigest() md5 = lambda s: hashlib.md5(s.encode('utf-8')).hexdigest()
@ -425,7 +426,7 @@ class BilibiliAudioAlbumIE(BilibiliAudioBaseIE):
class BilibiliNewBangumiIE(InfoExtractor): class BilibiliNewBangumiIE(InfoExtractor):
_VALID_URL = r'(https?://www\.)?bilibili\.com/bangumi/play/ep(?P<id>\d+)' _VALID_URL = r'(?:https?://www\.)?bilibili\.com/bangumi/play/ep(?P<id>\d+)'
_TESTS = [{ _TESTS = [{
'url': 'https://www.bilibili.com/bangumi/play/ep307448', 'url': 'https://www.bilibili.com/bangumi/play/ep307448',
'md5': '084ae96f913cf13ab626326d86190ddf', 'md5': '084ae96f913cf13ab626326d86190ddf',
@ -444,21 +445,21 @@ class BilibiliNewBangumiIE(InfoExtractor):
def _real_extract(self, url): def _real_extract(self, url):
url, _ = unsmuggle_url(url) url, _ = unsmuggle_url(url)
match_url = re.match(self._VALID_URL, url) video_id = self._search_regex(self._VALID_URL, url, 'video_id', group='id')
video_id = match_url.group('id')
webpage = self._download_webpage(url, video_id) webpage = self._download_webpage(url, video_id)
jsondata = re.search(r'window.__INITIAL_STATE__=(.+?);', webpage) # may return None jsondata = self._search_regex(r'window.__INITIAL_STATE__=(.+?);', webpage, 'jsondata', group=1)
bgmdata = self._parse_json(jsondata.group(1), video_id) # may throw exception bgmdata = self._parse_json(jsondata, video_id) # may throw exception
try: try:
cid = bgmdata['epInfo']['cid'] cid = bgmdata['epInfo']['cid']
# aid = bgmdata['epInfo']['aid'] # aid = bgmdata['epInfo']['aid']
title = bgmdata['h1Title']
except KeyError as e: except KeyError as e:
raise ExtractorError(f'{video_id}: Failed to read JSON', cause=e) raise ExtractorError(f'{video_id}: Failed to extract cid', cause=e)
jsondata = re.search(r'"ssType":(\d+)', webpage) # may return None title = bgmdata.get('h1Title') or self._og_search_title(webpage)
season = jsondata.group(1)
season = self._search_regex(r'"ssType":(\d+)', webpage, 'season', group=1)
''' '''
tokens = self._download_json(f'{self._BILIBILI_TOKEN_API}?aid={aid}&cid={cid}', video_id) tokens = self._download_json(f'{self._BILIBILI_TOKEN_API}?aid={aid}&cid={cid}', video_id)
@ -474,19 +475,15 @@ class BilibiliNewBangumiIE(InfoExtractor):
# may throw exception # may throw exception
# urls = self._download_json(f'{self._BILIBILI_API}?{params}&sign={md5(params + self._BILIBILI_KEY)}', video_id) # urls = self._download_json(f'{self._BILIBILI_API}?{params}&sign={md5(params + self._BILIBILI_KEY)}', video_id)
urls = self._download_json('%s?%s&sign=%s' % (self._BILIBILI_API, params, md5(params + self._BILIBILI_KEY)), video_id) urls = self._download_json('%s?%s&sign=%s' % (self._BILIBILI_API, params, md5(params + self._BILIBILI_KEY)), video_id)
try:
# The url can be played in 1080p real_url = try_get(urls, lambda x: x['durl'][0]['url'])
rurl = urls['durl'][0]['url']
ext = urls['format']
size = urls['durl'][0]['size']
except (KeyError, IndexError) as e:
raise ExtractorError(f'{video_id}: Failed to read JSON', cause=e)
return { return {
'title': title, 'title': title,
'id': video_id, 'id': video_id,
'url': rurl, 'url': real_url,
'ext': ext, 'ext': urls.get('format'),
'size': size, 'size': try_get(urls, lambda x: x['durl'][0]['size']),
'http_headers': { 'http_headers': {
'Referer': url, 'Referer': url,
} }