From 0135d735568f00d68a39d8a31b683ed624b9af1e Mon Sep 17 00:00:00 2001
From: Kendall Garner <17521368+kgarner7@users.noreply.github.com>
Date: Mon, 21 Feb 2022 13:43:29 -0500
Subject: [PATCH] add fix for bulk artist requests, over develop

---
 src/renderer/views/pages/artist-feed.ejs | 27 ++++++++++++++++--------
 src/renderer/views/pages/home.ejs        | 20 ++++++++++++------
 2 files changed, 31 insertions(+), 16 deletions(-)

diff --git a/src/renderer/views/pages/artist-feed.ejs b/src/renderer/views/pages/artist-feed.ejs
index 70059d09..e2af0b51 100644
--- a/src/renderer/views/pages/artist-feed.ejs
+++ b/src/renderer/views/pages/artist-feed.ejs
@@ -78,21 +78,30 @@
                 let self = this
                 this.artists = []
                 this.artistFeed = []
-                this.app.mk.api.v3.music(`/v1/catalog/${app.mk.storefrontId}/artists?ids=${artists.toString()}&views=latest-release&include[songs]=albums&fields[albums]=artistName,artistUrl,artwork,contentRating,editorialArtwork,editorialVideo,name,playParams,releaseDate,url,trackCount&limit[artists:top-songs]=2&art[url]=f`,{ l : this.$root.mklang}).then(artistData => {
-                    artistData.data.data.forEach(item => {
-                        self.artists.push(item)
-                        if (item.views["latest-release"].data.length != 0) {
-                            self.artistFeed.push(item.views["latest-release"].data[0])
-                        }
-                    })
+                
+                // Apple limits the number of IDs we can provide in a single API call to 50.
+                // Divide it into groups of 50 and send parallel requests
+                let chunks = []
+                for (let artistIdx = 0; artistIdx < artists.length; artistIdx += 50) {
+                    chunks.push(artists.slice(artistIdx, artistIdx + 50))
+                }
+                try {
+                    const chunkArtistData = await Promise.all(chunks.map(chunk =>
+                        this.app.mk.api.v3.music(`/v1/catalog/${app.mk.storefrontId}/artists?ids=${chunk.toString()}&views=latest-release&include[songs]=albums&fields[albums]=artistName,artistUrl,artwork,contentRating,editorialArtwork,editorialVideo,name,playParams,releaseDate,url,trackCount&limit[artists:top-songs]=2&art[url]=f`)))
+                    chunkArtistData.forEach(chunkResult =>
+                        chunkResult.data.data.forEach(item => {
+                            self.artists.push(item)
+                            if (item.views["latest-release"].data.length != 0) {
+                                self.artistFeed.push(item.views["latest-release"].data[0])
+                            }
+                        }))
                     // sort artistFeed by attributes.releaseDate descending, date is formatted as "YYYY-MM-DD"
                     this.artistFeed.sort((a, b) => {
                         let dateA = new Date(a.attributes.releaseDate)
                         let dateB = new Date(b.attributes.releaseDate)
                         return dateB - dateA
                     })
-                })
-
+                } catch (err) { }
             }
         }
     });
diff --git a/src/renderer/views/pages/home.ejs b/src/renderer/views/pages/home.ejs
index 6a0bb7ac..d4a4169d 100644
--- a/src/renderer/views/pages/home.ejs
+++ b/src/renderer/views/pages/home.ejs
@@ -177,21 +177,27 @@
             async getArtistFeed() {
                 let artists = this.followedArtists
                 let self = this
-                this.app.mk.api.v3.music(`/v1/catalog/${app.mk.storefrontId}/artists?ids=${artists.toString()}&views=latest-release&include[songs]=albums&fields[albums]=artistName,artistUrl,artwork,contentRating,editorialArtwork,editorialVideo,name,playParams,releaseDate,url,trackCount&limit[artists:top-songs]=2&art[url]=f&l=${this.$root.mklang}`).then(artistData => {
-                    artistData.data.data.forEach(item => {
+
+                let chunks = []
+                for (let artistIdx = 0; artistIdx < artists.length; artistIdx += 50) {
+                    chunks.push(artists.slice(artistIdx, artistIdx + 50));
+                }
+                try {
+                    const chunkArtistData = await Promise.all(chunks.map(chunk =>
+                        this.app.mk.api.v3.music(`/v1/catalog/${app.mk.storefrontId}/artists?ids=${chunk.toString()}&views=latest-release&include[songs]=albums&fields[albums]=artistName,artistUrl,artwork,contentRating,editorialArtwork,editorialVideo,name,playParams,releaseDate,url,trackCount&limit[artists:top-songs]=2&art[url]=f`)))
+                    chunkArtistData.forEach(chunkResult =>
+                        chunkResult.data.data.forEach(item => {
                             if (item.views["latest-release"].data.length != 0) {
                                 self.artistFeed.push(item.views["latest-release"].data[0])
                             }
-                        })
-                        // sort artistFeed by attributes.releaseDate descending, date is formatted as "YYYY-MM-DD"
+                        }))
+                    // sort artistFeed by attributes.releaseDate descending, date is formatted as "YYYY-MM-DD"
                     this.artistFeed.sort((a, b) => {
                         let dateA = new Date(a.attributes.releaseDate)
                         let dateB = new Date(b.attributes.releaseDate)
                         return dateB - dateA
                     })
-                })
-
-
+                } catch (error) { }
             },
             getRecentlyPlayed() {