check for synced_lyrics_only before saving cover

gamdl/__init__.py

@@ -1 +1 @@
-__version__ = "2.3"
+__version__ = "2.3.4"

gamdl/cli.py

@@ -503,6 +503,7 @@ def main(
                     logger.warning(
                         f"({queue_progress}) Track is not downloadable with current configuration, skipping"
                     )
+                    continue
                 elif track_metadata["type"] == "songs":
                     logger.debug("Getting lyrics")
                     lyrics = downloader_song.get_lyrics(track_metadata)
@@ -608,13 +609,24 @@ 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
-                    )
+                    if music_video_id_alt == track_metadata["id"]:
+                        stream_url = (
+                            downloader_music_video.get_stream_url_from_itunes_page(
+                                itunes_page
+                            )
+                        )
+                    else:
+                        logger.debug("Getting webplayback")
+                        webplayback = apple_music_api.get_webplayback(
+                            track_metadata["id"]
+                        )
+                        stream_url = (
+                            downloader_music_video.get_stream_url_from_webplayback(
+                                webplayback
+                            )
+                        )
                     logger.debug("Getting M3U8 data")
-                    m3u8_master_data = downloader_music_video.get_m3u8_master_data(
-                        stream_url_master
-                    )
+                    m3u8_data = downloader_music_video.get_m3u8_master_data(stream_url)
                     tags = downloader_music_video.get_tags(
                         music_video_id_alt,
                         itunes_page,
@@ -642,12 +654,8 @@ def main(
                     else:
                         logger.debug("Getting stream info")
                         stream_info_video, stream_info_audio = (
-                            downloader_music_video.get_stream_info_video(
-                                m3u8_master_data
-                            ),
-                            downloader_music_video.get_stream_info_audio(
-                                m3u8_master_data
-                            ),
+                            downloader_music_video.get_stream_info_video(m3u8_data),
+                            downloader_music_video.get_stream_info_audio(m3u8_data),
                         )
                         decryption_key_video = downloader.get_decryption_key(
                             stream_info_video.pssh, track_metadata["id"]
@@ -706,21 +714,9 @@ def main(
                             stream_info_video.codec,
                             stream_info_audio.codec,
                         )
-                    if not save_cover:
-                        pass
-                    elif cover_path.exists() and not overwrite:
-                        logger.debug(
-                            f'Cover already exists at "{cover_path}", skipping'
-                        )
-                    else:
-                        logger.debug(f'Saving cover to "{cover_path}"')
-                        downloader.save_cover(cover_path, cover_url)
                 elif track_metadata["type"] == "uploaded-videos":
                     stream_url = downloader_post.get_stream_url(track_metadata)
                     tags = downloader_post.get_tags(track_metadata)
-                    remuxed_path = downloader_post.get_post_temp_path(
-                        track_metadata["id"]
-                    )
                     final_path = downloader.get_final_path(tags, ".m4v")
                     cover_url = downloader.get_cover_url(track_metadata)
                     cover_file_extesion = downloader.get_cover_file_extension(cover_url)
@@ -733,9 +729,12 @@ def main(
                             f'({queue_progress}) Post video already exists at "{final_path}", skipping'
                         )
                     else:
+                        remuxed_path = downloader_post.get_post_temp_path(
+                            track_metadata["id"]
+                        )
                         logger.debug(f'Downloading to "{remuxed_path}"')
                         downloader.download_ytdlp(remuxed_path, stream_url)
-                if not save_cover:
+                if synced_lyrics_only or not save_cover:
                     pass
                 elif cover_path.exists() and not overwrite:
                     logger.debug(f'Cover already exists at "{cover_path}", skipping')

gamdl/downloader.py

@@ -51,7 +51,7 @@ class Downloader:
         template_file_multi_disc: str = "{disc}-{track:02d} {title}",
         template_folder_no_album: str = "{artist}/Unknown Album",
         template_file_no_album: str = "{title}",
-        template_file_playlist: str = "Playlists/{playlist_title}",
+        template_file_playlist: str = "Playlists/{playlist_artist}/{playlist_title}",
         template_date: str = "%Y-%m-%dT%H:%M:%SZ",
         exclude_tags: str = None,
         cover_size: int = 1200,
@@ -266,15 +266,17 @@ class Downloader:
         self,
         tags: dict,
     ):
-        template_folder = self.template_file_playlist.split("/")[0:-1]
-        template_file = self.template_file_playlist.split("/")[-1]
-        return self.output_path.joinpath(
+        template_file = self.template_file_playlist.split("/")
+        return Path(
+            self.output_path,
             *[
                 self.get_sanitized_string(i.format(**tags), True)
-                for i in template_folder
-            ]
-        ).joinpath(
-            *[self.get_sanitized_string(template_file.format(**tags), False) + ".m3u8"]
+                for i in template_file[0:-1]
+            ],
+            *[
+                self.get_sanitized_string(template_file[-1].format(**tags), False)
+                + ".m3u8"
+            ],
         )
 
     def update_playlist_file(
@@ -283,13 +285,14 @@ class Downloader:
         final_path: Path,
     ):
         playlist_file_path.parent.mkdir(parents=True, exist_ok=True)
+        playlist_file_path_parent_parts_len = len(playlist_file_path.parent.parts)
+        output_path_parts_len = len(self.output_path.parts)
+        final_path_relative = Path(
+            ("../" * (playlist_file_path_parent_parts_len - output_path_parts_len)),
+            *final_path.parts[output_path_parts_len:],
+        )
         with playlist_file_path.open("a", encoding="utf8") as playlist_file:
-            playlist_file.write(
-                final_path.relative_to(
-                    playlist_file_path.parent, walk_up=True
-                ).as_posix()
-                + "\n"
-            )
+            playlist_file.write(final_path_relative.as_posix() + "\n")
 
     @staticmethod
     def millis_to_min_sec(millis):
@@ -384,23 +387,26 @@ class Downloader:
                 self.template_folder_compilation.split("/")
                 if tags.get("compilation")
                 else self.template_folder_album.split("/")
-            )[0:-1]
+            )
             template_file = (
                 self.template_file_multi_disc.split("/")
                 if tags["disc_total"] > 1
                 else self.template_file_single_disc.split("/")
-            )[-1]
+            )
         else:
