artem/yt-dlp
1
0
Fork 0
mirror of https://github.com/yt-dlp/yt-dlp.git synced 2026-04-16 21:59:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

Move error handling up

Browse Source
This commit is contained in:
grqx_termux 2024-12-02 10:06:41 +13:00
parent 4f28e9a93b
commit 76400685fd
1 changed files with 14 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
yt_dlp/extractor/bilibili.py
View File

@ -641,11 +641,6 @@ class BiliBiliIE(BilibiliBaseIE):
headers['Referer'] = url
initial_state = self._search_json(r'window\.__INITIAL_STATE__\s*=', webpage, 'initial state', video_id)
is_festival = 'videoData' not in initial_state
if is_festival:
video_data = initial_state['videoInfo']
else:
video_data = initial_state['videoData']
if traverse_obj(initial_state, ('error', 'trueCode')) == -403:
self.raise_login_required()
@ -654,6 +649,20 @@ class BiliBiliIE(BilibiliBaseIE):
'This video may be deleted or geo-restricted. '
'You might want to try a VPN or a proxy server (with --proxy)', expected=True)
is_festival = 'videoData' not in initial_state
if is_festival:
video_data = initial_state['videoInfo']
else:
video_data = initial_state['videoData']
if video_data.get('is_upower_exclusive'):
high_level = traverse_obj(initial_state, ('elecFullInfo', 'show_info', 'high_level'))
support_title = traverse_obj(high_level, 'title', default='')
support_subtitle = traverse_obj(high_level, 'sub_title', default='')
raise ExtractorError(
f'This is a supporter-only video: {support_title}，{support_subtitle}. '
f'{self._login_hint()}', expected=True)
video_id, title = video_data['bvid'], video_data.get('title')
# Bilibili anthologies are similar to playlists but all videos share the same video ID as the anthology itself.
@ -688,18 +697,6 @@ class BiliBiliIE(BilibiliBaseIE):
if not play_info:
raise ExtractorError('Failed to extract play info')
if video_data.get('is_upower_exclusive'):
# Supporter-only, also indicated by
# `not traverse_obj(play_info, ('support_formats', ..., 'codecs'))`
# Ref: https://github.com/ytdl-org/youtube-dl/issues/32722#issuecomment-1950045012
high_level = traverse_obj(initial_state, ('elecFullInfo', 'show_info', 'high_level'))
# Should we inline the title and the subtitle?
support_title = traverse_obj(high_level, 'title', default='')
support_subtitle = traverse_obj(high_level, 'sub_title', default='')
raise ExtractorError(
f'This is a supporter-only video: {support_title}，{support_subtitle}. '
f'{self._login_hint()}', expected=True)
festival_info = {}
if is_festival:
festival_info = traverse_obj(initial_state, {