From: Jonathan <jonathan@bangert.dk>
Date: Sun, 6 Aug 2023 08:20:54 +0000 (+0200)
Subject: Merge branch 'main' into async-deezer-python-lib
X-Git-Url: https://git.kitaultman.com/?a=commitdiff_plain;h=57ade89b512cd0ac82c8efad8dbb99d4cca48a77;p=music-assistant-server.git

Merge branch 'main' into async-deezer-python-lib
---

57ade89b512cd0ac82c8efad8dbb99d4cca48a77
diff --cc music_assistant/server/providers/deezer/__init__.py
index 63ffa237,a86e0a86..35dc70fa
--- a/music_assistant/server/providers/deezer/__init__.py
+++ b/music_assistant/server/providers/deezer/__init__.py
@@@ -281,15 -273,13 +281,13 @@@ class DeezerProvider(MusicProvider):  
      ) -> AsyncGenerator[PlaylistTrack, None]:
          """Get all tracks in a playlist."""
          playlist = await self.client.get_playlist(playlist_id=prov_playlist_id)
 -        for count, deezer_track in enumerate(playlist.tracks, start=1):
 -            track = self.parse_track(
 +        playlist_tracks = await playlist.get_tracks()
 +        for count, deezer_track in enumerate(playlist_tracks, start=1):
-             track = await self.parse_track(
++            yield await self.parse_track(
                  track=deezer_track,
                  user_country=self.gw_client.user_country,
                  extra_init_kwargs={"position": count},
              )
-             track.position = count
--            yield track
  
      async def get_artist_albums(self, prov_artist_id: str) -> list[Album]:
          """Get albums by an artist."""
diff --cc requirements_all.txt
index bb4d1dc4,47a0254c..3c439574
--- a/requirements_all.txt
+++ b/requirements_all.txt
@@@ -10,7 -10,8 +10,7 @@@ aiosqlite==0.19.
  async-upnp-client==0.34.1
  asyncio-throttle==1.0.2
  colorlog==6.7.0
- cryptography==41.0.2
+ cryptography==41.0.3
 -deezer-python==6.0.0
  faust-cchardet>=2.1.18
  git+https://github.com/MarvinSchenkel/pytube.git
  git+https://github.com/gieljnssns/python-radios.git@main