-            template_folder = self.template_folder_no_album.split("/")[0:-1]
-            template_file = self.template_file_no_album.split("/")[-1]
-        return self.output_path.joinpath(
+            template_folder = self.template_folder_no_album.split("/")
+            template_file = self.template_file_no_album.split("/")
+        template_final = template_folder + template_file
+        return Path(
+            self.output_path,
             *[
                 self.get_sanitized_string(i.format(**tags), True)
-                for i in template_folder
-            ]
-        ).joinpath(
-            self.get_sanitized_string(template_file.format(**tags), False)
-            + file_extension
+                for i in template_final[0:-1]
+            ],
+            (
+                self.get_sanitized_string(template_final[-1].format(**tags), False)
+                + file_extension
+            ),
         )
 
     def get_cover_file_extension(self, cover_url: str) -> str:
@@ -507,6 +513,7 @@ class Downloader:
 
     @functools.lru_cache()
     def save_cover(self, cover_path: Path, cover_url: str):
+        cover_path.parent.mkdir(parents=True, exist_ok=True)
         cover_path.write_bytes(self.get_url_response_bytes(cover_url))
 
     def cleanup_temp_path(self):

gamdl/downloader_music_video.py

@@ -25,17 +25,20 @@ class DownloaderMusicVideo:
         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_from_webplayback(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)
+    def get_stream_url_from_itunes_page(self, itunes_page: dict) -> dict:
+        stream_url = itunes_page["offers"][0]["assets"][0]["hlsUrl"]
+        url_parts = urllib.parse.urlparse(stream_url)
         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(
+        return url_parts._replace(
             query=urllib.parse.urlencode(query, doseq=True)
         ).geturl()
-        return m3u8.load(stream_url_master_new).data
+
+    def get_m3u8_master_data(self, stream_url_master: str) -> dict:
+        return m3u8.load(stream_url_master).data
 
     def get_playlist_video(
         self,

gamdl/models.py

@@ -1,3 +1,5 @@
+from __future__ import annotations
+
 from dataclasses import dataclass