Madeorsk/youtube-dl
1
0
Fork 0
mirror of https://codeberg.org/polarisfm/youtube-dl synced 2024-11-22 08:34:32 +01:00
Code Issues Releases Wiki Activity

Complete redirect to Bangumi episode ID.

Browse Source 
Fix bug
This commit is contained in:
lifegpc 2020-08-05 17:35:40 +08:00
parent ca4d8aeab3
commit 6508507725
1 changed files with 16 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
youtube_dl/extractor/bilibili.py
View File

@ -139,8 +139,20 @@ class BiliBiliIE(InfoExtractor):
if video_info is not None: if video_info is not None:
video_info = json.loads(video_info.groups()[0]) video_info = json.loads(video_info.groups()[0])
else: else:
self._report_error("") # TODO Should redirect to Bangumi episode ID. if mobj.group('id') is not None:
# https://api.bilibili.com/x/web-interface/view/detail?bvid=&aid=&jsonp=jsonp have redirect links. uri = "https://api.bilibili.com/x/web-interface/view/detail?bvid=BV%s&aid=&jsonp=jsonp" % (video_id)
else:
uri = "https://api.bilibili.com/x/web-interface/view/detail?bvid=&aid=%s&jsonp=jsonp" % (video_id)
redriect_info = self._download_json(
uri, video_id,
"Geting redriect information.", "Unable to get redriect information.")
if redriect_info['code'] != 0:
self._report_error(redriect_info)
redriect_info = redriect_info['data']
if 'View' in redriect_info and 'redirect_url' in redriect_info['View']:
return self.url_result(redriect_info['View']['redirect_url'])
else:
raise ExtractorError("Can not find redirect URL.")
video_data = video_info['videoData'] video_data = video_info['videoData']
uploader_data = video_info['upData'] uploader_data = video_info['upData']
aid = video_data['aid'] aid = video_data['aid']
@ -526,6 +538,8 @@ class BiliBiliBangumiIE(InfoExtractor):
uri = "https://www.bilibili.com/bangumi/play/ep%s" % (epid) uri = "https://www.bilibili.com/bangumi/play/ep%s" % (epid)
if self._epid is None: if self._epid is None:
video_id = "%s %s" % (self._video_id, episode_info['titleFormat']) video_id = "%s %s" % (self._video_id, episode_info['titleFormat'])
else:
video_id = self._video_id
if self._first: if self._first:
webpage = self._webpage webpage = self._webpage
self._first = False self._first = False