mirror of
https://github.com/yt-dlp/yt-dlp.git
synced 2025-06-27 08:58:30 +00:00
fix: better unavailability check (2)
This commit is contained in:
parent
bcfdd8e987
commit
7df0391049
@ -832,19 +832,20 @@ def _parse_track_meta(self, meta, track_id=None):
|
||||
}
|
||||
|
||||
def _raise_if_blocked(self, meta, track_id):
|
||||
if len(meta) < 12:
|
||||
return None
|
||||
|
||||
reason = traverse_obj(
|
||||
self._parse_json(
|
||||
meta[12] if len(meta) >= 12 else None,
|
||||
track_id, fatal=False),
|
||||
self._parse_json(meta[12], track_id, fatal=False),
|
||||
('claim', 'reason'))
|
||||
|
||||
if reason is not None:
|
||||
if reason == 'geo':
|
||||
self.raise_geo_restricted()
|
||||
# can be an empty string
|
||||
elif reason is not None:
|
||||
|
||||
# an empty string or an internal ID
|
||||
raise ExtractorError(
|
||||
'This track is unavailable. '
|
||||
f'Reason code: {reason:r}')
|
||||
f'This track is unavailable. Reason code: {reason:r}')
|
||||
|
||||
|
||||
class VKMusicTrackIE(VKMusicBaseIE):
|
||||
@ -986,16 +987,16 @@ def _real_extract(self, url):
|
||||
|
||||
access_hash = meta[24]
|
||||
|
||||
try:
|
||||
meta = self._download_payload('al_audio', track_id, {
|
||||
'act': 'reload_audios',
|
||||
'audio_ids': f'{track_id}_{access_hash}',
|
||||
})[0]
|
||||
|
||||
# vk sends an empty list when auth required
|
||||
if not meta:
|
||||
})[0][0]
|
||||
except (ExtractorError, IndexError):
|
||||
if vk_id == 0:
|
||||
self.raise_login_required()
|
||||
raise ExtractorError('This track is unavailable')
|
||||
|
||||
meta = meta[0]
|
||||
self._raise_if_blocked(meta, track_id)
|
||||
url = self._unmask_url(meta[2], vk_id)
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user