refactor to use webplayback api to get the stream url instead of itun…

…es page
glomatico · Aug 30, 2024 · fcbe596 · fcbe596
1 parent acd5fef
commit fcbe596
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 12 deletions.
diff --git a/gamdl/cli.py b/gamdl/cli.py
@@ -609,9 +609,9 @@ def main(
                     itunes_page = itunes_api.get_itunes_page(
                         "music-video", music_video_id_alt
                     )
-                    stream_url_master = downloader_music_video.get_stream_url_master(
-                        itunes_page
-                    )
+                    logger.debug("Getting webplayback")
+                    webplayback = apple_music_api.get_webplayback(track_metadata["id"])
+                    stream_url_master = webplayback["hls-playlist-url"]
                     logger.debug("Getting M3U8 data")
                     m3u8_master_data = downloader_music_video.get_m3u8_master_data(
                         stream_url_master

diff --git a/gamdl/downloader_music_video.py b/gamdl/downloader_music_video.py
@@ -25,17 +25,11 @@ def __init__(
         self.downloader = downloader
         self.codec = codec
 
-    def get_stream_url_master(self, itunes_page: dict) -> str:
-        return itunes_page["offers"][0]["assets"][0]["hlsUrl"]
+    def get_stream_url_master(self, webplayback: dict) -> str:
+        return webplayback["hls-playlist-url"]
 
     def get_m3u8_master_data(self, stream_url_master: str) -> dict:
-        url_parts = urllib.parse.urlparse(stream_url_master)
-        query = urllib.parse.parse_qs(url_parts.query, keep_blank_values=True)
-        query.update({"aec": "HD", "dsid": "1"})
-        stream_url_master_new = url_parts._replace(
-            query=urllib.parse.urlencode(query, doseq=True)
-        ).geturl()
-        return m3u8.load(stream_url_master_new).data
+        return m3u8.load(stream_url_master).data
 
     def get_playlist_video(
         self,