mirror/yt-dlp
1
0
Fork 0
mirror of https://github.com/yt-dlp/yt-dlp.git synced 2025-03-09 12:50:23 -05:00
Code Activity

misc

Browse source
This commit is contained in:
grqx_wsl 2024-10-10 21:14:16 +13:00
parent 995fc27931
commit 47254db76d
1 changed files with 42 additions and 51 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

39
yt_dlp/extractor/bilibili.py
View file

@ -68,23 +68,18 @@ def _check_missing_formats(self, play_info, formats):
f'become a premium member to download them. {self._login_hint()}') f'become a premium member to download them. {self._login_hint()}')
def _extract_storyboard(self, duration, aid=None, bvid=None, cid=None): def _extract_storyboard(self, duration, aid=None, bvid=None, cid=None):
video_id = aid or bvid if not (video_id := aid or bvid):
return {}
if storyboard_info := traverse_obj(self._download_json(
'https://api.bilibili.com/x/player/videoshot', video_id,
note='Downloading storyboard info', errnote='Failed to download storyboard info',
query=filter_dict({ query=filter_dict({
'index': 1,
'aid': aid, 'aid': aid,
'bvid': bvid, 'bvid': bvid,
'cid': cid, 'cid': cid,
}) })), ('data', {lambda v: v if v['image'] and v['index'] else None})):
if not aid and not bvid: rows, cols = traverse_obj(storyboard_info, (('img_x_len', 'img_y_len'),))
return {}
idx = 1
while storyboard_info := traverse_obj(self._download_json(
'https://api.bilibili.com/x/player/videoshot', video_id,
'Downloading storyboard info', query={
'index': idx,
**query,
}), 'data'):
if storyboard_info.get('image') and storyboard_info.get('index'):
rows, cols = storyboard_info.get('img_x_len'), storyboard_info.get('img_y_len')
fragments = [] fragments = []
last_duration = 0.0 last_duration = 0.0
for i, url in enumerate(storyboard_info['image'], start=1): for i, url in enumerate(storyboard_info['image'], start=1):
@ -93,17 +88,15 @@ def _extract_storyboard(self, duration, aid=None, bvid=None, cid=None):
current_duration = traverse_obj(storyboard_info, ('index', duration_index)) current_duration = traverse_obj(storyboard_info, ('index', duration_index))
else: else:
current_duration = duration current_duration = duration
if current_duration > last_duration and current_duration <= duration: if not current_duration or current_duration <= last_duration or current_duration > duration:
break
fragments.append({ fragments.append({
'url': sanitize_url(url), 'url': sanitize_url(url),
'duration': current_duration - last_duration, 'duration': current_duration - last_duration,
}) })
last_duration = current_duration
else:
break
if fragments: if fragments:
yield { return {
'format_id': f'sb{idx}', 'format_id': 'sb',
'format_note': 'storyboard', 'format_note': 'storyboard',
'ext': 'mhtml', 'ext': 'mhtml',
'protocol': 'mhtml', 'protocol': 'mhtml',
@ -112,14 +105,12 @@ def _extract_storyboard(self, duration, aid=None, bvid=None, cid=None):
'url': 'about:invalid', 'url': 'about:invalid',
'width': storyboard_info.get('img_x_size'), 'width': storyboard_info.get('img_x_size'),
'height': storyboard_info.get('img_y_size'), 'height': storyboard_info.get('img_y_size'),
'fps': len(storyboard_info['image']) * rows * cols / duration, 'fps': len(storyboard_info['image']) * rows * cols / duration if rows and cols else None,
'rows': rows, 'rows': rows,
'columns': cols, 'columns': cols,
'fragments': fragments, 'fragments': fragments,
} }
else: return {}
return
idx += 1
def extract_formats(self, play_info, aid=None, bvid=None, cid=None): def extract_formats(self, play_info, aid=None, bvid=None, cid=None):
format_names = { format_names = {
@ -183,7 +174,7 @@ def extract_formats(self, play_info, aid=None, bvid=None, cid=None):
}), }),
**parse_resolution(format_names.get(play_info.get('quality'))), **parse_resolution(format_names.get(play_info.get('quality'))),
}) })
formats.extend(self._extract_storyboard( formats.append(self._extract_storyboard(
float_or_none(play_info.get('timelength'), scale=1000), aid=aid, bvid=bvid, cid=cid)) float_or_none(play_info.get('timelength'), scale=1000), aid=aid, bvid=bvid, cid=cid))
return formats return formats