Mirrors
/
yt-dlp
mirror of https://github.com/yt-dlp/yt-dlp.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

make formats extraction non-fatal when geo-blocked or login required

This commit is contained in:
grqx_wsl 2024-11-01 00:00:59 +13:00
parent 0a05711805
commit 8e010ace41
1 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
yt_dlp/extractor/bahamut.py
View File

@ -79,11 +79,13 @@ class BahamutIE(InfoExtractor):
'device': device_id, 'device': device_id,
}, headers=self.geo_verification_headers(), expected_status=400) }, headers=self.geo_verification_headers(), expected_status=400)
formats_fatal = True
if urlh.status == 400: if urlh.status == 400:
# TODO: handle more error codes, search for /case \d+{4}:/g in anime_player.js # TODO: handle more error codes, search for /case \d+{4}:/g in anime_player.js
error_code = traverse_obj(m3u8_info, ('error', 'code')) error_code = traverse_obj(m3u8_info, ('error', 'code'))
if error_code == 1011: if error_code == 1011:
self.raise_geo_restricted() self.raise_geo_restricted(metadata_available=True)
formats_fatal = False
elif error_code == 1007: elif error_code == 1007:
if unsmuggled_data.pop('device_id', None) is not None: if unsmuggled_data.pop('device_id', None) is not None:
return self.url_result( return self.url_result(
@ -91,18 +93,19 @@ class BahamutIE(InfoExtractor):
unsmuggled_data), ie=BahamutIE, video_id=video_id) unsmuggled_data), ie=BahamutIE, video_id=video_id)
raise ExtractorError('Invalid device id!') raise ExtractorError('Invalid device id!')
elif error_code == 1017: elif error_code == 1017:
self.raise_login_required() self.raise_login_required(metadata_available=True)
formats_fatal = False
else:
raise ExtractorError(
traverse_obj(m3u8_info, ('error', 'message')) or 'Failed to download m3u8 URL')
raise ExtractorError(traverse_obj(m3u8_info, ('error', 'message'))
or 'Failed to download m3u8 URL')
src = m3u8_info['src']
return { return {
**metadata, **metadata,
'id': video_id, 'id': video_id,
'formats': self._extract_m3u8_formats(src, video_id, 'mp4', headers={ 'formats': self._extract_m3u8_formats(
'Origin': 'https://ani.gamer.com.tw', m3u8_info.get('src'), video_id, ext='mp4', fatal=formats_fatal, headers={
**self.geo_verification_headers(), 'Origin': 'https://ani.gamer.com.tw',
}), **self.geo_verification_headers(),
}),
'http_headers': {'Origin': 'https://ani.gamer.com.tw'}, 'http_headers': {'Origin': 'https://ani.gamer.com.tw'},
} }