mirrors/yt-dlp
1
0
Fork 0
mirror of https://github.com/yt-dlp/yt-dlp.git synced 2025-06-27 08:58:30 +00:00
Code Issues Projects Releases Wiki Activity

fix: better unavailability check (2)

Browse Source
This commit is contained in:
DarkCat09 2025-04-07 16:20:43 +04:00
parent bcfdd8e987
commit 7df0391049
No known key found for this signature in database
1 changed files with 19 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
yt_dlp/extractor/vk.py
View File

@ -832,19 +832,20 @@ def _parse_track_meta(self, meta, track_id=None):
} }
def _raise_if_blocked(self, meta, track_id): def _raise_if_blocked(self, meta, track_id):
if len(meta) < 12:
return None
reason = traverse_obj( reason = traverse_obj(
self._parse_json( self._parse_json(meta[12], track_id, fatal=False),
meta[12] if len(meta) >= 12 else None,
track_id, fatal=False),
('claim', 'reason')) ('claim', 'reason'))
if reason == 'geo': if reason is not None:
self.raise_geo_restricted() if reason == 'geo':
# can be an empty string self.raise_geo_restricted()
elif reason is not None:
# an empty string or an internal ID
raise ExtractorError( raise ExtractorError(
'This track is unavailable. ' f'This track is unavailable. Reason code: {reason:r}')
f'Reason code: {reason:r}')
class VKMusicTrackIE(VKMusicBaseIE): class VKMusicTrackIE(VKMusicBaseIE):
@ -986,16 +987,16 @@ def _real_extract(self, url):
access_hash = meta[24] access_hash = meta[24]
meta = self._download_payload('al_audio', track_id, { try:
'act': 'reload_audios', meta = self._download_payload('al_audio', track_id, {
'audio_ids': f'{track_id}_{access_hash}', 'act': 'reload_audios',
})[0] 'audio_ids': f'{track_id}_{access_hash}',
})[0][0]
except (ExtractorError, IndexError):
if vk_id == 0:
self.raise_login_required()
raise ExtractorError('This track is unavailable')
# vk sends an empty list when auth required
if not meta:
self.raise_login_required()
meta = meta[0]
self._raise_if_blocked(meta, track_id) self._raise_if_blocked(meta, track_id)
url = self._unmask_url(meta[2], vk_id) url = self._unmask_url(meta[2], vk_id)