mirrors/yt-dlp
1
0
Fork 0
mirror of https://github.com/yt-dlp/yt-dlp.git synced 2025-07-18 11:18:30 +00:00
Code Issues Projects Releases Wiki Activity

better err handling

Browse Source
This commit is contained in:
_Grqz 2025-07-15 17:50:52 +12:00
parent 128a73d21b
commit 459ef82857
No known key found for this signature in database
GPG Key ID: 4A31E5120DA20EB2
1 changed files with 17 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
yt_dlp/extractor/bilibili.py
View File

@ -205,7 +205,7 @@ def get_of(scroll_top=10, scroll_left=10):
'dm_img_inter': json.dumps({'ds': [], 'wh': get_wh(*self.__screen_dimensions()), 'of': get_of(random.randint(0, 100), 0)}).replace(' ', ''), 'dm_img_inter': json.dumps({'ds': [], 'wh': get_wh(*self.__screen_dimensions()), 'of': get_of(random.randint(0, 100), 0)}).replace(' ', ''),
} }
def _download_playinfo(self, bvid, cid, headers=None, query=None): def _download_playinfo(self, bvid, cid, headers=None, query=None, fatal=True):
params = {'bvid': bvid, 'cid': cid, 'fnval': 4048, **(query or {})} params = {'bvid': bvid, 'cid': cid, 'fnval': 4048, **(query or {})}
if self.is_logged_in: if self.is_logged_in:
params.pop('try_look', None) params.pop('try_look', None)
@ -214,14 +214,23 @@ def _download_playinfo(self, bvid, cid, headers=None, query=None):
else: else:
note = f'Downloading video formats for cid {cid}' note = f'Downloading video formats for cid {cid}'
playurl_data = self._download_json( playurl_raw = self._download_json(
'https://api.bilibili.com/x/player/wbi/playurl', bvid, 'https://api.bilibili.com/x/player/wbi/playurl', bvid,
query=self._sign_wbi(merge_dicts(params, self._dm_params), bvid), headers=headers, note=note)['data'] query=self._sign_wbi(merge_dicts(params, self._dm_params), bvid), headers=headers, note=note)
if playurl_data.get('v_voucher'): code = -playurl_raw['code']
self.report_warning('Received a captcha from Bilibili while downloading play info') if code == 0:
return None return playurl_raw['data']
else: else:
return playurl_data breakpoint()
err_desc = playurl_raw['message']
msg = f'Unable to download video info({code}: {err_desc})'
expected = code in (401, 352)
if expected:
msg += ', please wait and try later'
if fatal:
raise ExtractorError(msg, expected=expected)
else:
self.report_warning(msg)
def json2srt(self, json_data): def json2srt(self, json_data):
srt_data = '' srt_data = ''
@ -768,7 +777,7 @@ def _real_extract(self, url):
self._search_json(r'window\.__playinfo__\s*=', webpage, 'play info', video_id, default=None), self._search_json(r'window\.__playinfo__\s*=', webpage, 'play info', video_id, default=None),
('data', {dict})) ('data', {dict}))
if not self.is_logged_in or not play_info: if not self.is_logged_in or not play_info:
if dl_play_info := self._download_playinfo(video_id, cid, headers=headers, query={'try_look': 1}): if dl_play_info := self._download_playinfo(video_id, cid, headers=headers, query={'try_look': 1}, fatal=False):
play_info = dl_play_info play_info = dl_play_info
if not play_info: if not play_info:
raise ExtractorError('Unable to download play info') raise ExtractorError('Unable to download play info')