mirror of
https://github.com/yt-dlp/yt-dlp.git
synced 2024-08-27 17:52:02 +02:00
[yandexmusic] fix track url extraction(closes #20820)
This commit is contained in:
parent
3e7ec5330a
commit
58ef5e7881
@ -69,25 +69,28 @@ class YandexMusicTrackIE(YandexMusicBaseIE):
|
|||||||
'skip': 'Travis CI servers blocked by YandexMusic',
|
'skip': 'Travis CI servers blocked by YandexMusic',
|
||||||
}
|
}
|
||||||
|
|
||||||
def _get_track_url(self, storage_dir, track_id):
|
def _real_extract(self, url):
|
||||||
data = self._download_json(
|
mobj = re.match(self._VALID_URL, url)
|
||||||
'http://music.yandex.ru/api/v1.5/handlers/api-jsonp.jsx?action=getTrackSrc&p=download-info/%s'
|
album_id, track_id = mobj.group('album_id'), mobj.group('id')
|
||||||
% storage_dir,
|
|
||||||
track_id, 'Downloading track location JSON')
|
|
||||||
|
|
||||||
# Each string is now wrapped in a list, this is probably only temporarily thus
|
track = self._download_json(
|
||||||
# supporting both scenarios (see https://github.com/ytdl-org/youtube-dl/issues/10193)
|
'http://music.yandex.ru/handlers/track.jsx?track=%s:%s' % (track_id, album_id),
|
||||||
for k, v in data.items():
|
track_id, 'Downloading track JSON')['track']
|
||||||
if v and isinstance(v, list):
|
track_title = track['title']
|
||||||
data[k] = v[0]
|
|
||||||
|
|
||||||
key = hashlib.md5(('XGRlBW9FXlekgbPrRHuSiA' + data['path'][1:] + data['s']).encode('utf-8')).hexdigest()
|
download_data = self._download_json(
|
||||||
storage = storage_dir.split('.')
|
'https://music.yandex.ru/api/v2.1/handlers/track/%s:%s/web-album_track-track-track-main/download/m' % (track_id, album_id),
|
||||||
|
track_id, 'Downloading track location url JSON',
|
||||||
|
headers={'X-Retpath-Y': url})
|
||||||
|
|
||||||
return ('http://%s/get-mp3/%s/%s?track-id=%s&from=service-10-track&similarities-experiment=default'
|
fd_data = self._download_json(
|
||||||
% (data['host'], key, data['ts'] + data['path'], storage[1]))
|
download_data['src'], track_id,
|
||||||
|
'Downloading track location JSON',
|
||||||
|
query={'format': 'json'})
|
||||||
|
key = hashlib.md5(('XGRlBW9FXlekgbPrRHuSiA' + fd_data['path'][1:] + fd_data['s']).encode('utf-8')).hexdigest()
|
||||||
|
storage = track['storageDir'].split('.')
|
||||||
|
f_url = 'http://%s/get-mp3/%s/%s?track-id=%s ' % (fd_data['host'], key, fd_data['ts'] + fd_data['path'], storage[1])
|
||||||
|
|
||||||
def _get_track_info(self, track):
|
|
||||||
thumbnail = None
|
thumbnail = None
|
||||||
cover_uri = track.get('albums', [{}])[0].get('coverUri')
|
cover_uri = track.get('albums', [{}])[0].get('coverUri')
|
||||||
if cover_uri:
|
if cover_uri:
|
||||||
@ -95,15 +98,16 @@ def _get_track_info(self, track):
|
|||||||
if not thumbnail.startswith('http'):
|
if not thumbnail.startswith('http'):
|
||||||
thumbnail = 'http://' + thumbnail
|
thumbnail = 'http://' + thumbnail
|
||||||
|
|
||||||
track_title = track['title']
|
|
||||||
track_info = {
|
track_info = {
|
||||||
'id': track['id'],
|
'id': track_id,
|
||||||
'ext': 'mp3',
|
'ext': 'mp3',
|
||||||
'url': self._get_track_url(track['storageDir'], track['id']),
|
'url': f_url,
|
||||||
'filesize': int_or_none(track.get('fileSize')),
|
'filesize': int_or_none(track.get('fileSize')),
|
||||||
'duration': float_or_none(track.get('durationMs'), 1000),
|
'duration': float_or_none(track.get('durationMs'), 1000),
|
||||||
'thumbnail': thumbnail,
|
'thumbnail': thumbnail,
|
||||||
'track': track_title,
|
'track': track_title,
|
||||||
|
'acodec': download_data.get('codec'),
|
||||||
|
'abr': int_or_none(download_data.get('bitrate')),
|
||||||
}
|
}
|
||||||
|
|
||||||
def extract_artist(artist_list):
|
def extract_artist(artist_list):
|
||||||
@ -131,18 +135,9 @@ def extract_artist(artist_list):
|
|||||||
})
|
})
|
||||||
else:
|
else:
|
||||||
track_info['title'] = track_title
|
track_info['title'] = track_title
|
||||||
|
|
||||||
return track_info
|
return track_info
|
||||||
|
|
||||||
def _real_extract(self, url):
|
|
||||||
mobj = re.match(self._VALID_URL, url)
|
|
||||||
album_id, track_id = mobj.group('album_id'), mobj.group('id')
|
|
||||||
|
|
||||||
track = self._download_json(
|
|
||||||
'http://music.yandex.ru/handlers/track.jsx?track=%s:%s' % (track_id, album_id),
|
|
||||||
track_id, 'Downloading track JSON')['track']
|
|
||||||
|
|
||||||
return self._get_track_info(track)
|
|
||||||
|
|
||||||
|
|
||||||
class YandexMusicPlaylistBaseIE(YandexMusicBaseIE):
|
class YandexMusicPlaylistBaseIE(YandexMusicBaseIE):
|
||||||
def _build_playlist(self, tracks):
|
def _build_playlist(self, tracks):
|
||||||
|
Loading…
Reference in New Issue
Block a user