From: Marvin Schenkel Date: Sat, 3 Aug 2024 13:25:00 +0000 (+0200) Subject: Bump YTM dependencies + add url to provider mappings. (#1539) X-Git-Url: https://git.kitaultman.com/?a=commitdiff_plain;h=698d23d7b7907ba219fb98534f482565b9c260bc;p=music-assistant-server.git Bump YTM dependencies + add url to provider mappings. (#1539) Bump YTM dependencies + add url to providermappings. --- diff --git a/music_assistant/server/providers/ytmusic/__init__.py b/music_assistant/server/providers/ytmusic/__init__.py index cb317fd9..6b3b35c7 100644 --- a/music_assistant/server/providers/ytmusic/__init__.py +++ b/music_assistant/server/providers/ytmusic/__init__.py @@ -108,8 +108,6 @@ SUPPORTED_FEATURES = ( ProviderFeature.SIMILAR_TRACKS, ) -YT_DLP_CACHE_SECTION = "youtube-oauth2" -YT_DLP_CACHE_KEY = "oauth_token" # TODO: fix disabled tests # ruff: noqa: PLW2901, RET504 @@ -612,6 +610,7 @@ class YoutubeMusicProvider(MusicProvider): item_id=str(album_id), provider_domain=self.domain, provider_instance=self.instance_id, + url=f"{YTM_DOMAIN}/playlist?list={album_id}", ) }, ) @@ -692,6 +691,7 @@ class YoutubeMusicProvider(MusicProvider): item_id=playlist_id, provider_domain=self.domain, provider_instance=self.instance_id, + url=f"{YTM_DOMAIN}/playlist?list={playlist_id}", ) }, ) @@ -720,17 +720,18 @@ class YoutubeMusicProvider(MusicProvider): if not track_obj.get("videoId"): msg = "Track is missing videoId" raise InvalidDataError(msg) - + track_id = str(track_obj["videoId"]) track = Track( - item_id=track_obj["videoId"], + item_id=track_id, provider=self.domain, name=track_obj["title"], provider_mappings={ ProviderMapping( - item_id=str(track_obj["videoId"]), + item_id=track_id, provider_domain=self.domain, provider_instance=self.instance_id, available=track_obj.get("isAvailable", True), + url=f"{YTM_DOMAIN}/watch?v={track_id}", audio_format=AudioFormat( content_type=ContentType.M4A, ), diff --git a/music_assistant/server/providers/ytmusic/manifest.json b/music_assistant/server/providers/ytmusic/manifest.json index 811315cd..0b26ece0 100644 --- a/music_assistant/server/providers/ytmusic/manifest.json +++ b/music_assistant/server/providers/ytmusic/manifest.json @@ -4,7 +4,7 @@ "name": "YouTube Music", "description": "Support for the YouTube Music streaming provider in Music Assistant.", "codeowners": ["@MarvinSchenkel"], - "requirements": ["ytmusicapi==1.7.5", "yt-dlp-youtube-accesstoken==0.1.1", "yt-dlp==2024.7.9"], + "requirements": ["ytmusicapi==1.8.0", "yt-dlp-youtube-accesstoken==0.1.1", "yt-dlp==2024.7.25"], "documentation": "https://music-assistant.io/music-providers/youtube-music/", "multi_instance": true } diff --git a/requirements_all.txt b/requirements_all.txt index 989cea91..301a7e47 100644 --- a/requirements_all.txt +++ b/requirements_all.txt @@ -40,7 +40,7 @@ soundcloudpy==0.1.0 tidalapi==0.7.6 unidecode==1.3.8 xmltodict==0.13.0 -yt-dlp==2024.7.9 +yt-dlp==2024.7.25 yt-dlp-youtube-accesstoken==0.1.1 -ytmusicapi==1.7.5 +ytmusicapi==1.8.0 zeroconf==0.132.2