finish spotify impl

src/mussty/helpers/paginator.py

@@ -41,7 +41,7 @@ async def get_records(self: Paginator, get_records_list, limit, total) -> list:
                             task_results.append(task_result)
 
                             # apple music does not like being flooded with a bunch of requests at once
-                            await asyncio.sleep(0.01)
+                            await asyncio.sleep(0.05)
 
             except* Exception as e:
                 print(e.exceptions)

src/mussty/service.py

@@ -51,12 +51,17 @@ def add_playlist(self, playlist: Playlist):
 
     def uncache_self(self):
         if not self.cachefile.exists():
-            print(f"No cache exists for service of type {self.__class__.__name__}")
+            print(f"Cachefile does not exist.")
             return False
 
         with open(self.cachefile) as f:
             data = json.load(f)
-            data = data[self.json_tagname]
+
+            try:
+                data = data[self.json_tagname]
+            except KeyError:
+                print(f"No cache exists for service of type {self.__class__.__name__}")
+                return False
 
             try:
                 self.songs = {

src/mussty/spotify.py

@@ -36,8 +36,6 @@ def __init__(self) -> None:
         self.refresh_token: str = ""
         self.user_id: str = ""
 
-        self.CACHE = False  # TODO delete and make this configurable
-
         has_tokens = True
         try:
             self.access_token = secrets.get()["spotify"]["access_token"]
@@ -250,14 +248,44 @@ async def get_playlist_page(offset: int, paginator: Paginator):
                     id = playlist["id"]
                     title = playlist["name"]
 
-                    playlists.append(Playlist(id, title, []))
+                    # TODO this empty list way of doing things is hacky, please make it cleaner
+                    playlists.append(
+                        Playlist(id, title, [] * playlist["tracks"]["total"])
+                    )
 
                 return playlists
 
-        playlists = Paginator(get_playlist_page, limit, total)
-        print(playlists.records)
+        def get_songs_for_playlist_by_id(pl: Playlist):
+            async def get_songs_for_playlist(offset: int, paginator: Paginator):
+                playlist_tracks_url = self.api_url_base() + f"/playlists/{pl.id}/tracks"
+
+                playlist_tracks_page = []
+                params = {"limit": limit, "offset": offset}
+                async with paginator.session.get(
+                    playlist_tracks_url, headers=self.auth_headers(), params=params
+                ) as res:
+                    body = await res.json()
+                    for item in body["items"]:
+                        track = item["track"]
+                        isrc = track["external_ids"]["isrc"]
+                        title = track["name"]
+
+                        playlist_tracks_page.append(Song(isrc, title, ""))
+
+                return playlist_tracks_page
+
+            return get_songs_for_playlist
+
+        playlists_paged = Paginator(get_playlist_page, limit, total)
+        for playlist in playlists_paged:
+            track_count = len(playlist.songs)
+
+            playlist_tracks_paged = Paginator(
+                get_songs_for_playlist_by_id(playlist), total=track_count, limit=limit
+            )
+
+            playlist.songs = playlist_tracks_paged.records
 
-        for playlist in playlists:
             self.add_playlist(playlist)
 
     def auth_headers(self):