From: Marcel van der Veldt Date: Wed, 18 May 2022 22:39:53 +0000 (+0200) Subject: Fix: Only 50 library artists retrieved from Spotify (#325) X-Git-Url: https://git.kitaultman.com/?a=commitdiff_plain;h=400a887882379d6a75544775a28d50da32edc2d4;p=music-assistant-server.git Fix: Only 50 library artists retrieved from Spotify (#325) * Fix only 50 artists spotify --- diff --git a/music_assistant/controllers/music/providers/spotify.py b/music_assistant/controllers/music/providers/spotify.py index fe0c3905..ab5a9db2 100644 --- a/music_assistant/controllers/music/providers/spotify.py +++ b/music_assistant/controllers/music/providers/spotify.py @@ -124,12 +124,19 @@ class SpotifyProvider(MusicProvider): async def get_library_artists(self) -> AsyncGenerator[Artist, None]: """Retrieve library artists from spotify.""" - spotify_artists = await self._get_data( - "me/following", type="artist", limit=50, skip_cache=True - ) - for item in spotify_artists["artists"]["items"]: - if item and item["id"]: - yield await self._parse_artist(item) + endpoint = "me/following" + while True: + spotify_artists = await self._get_data( + endpoint, type="artist", limit=50, skip_cache=True + ) + for item in spotify_artists["artists"]["items"]: + if item and item["id"]: + yield await self._parse_artist(item) + if spotify_artists["artists"]["next"]: + endpoint = spotify_artists["artists"]["next"] + endpoint = endpoint.replace("https://api.spotify.com/v1/", "") + else: + break async def get_library_albums(self) -> AsyncGenerator[Album, None]: """Retrieve library albums from the provider.""" diff --git a/music_assistant/helpers/audio.py b/music_assistant/helpers/audio.py index 0d5c0836..3251d6f2 100644 --- a/music_assistant/helpers/audio.py +++ b/music_assistant/helpers/audio.py @@ -256,7 +256,7 @@ async def get_gain_correct( """Get gain correction for given queue / track combination.""" queue = mass.players.get_player_queue(queue_id) if not queue or not queue.settings.volume_normalization_enabled: - return 0 + return (0, 0) target_gain = queue.settings.volume_normalization_target track_loudness = await mass.music.get_track_loudness(item_id, provider) if track_loudness is None: