From 7ca79d024df22dac13a5733312791f928f026a58 Mon Sep 17 00:00:00 2001
From: booploops <49113086+booploops@users.noreply.github.com>
Date: Tue, 21 Dec 2021 19:42:33 -0800
Subject: [PATCH] removed playlist limit of 100

---
 src/renderer/index.js                       | 63 ++++++++++++++++++---
 src/renderer/views/pages/cider-playlist.ejs | 20 ++++++-
 2 files changed, 73 insertions(+), 10 deletions(-)

diff --git a/src/renderer/index.js b/src/renderer/index.js
index 706a7777..4606708f 100644
--- a/src/renderer/index.js
+++ b/src/renderer/index.js
@@ -188,7 +188,9 @@ const app = new Vue({
         },
         playlists: {
             listing: [],
-            details: {}
+            details: {},
+            loadingState: 0, // 0 loading, 1 loaded, 2 error
+            id: ""
         },
         mxmtoken: "",
         playerReady: false,
@@ -236,7 +238,8 @@ const app = new Vue({
         songstest: false,
         hangtimer: null,
         selectedMediaItems: [],
-        routes: ["browse", "listen_now", "radio"]
+        routes: ["browse", "listen_now", "radio"],
+        musicBaseUrl: "https://api.music.apple.com/"
     },
     watch: {
         page: () => {
@@ -356,7 +359,7 @@ const app = new Vue({
                 ipcRenderer.invoke('setStoreValue', 'volume', this.mk.volume)
             })
 
-            this.apiCall('https://api.music.apple.com/v1/me/library/playlists', res => {
+            this.apiCall('https://api.music.apple.com/v1/me/library/playlist-folders/p.playlistsroot/children/', res => {
                 self.playlists.listing = res.data
             })
             document.body.removeAttribute("loading")
@@ -455,6 +458,7 @@ const app = new Vue({
             await this.showCollection(responseFormat, title, "search")
         },
         async getPlaylistFromID(id) {
+            let self = this
             const params = {
                 include: "tracks",
                 platform: "web",
@@ -464,12 +468,42 @@ const app = new Vue({
                 "fields[catalog]": "artistUrl,albumUrl",
                 "fields[songs]": "artistUrl,albumUrl"
             }
+
+            this.playlists.loadingState = 0
+            let playlistId = ''
+            //  TO DO: Replace with a universal function for recursive calls
+            function getPlaylistTracks(next) {
+                if (!next) {
+                    app.mk.api.library.playlist(id, params).then(res => {
+                        self.showingPlaylist = res
+                        playlistId = res.id
+                        if (res.relationships.tracks.next) {
+                            getPlaylistTracks(res.relationships.tracks.next)
+                        } else {
+                            self.playlists.loadingState = 1
+                        }
+                    })
+                } else {
+                    app.apiCall(app.musicBaseUrl + next, res => {
+                        if(self.showingPlaylist.id != playlistId) {
+                            return
+                        }
+                        self.showingPlaylist.relationships.tracks.data = self.showingPlaylist.relationships.tracks.data.concat(res.data)
+                        if (res.next) {
+                            getPlaylistTracks(res.next)
+                        } else {
+                            self.playlists.loadingState = 1
+                        }
+                    })
+                }
+
+            }
             try {
-                this.showingPlaylist = await app.mk.api.library.playlist(id, params)
+                getPlaylistTracks()
             } catch (e) {
                 console.log(e);
                 try {
-                    this.showingPlaylist = await app.mk.api.playlist(id, params)
+                    getPlaylistTracks()
                 } catch (err) {
                     console.log(err)
                 }
@@ -502,7 +536,20 @@ const app = new Vue({
                 'background': ('linear-gradient(to right, var(--keyColor) 0%, var(--keyColor) ' + value + '%, #333 ' + value + '%, #333 100%)')
             }
         },
-        async getRecursive(response, sendTo) {
+        async getRecursive(response) {
+            // if response has a .next() property run it and keep running until .next is null or undefined
+            // and then return the response concatenated with the results of the next() call
+            function executeRequest() {
+                if (response.next) {
+                    return response.next().then(executeRequest)
+                } else {
+                    return response
+                }
+            }
+
+            return executeRequest()
+        },
+        async getRecursive2(response, sendTo) {
             let returnData = {
                 "data": [],
                 "meta": {}
@@ -622,9 +669,9 @@ const app = new Vue({
                 } else {
                     app.playMediaItemById((id), (kind), (isLibrary), item.attributes.url ?? '')
                 }
-                
+
             }
-            
+
         },
         async getNowPlayingItemDetailed(target) {
             let u = await app.mkapi(app.mk.nowPlayingItem.playParams.kind, (app.mk.nowPlayingItem.songId == -1), (app.mk.nowPlayingItem.songId != -1) ? app.mk.nowPlayingItem.songId : app.mk.nowPlayingItem["id"], { "include[songs]": "albums,artists" });
diff --git a/src/renderer/views/pages/cider-playlist.ejs b/src/renderer/views/pages/cider-playlist.ejs
index 18194f7b..b32b1a37 100644
--- a/src/renderer/views/pages/cider-playlist.ejs
+++ b/src/renderer/views/pages/cider-playlist.ejs
@@ -1,6 +1,10 @@
 <script type="text/x-template" id="cider-playlist">
-    <template v-if="data != [] && data.attributes != null">
-    <div class="content-inner playlist-page" :style="{'--bgColor': (data.attributes.artwork != null && data.attributes.artwork['bgColor'] != null) ? ('#' + data.attributes.artwork.bgColor) : ''}">
+    <template>
+        <div class="content-inner playlist-page" v-if="data != [] && data.attributes != null" :style="{'--bgColor': (data.attributes.artwork != null && data.attributes.artwork['bgColor'] != null) ? ('#' + data.attributes.artwork.bgColor) : ''}">
+            <template v-if="app.playlists.loadingState == 0">
+                <div class="content-inner centered">Loading...</div>
+            </template>
+            <template v-if="app.playlists.loadingState == 1">
             <div class="playlist-display row"
                  :style="{
                 background: (data.attributes.artwork != null && data.attributes.artwork['bgColor'] != null) ? ('#' + data.attributes.artwork.bgColor) : '',
@@ -66,6 +70,7 @@
                 </div>
                 <div class="playlist-time">{{app.getTotalTime()}}</div>
             </div>
+        </template>
     </div>
 </template>
 
@@ -78,8 +83,19 @@
             return {
                 editorialNotesExpanded: false,
             }
+        },
+        mounted() {
+
         },
         methods: {
+            getRecursive(url) {
+                app.apiCall(app.musicBaseUrl + "/v1/me/library/playlists/p.V7VYlrDso6kkYY/tracks?offset=100", res => {
+                    this.data.relationships.tracks.data = this.data.relationships.tracks.data.concat(res.data.data)
+                    if (res.data.next) {
+                        this.getRecursive(res.data.next)
+                    }
+                })
+            },
             getItemParent: function (data) {
                 kind = data.attributes.playParams.kind;
                 id = data.attributes.playParams.id;