From 0bc13e7c6336e84d60d24a2a2e28c1b62cf2e066 Mon Sep 17 00:00:00 2001
From: Alain Nussbaumer <alain.nussbaumer@alleluia.ch>
Date: Sat, 10 Jun 2023 13:46:33 +0200
Subject: [PATCH] [web] Fix for Spotify playlists with incorrect count of
 tracks and missing market data

Some Spotify playlists contain null tracks, thus provoking an incorrect count of track.
Moreover, the market data was missing in the API request.
---
 web-src/src/pages/SpotifyPagePlaylist.vue | 23 +++++++++++++++--------
 1 file changed, 15 insertions(+), 8 deletions(-)

diff --git a/web-src/src/pages/SpotifyPagePlaylist.vue b/web-src/src/pages/SpotifyPagePlaylist.vue
index 1de7a303..4a2d495f 100644
--- a/web-src/src/pages/SpotifyPagePlaylist.vue
+++ b/web-src/src/pages/SpotifyPagePlaylist.vue
@@ -25,15 +25,15 @@
         "
       />
       <spotify-list-item-track
-        v-for="(item, index) in tracks"
-        :key="item.track.id"
-        :track="item.track"
-        :album="item.track.album"
+        v-for="(track, index) in tracks"
+        :key="track.id"
+        :track="track"
+        :album="track.album"
         :position="index"
         :context_uri="playlist.uri"
       >
         <template #actions>
-          <a @click.prevent.stop="open_track_dialog(item.track)">
+          <a @click.prevent.stop="open_track_dialog(track)">
             <span class="icon has-text-dark"
               ><mdicon name="dots-vertical" size="16"
             /></span>
@@ -78,7 +78,8 @@ const dataObject = {
       spotifyApi.getPlaylist(to.params.playlist_id),
       spotifyApi.getPlaylistTracks(to.params.playlist_id, {
         limit: PAGE_SIZE,
-        offset: 0
+        offset: 0,
+        market: store.state.spotify.webapi_country
       })
     ])
   },
@@ -136,7 +137,8 @@ export default {
       spotifyApi
         .getPlaylistTracks(this.playlist.id, {
           limit: PAGE_SIZE,
-          offset: this.offset
+          offset: this.offset,
+          market: store.state.spotify.webapi_country
         })
         .then((data) => {
           this.append_tracks(data)
@@ -145,7 +147,12 @@ export default {
     },
 
     append_tracks(data) {
-      this.tracks = this.tracks.concat(data.items)
+      this.tracks = data.items.reduce((tracks, item) => {
+        if (item.track) {
+          tracks.push(item.track)
+        }
+        return tracks
+      }, this.tracks)
       this.total = data.total
       this.offset += data.limit
     },