Update jiosaavn.py

Adjusted white spaces
2024-11-27 01:31:25 +01:00 · 2023-12-25 12:12:42 +05:30 · 2023-12-25 09:13:25 +05:30 · 2023-12-25 09:08:38 +05:30 · 2023-12-25 09:05:24 +05:30 · 2023-12-25 08:48:27 +05:30
1 changed files with 30 additions and 20 deletions
--- a/yt_dlp/extractor/jiosaavn.py
+++ b/yt_dlp/extractor/jiosaavn.py
@ -36,29 +36,39 @@ class JioSaavnSongIE(JioSaavnBaseIE):
    def _real_extract(self, url):
        audio_id = self._match_id(url)
        song_data = self._extract_initial_data(url, audio_id)['song']['song']
-        media_data = self._download_json(
-            'https://www.jiosaavn.com/api.php', audio_id, data=urlencode_postdata({
-                '__call': 'song.generateAuthToken',
-                '_format': 'json',
-                'bitrate': '320',
-                'url': song_data['encrypted_media_url'],
-            }))
-
-        return {
-            'id': audio_id,
-            'url': media_data['auth_url'],
-            'ext': media_data.get('type'),
-            'vcodec': 'none',
-            **traverse_obj(song_data, {
-                'title': ('title', 'text'),
-                'album': ('album', 'text'),
-                'thumbnail': ('image', 0, {url_or_none}),
-            }),
-        }
+        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(
+                'https://www.jiosaavn.com/api.php', audio_id, f'Downloading format info for {bitrate}',
+                fatal=False, data=urlencode_postdata({
+                    '__call': 'song.generateAuthToken',
+                    '_format': 'json',
+                    'bitrate': bitrate,
+                    'url': song_data['encrypted_media_url'],
+                }))
+            if not media_data.get('auth_url'):
+                self.report_warning(f'Unable to extract format info for {bitrate}')
+                continue
+            formats.append({
+                'url': media_data['auth_url'],
+                'ext': media_data.get('type'),
+                'id': bitrate,
+                'format_id': bitrate,
+                'abr': int(bitrate),
+                'vcodec': 'none',
+                'acodec': media_data.get('type'),
+                **traverse_obj(song_data, {
+                    'title': ('title', 'text'),
+                    'album': ('album', 'text'),
+                    'thumbnail': ('image', 0, {url_or_none}),
+                }),
+            })
+        return self.playlist_result(formats)


 class JioSaavnAlbumIE(JioSaavnBaseIE):
-    _VALID_URL = r'https?://(?:www\.)?(?:jio)?saavn\.com/album/[^/?#]+/(?P<id>[^/?#]+)'
+    _VALID_URL = r'https?://(?:www\.)?(?:jio)?saavn\.com/(?:s/playlist|album)/[^/?#]+/(?P<id>[^/?#]+)'
    _TESTS = [{
        'url': 'https://www.jiosaavn.com/album/96/buIOjYZDrNA_',
        'info_dict': {
Author	SHA1	Message	Date
alien-developers	c9604eb612	Update jiosaavn.py	2023-12-25 12:12:42 +05:30
alien-developers	95eba9eebb	Update jiosaavn.py Adjusted white spaces	2023-12-25 09:13:25 +05:30
alien-developers	73e4497ebe	Update jiosaavn.py	2023-12-25 09:08:38 +05:30
alien-developers	dc7c9a615e	Update jiosaavn.py	2023-12-25 09:05:24 +05:30
alien-developers	2fde65749b	Update jiosaavn.py updated jiosaavn to get all formats. Please follow the below instructions to download the songs in certain format. # available bitrates are 16, 32, 64, 128, 320 --match-filter "abr = bitrate" Eg: --match-filter "abr = 128" Also, you can use below output format to create folder for each album. Windows: -o %(album)s/%(title)s.%(ext)s	2023-12-25 08:48:27 +05:30