check if playlist has uri in get_playlist_audio_from_user

gamdl/__init__.py

@@ -1 +1 @@
-__version__ = "2.2"
+__version__ = "2.2.1"

gamdl/downloader_music_video.py

@@ -15,7 +15,7 @@ from .models import StreamInfo
 
 
 class DownloaderMusicVideo:
-    MP4_FORMAT_CODECS = ["hvc1", "ec-3"]
+    MP4_FORMAT_CODECS = ["hvc1", "audio-atmos", "audio-ec3"]
 
     def __init__(
         self,
@@ -106,6 +106,7 @@ class DownloaderMusicVideo:
                 value=playlist,
             )
             for playlist in playlists
+            if playlist.get("uri")
         ]
         selected = inquirer.select(
             message="Select which audio codec to download:",
@@ -142,9 +143,7 @@ class DownloaderMusicVideo:
         else:
             playlist = self.get_playlist_audio_from_user(m3u8_master_data["media"])
         stream_info.stream_url = playlist["uri"]
-        stream_info.codec = re.search(r"_([^_]+)\.m3u8", stream_info.stream_url).group(
-            1
-        )
+        stream_info.codec = playlist["group_id"]
         m3u8_data = m3u8.load(stream_info.stream_url).data
         stream_info.pssh = self.get_pssh(m3u8_data)
         return stream_info

gamdl/downloader_song_legacy.py

@@ -54,7 +54,6 @@ class DownloaderSongLegacy(DownloaderSong):
         decrypted_path: Path,
         decryption_key: str,
     ):
-        self.fix_key_id(encrypted_path)
         subprocess.run(
             [
                 self.downloader.mp4decrypt_path_full,