Fix playlist loading

AUTHORS

@@ -20,3 +20,4 @@ bbb651
 Julius Rüberg
 janbrummer
 Alisson Lauffer
+Riley Smith

src/api/api_models.rs

@@ -186,7 +186,7 @@ trait WithImages {
 pub struct Playlist {
     pub id: String,
     pub name: String,
-    pub images: Vec<Image>,
+    pub images: Option<Vec<Image>>,
     pub tracks: Page<PlaylistTrack>,
     pub owner: PlaylistOwner,
 }
@@ -199,7 +199,11 @@ pub struct PlaylistOwner {
 
 impl WithImages for Playlist {
     fn images(&self) -> &[Image] {
-        &self.images[..]
+        if let Some(ref images) = self.images {
+            images
+        } else {
+            &[]
+        }
     }
 }
 

src/api/client.rs

@@ -387,10 +387,10 @@ impl SpotifyClient {
 
     pub(crate) fn get_playlist(&self, id: &str) -> SpotifyRequest<'_, (), Playlist> {
         let query = make_query_params()
-            .append_pair(
-                "fields",
-                "id,name,images,owner,tracks(total,items(is_local,track(name,id,uri,duration_ms,artists(name,id),album(name,id,images,artists))))",
-            )
+            .append_pair("market", "from_token")
+            // why still grab the tracks field?
+            // the model still expects the appearance of a tracks field
+            .append_pair("fields", "id,name,images,owner,tracks(total)")
             .finish();
         self.request()
             .method(Method::GET)
@@ -404,6 +404,7 @@ impl SpotifyClient {
         limit: usize,
     ) -> SpotifyRequest<'_, (), Page<PlaylistTrack>> {
         let query = make_query_params()
+            .append_pair("market", "from_token")
             .append_pair("offset", &offset.to_string()[..])
             .append_pair("limit", &limit.to_string()[..])
             .finish();

src/app/components/playlist_details/playlist_details_model.rs

@@ -1,3 +1,4 @@
+use gettextrs::gettext;
 use gio::prelude::*;
 use gio::SimpleActionGroup;
 use std::cell::Ref;
@@ -62,6 +63,17 @@ impl PlaylistDetailsModel {
                     self.dispatcher
                         .dispatch(AppAction::PlaybackAction(PlaybackAction::ToggleShuffle));
                 }
+                // The playlist has no songs and the user has still decided to click the play button,
+                // lets just do an early return and show an error...
+                if playlist.songs.songs.is_empty() {
+                    error!("Unable to start playback because songs is empty");
+                    self.dispatcher
+                        .dispatch(AppAction::ShowNotification(gettext(
+                            "An error occured. Check logs for details!",
+                        )));
+                    return;
+                }
+
                 let id_of_first_song = playlist.songs.songs[0].id.as_str();
                 self.play_song_at(0, id_of_first_song);
                 return;
@@ -82,10 +94,13 @@ impl PlaylistDetailsModel {
         self.dispatcher
             .call_spotify_and_dispatch(move || async move {
                 let playlist = api.get_playlist(&id).await;
+                let playlist_tracks = api.get_playlist_tracks(&id, 0, 100).await?;
                 match playlist {
-                    Ok(playlist) => {
-                        Ok(BrowserAction::SetPlaylistDetails(Box::new(playlist)).into())
-                    }
+                    Ok(playlist) => Ok(BrowserAction::SetPlaylistDetails(
+                        Box::new(playlist),
+                        Box::new(playlist_tracks),
+                    )
+                    .into()),
                     Err(SpotifyApiError::BadStatus(400, _))
                     | Err(SpotifyApiError::BadStatus(404, _)) => {
                         Ok(BrowserAction::NavigationPop.into())

src/app/state/browser_state.rs

@@ -19,7 +19,7 @@ pub enum BrowserAction {
     RemoveTracksFromPlaylist(String, Vec<String>),
     SetAlbumDetails(Box<AlbumFullDescription>),
     AppendAlbumTracks(String, Box<SongBatch>),
-    SetPlaylistDetails(Box<PlaylistDescription>),
+    SetPlaylistDetails(Box<PlaylistDescription>, Box<SongBatch>),
     UpdatePlaylistName(PlaylistSummary),
     AppendPlaylistTracks(String, Box<SongBatch>),
     Search(String),

src/app/state/screen_states.rs

@@ -119,9 +119,9 @@ impl UpdatableState for PlaylistDetailsState {
 
     fn update_with(&mut self, action: Cow<Self::Action>) -> Vec<Self::Event> {
         match action.as_ref() {
-            BrowserAction::SetPlaylistDetails(playlist) if playlist.id == self.id => {
-                let PlaylistDescription { id, songs, .. } = *playlist.clone();
-                self.songs.add(songs).commit();
+            BrowserAction::SetPlaylistDetails(playlist, song_batch) if playlist.id == self.id => {
+                let PlaylistDescription { id, .. } = *playlist.clone();
+                self.songs.add(*song_batch.clone()).commit();
                 self.playlist = Some(*playlist.clone());
                 vec![BrowserEvent::PlaylistDetailsLoaded(id)]
             }