Compare commits

..

No commits in common. "c9604eb61267c98628f094ed5061933bc624adea" and "91ca560381165969194fb04e764782d720816f74" have entirely different histories.

View File

@ -36,39 +36,29 @@ class JioSaavnSongIE(JioSaavnBaseIE):
def _real_extract(self, url): def _real_extract(self, url):
audio_id = self._match_id(url) audio_id = self._match_id(url)
song_data = self._extract_initial_data(url, audio_id)['song']['song'] song_data = self._extract_initial_data(url, audio_id)['song']['song']
formats = []
# available bitrates are 16, 32, 64, 128, 320
for bitrate in self._configuration_arg('bitrate', ['16', '32', '64', '128', '320'], ie_key='JioSaavn'):
media_data = self._download_json( media_data = self._download_json(
'https://www.jiosaavn.com/api.php', audio_id, f'Downloading format info for {bitrate}', 'https://www.jiosaavn.com/api.php', audio_id, data=urlencode_postdata({
fatal=False, data=urlencode_postdata({
'__call': 'song.generateAuthToken', '__call': 'song.generateAuthToken',
'_format': 'json', '_format': 'json',
'bitrate': bitrate, 'bitrate': '320',
'url': song_data['encrypted_media_url'], 'url': song_data['encrypted_media_url'],
})) }))
if not media_data.get('auth_url'):
self.report_warning(f'Unable to extract format info for {bitrate}') return {
continue 'id': audio_id,
formats.append({
'url': media_data['auth_url'], 'url': media_data['auth_url'],
'ext': media_data.get('type'), 'ext': media_data.get('type'),
'id': bitrate,
'format_id': bitrate,
'abr': int(bitrate),
'vcodec': 'none', 'vcodec': 'none',
'acodec': media_data.get('type'),
**traverse_obj(song_data, { **traverse_obj(song_data, {
'title': ('title', 'text'), 'title': ('title', 'text'),
'album': ('album', 'text'), 'album': ('album', 'text'),
'thumbnail': ('image', 0, {url_or_none}), 'thumbnail': ('image', 0, {url_or_none}),
}), }),
}) }
return self.playlist_result(formats)
class JioSaavnAlbumIE(JioSaavnBaseIE): class JioSaavnAlbumIE(JioSaavnBaseIE):
_VALID_URL = r'https?://(?:www\.)?(?:jio)?saavn\.com/(?:s/playlist|album)/[^/?#]+/(?P<id>[^/?#]+)' _VALID_URL = r'https?://(?:www\.)?(?:jio)?saavn\.com/album/[^/?#]+/(?P<id>[^/?#]+)'
_TESTS = [{ _TESTS = [{
'url': 'https://www.jiosaavn.com/album/96/buIOjYZDrNA_', 'url': 'https://www.jiosaavn.com/album/96/buIOjYZDrNA_',
'info_dict': { 'info_dict': {