Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 13 additions & 0 deletions gamdl/downloader/downloader_song.py
Original file line number Diff line number Diff line change
Expand Up @@ -47,11 +47,24 @@ async def get_download_item(
)

webplayback = await self.interface.apple_music_api.get_webplayback(song_id)

album_id = webplayback.get("songList", [{}])[0].get("assets", [{}])[0].get("metadata", {}).get("playlistId")
album_metadata = None
if album_id:
try:
album_response = await self.interface.apple_music_api.get_album(str(album_id))
if album_response and "data" in album_response and len(album_response["data"]) > 0:
album_metadata = album_response["data"][0]
except Exception:
pass

download_item.media_tags = await self.interface.get_tags(
webplayback,
download_item.lyrics.unsynced if download_item.lyrics else None,
album_metadata,
self.use_album_date,
)

if self.fetch_extra_tags:
download_item.extra_tags = await self.interface.get_extra_tags(
song_metadata,
Expand Down
7 changes: 6 additions & 1 deletion gamdl/interface/interface_song.py
Original file line number Diff line number Diff line change
Expand Up @@ -174,13 +174,18 @@ async def get_tags(
self,
webplayback: dict,
lyrics: str | None = None,
album_metadata: dict | None = None,
use_album_date: bool = False,
) -> MediaTags:
webplayback_metadata = webplayback["songList"][0]["assets"][0]["metadata"]

tags = MediaTags(
album=webplayback_metadata["playlistName"],
album_artist=webplayback_metadata["playlistArtistName"],
album_artist=(
album_metadata.get("attributes", {}).get("artistName")
if album_metadata
else webplayback_metadata["playlistArtistName"]
),
album_id=int(webplayback_metadata["playlistId"]),
album_sort=webplayback_metadata["sort-album"],
artist=webplayback_metadata["artistName"],
Expand Down