From 80f408a7aa7f7837922e5d56d5c4edb3a22e2102 Mon Sep 17 00:00:00 2001
From: Jason Chen <californiaroad1@gmail.com>
Date: Sat, 28 May 2022 17:07:15 -0700
Subject: [PATCH 01/10] add editPlayListDescription

---
 src/renderer/main/vueapp.js | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/src/renderer/main/vueapp.js b/src/renderer/main/vueapp.js
index 2ac1e6cf..f0b3466c 100644
--- a/src/renderer/main/vueapp.js
+++ b/src/renderer/main/vueapp.js
@@ -1349,6 +1349,21 @@ const app = new Vue({
                 self.refreshPlaylists(false, false)
             })
         },
+        async editPlaylistDescription(id, name = app.getLz('term.newPlaylist')) {
+            let self = this
+            this.mk.api.v3.music(
+                `/v1/me/library/playlists/${id}`, {}, {
+                fetchOptions: {
+                    method: "PATCH",
+                    body: JSON.stringify({
+                        attributes: { description: name }
+                    })
+                }
+            }
+            ).then(res => {
+                self.refreshPlaylists(false, false)
+            })
+        },
         copyToClipboard(str) {
             // if (navigator.userAgent.includes('Darwin') || navigator.appVersion.indexOf("Mac") != -1) {
             // this.darwinShare(str)

From 60506dc47aaf6280f180429b24bf88a350b8a656 Mon Sep 17 00:00:00 2001
From: Jason Chen <californiaroad1@gmail.com>
Date: Sat, 28 May 2022 17:07:28 -0700
Subject: [PATCH 02/10] add feature to change playlist description

---
 src/renderer/less/pages.less                | 12 ++++++--
 src/renderer/views/pages/cider-playlist.ejs | 34 +++++++++++++++++++--
 2 files changed, 41 insertions(+), 5 deletions(-)

diff --git a/src/renderer/less/pages.less b/src/renderer/less/pages.less
index 2fb5739e..d8648b8e 100644
--- a/src/renderer/less/pages.less
+++ b/src/renderer/less/pages.less
@@ -667,8 +667,6 @@
         .nameEdit {
           font-weight  : 700;
           font-size    : 1.6rem;
-          margin-bottom: 6px;
-          margin-right : 6px;
           flex-shrink  : unset;
           background   : transparent;
           border       : 0px;
@@ -676,6 +674,16 @@
           font-family  : inherit;
         }
 
+        .descriptionEdit {
+          font-size    : 14px;
+          flex-shrink  : unset;
+          background   : transparent;
+          border       : 0px;
+          color        : inherit;
+          font-family  : inherit;
+          width        : 60vw;
+        }
+
         .playlist-artist {
           font-size    : 20px;
           margin-bottom: 6px;
diff --git a/src/renderer/views/pages/cider-playlist.ejs b/src/renderer/views/pages/cider-playlist.ejs
index 2fe6faf2..cb21bba6 100644
--- a/src/renderer/views/pages/cider-playlist.ejs
+++ b/src/renderer/views/pages/cider-playlist.ejs
@@ -54,9 +54,16 @@
                                              class="content"
                                              v-html="data.attributes.description?.short ?? data.attributes.editorialNotes?.short"
                                              @click="openInfoModal()"></div>
-                                        <div v-else-if="(data.attributes.description?.standard ?? data.attributes.editorialNotes?.standard) != null"
-                                             class="content"
-                                             v-html="data.attributes.description?.standard ?? data.attributes.editorialNotes?.standard"></div>
+                                        <div v-else-if="((data.attributes.description?.standard ?? data.attributes.editorialNotes?.standard) != null) && (descriptionEditing == false)"
+                                             @mouseover="minClass(false)" @click="editPlaylistDescription()">{{data.attributes.description?.standard ?? data.attributes.editorialNotes?.standard}}</div>
+                                        <div v-else-if="((data.attributes.description?.standard ?? data.attributes.editorialNotes?.standard) != null) && (descriptionEditing)"
+                                             @mouseover="minClass(false)"><input type="text"
+                                             spellcheck="false"
+                                             class="descriptionEdit"
+                                             v-model="data.attributes.description.standard"
+                                             @blur="editPlaylist"
+                                             @change="editPlaylist"
+                                             @keydown.enter="editPlaylist"/></div>
                                         <!-- <button v-if="(data.attributes.description?.short ?? data.attributes.editorialNotes?.short ) != null" class="more-btn"
                                                 @click="editorialNotesExpanded = !editorialNotesExpanded">
                                             {{app.getLz('term.showMore')}}
@@ -265,6 +272,7 @@
                 editorialNotesExpanded: false,
                 drag: false,
                 nameEditing: false,
+                descriptionEditing: false,
                 inLibrary: null,
                 confirm: false,
                 app: this.$root,
@@ -412,12 +420,24 @@
             },
             editPlaylist() {
                 this.app.editPlaylist(this.data.id, this.data.attributes.name);
+                this.app.editPlaylistDescription(this.data.id, this.data.attributes.description.standard);
                 this.app.playlists.listing.forEach(playlist => {
                     if (playlist.id === this.data.id) {
                         playlist.attributes.name = this.data.attributes.name
+                        playlist.attributes.description = this.data.attributes.description.standard
                     }
                 })
                 this.nameEditing = false
+                this.descriptionEditing = false
+            },
+            editPlaylistDescription() {
+                this.app.editPlaylistDescription(this.data.id, this.data.attributes.description.standard);
+                this.app.playlists.listing.forEach(playlist => {
+                    if (playlist.id === this.data.id) {
+                        playlist.attributes.description = this.data.attributes.description.standard
+                    }
+                })
+                this.descriptionEditing = false
             },
             addToLibrary(id) {
                 app.mk.addToLibrary(id)
@@ -450,6 +470,14 @@
                     }, 100)
                 }
             },
+            editPlaylistDescription() {
+                if (this.data.attributes.canEdit && this.data.type === "library-playlists") {
+                    this.descriptionEditing = true
+                    setTimeout(() => {
+                        document.querySelector(".descriptionEdit").focus()
+                    }, 100)
+                }
+            },
             buildContextMenu(index) {
                 let self = this
                 if (!this.data.attributes.canEdit) {

From acaba2a196d7a8fd3482e4f8f6721b077017a588 Mon Sep 17 00:00:00 2001
From: Jason Chen <californiaroad1@gmail.com>
Date: Sun, 29 May 2022 13:20:06 -0700
Subject: [PATCH 03/10] add queue history styling

---
 src/renderer/less/elements.less | 42 ++++++++++++++++++++++++++++-----
 1 file changed, 36 insertions(+), 6 deletions(-)

diff --git a/src/renderer/less/elements.less b/src/renderer/less/elements.less
index 6fcd72b2..cca8ced1 100644
--- a/src/renderer/less/elements.less
+++ b/src/renderer/less/elements.less
@@ -291,8 +291,10 @@
 
 /* queue item */
 .cd-queue-item {
-  border-bottom: 1px solid rgb(200 200 200 / 10%);
-  padding: 8px;
+  border-bottom: 0px solid rgb(200 200 200 / 10%);
+  padding: 1px;
+  padding-bottom: 9px;
+  padding-top: 9px;
 
   .row,
   .col {
@@ -301,8 +303,8 @@
   }
 
   .artwork {
-    width: 32px;
-    height: 32px;
+    width: 42px;
+    height: 42px;
     flex: 0 0 auto;
   }
 
@@ -320,18 +322,46 @@
   }
 
   .queue-info {
+    justify-content: center;
     display: flex;
     flex-direction: column;
+    flex-grow: 1;
 
     .queue-title {
       font-size: 14px;
     }
 
     .queue-subtitle {
-      font-size: 13px;
-      opacity: 0.85;
+      font-size: 0.7em;
+      opacity: 0.7;
     }
   }
+
+  .queue-duration-info {
+    display: flex;
+    flex-grow: 0;
+
+    .queue-duration {
+      font-size: 14px;
+      justify-content: center;
+      min-width: 60px;
+      height: 100%;
+    }
+  }
+
+  .queue-explicit-icon {
+    display: flex;
+    width: 24px;
+    padding: 0px;
+  }
+
+  .explicit-icon {
+    background-image: url("./assets/explicit.svg");
+    height: 12px;
+    width: 36px;
+    filter: contrast(0);
+    background-repeat: no-repeat;
+  }
 }
 
 /* horizontal media scroller */

From 99dbf09bf5e52d1563cfe6d5bde4dbee4e19f65b Mon Sep 17 00:00:00 2001
From: Jason Chen <californiaroad1@gmail.com>
Date: Sun, 29 May 2022 13:20:15 -0700
Subject: [PATCH 04/10] add queue features

---
 src/renderer/views/components/queue.ejs | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/src/renderer/views/components/queue.ejs b/src/renderer/views/components/queue.ejs
index 597f6b6f..1c174e78 100644
--- a/src/renderer/views/components/queue.ejs
+++ b/src/renderer/views/components/queue.ejs
@@ -33,6 +33,12 @@
                                 <div class="queue-title text-overflow-elipsis">{{ queueItem.item.attributes.name }}</div>
                                 <div class="queue-subtitle text-overflow-elipsis">{{ queueItem.item.attributes.artistName }} — {{ queueItem.item.attributes.albumName }}</div>
                             </div>
+                            <div class="queue-explicit-icon flex-center" v-if="queueItem.item.attributes.contentRating == 'explicit'">
+                                <div class="explicit-icon"></div>
+                            </div>
+                            <div class="col queue-duration-info">
+                                <div class="queue-duration flex-center">{{convertTimeToString(queueItem.item.attributes.durationInMillis)}}</div>
+                            </div>
                         </div>
                     </div>
                 </template>
@@ -167,6 +173,10 @@
                 this.selected = -1
                 app.mk.queue._queueItems = this.queueItems;
                 app.mk.queue._reindex()
+            },
+            convertTimeToString(timeInMilliseconds) {
+                var seconds = ((timeInMilliseconds % 60000) / 1000).toFixed(0);
+                return Math.floor(timeInMilliseconds/60000) + ":" + (seconds < 10 ? '0' : '') + seconds;
             }
         }
     });

From 183622ae6126d2814090d1879156cdacabf677ff Mon Sep 17 00:00:00 2001
From: Jason Chen <californiaroad1@gmail.com>
Date: Sun, 29 May 2022 13:57:17 -0700
Subject: [PATCH 05/10] replay styling update

---
 src/renderer/less/bootstrap.less | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/renderer/less/bootstrap.less b/src/renderer/less/bootstrap.less
index 870d5e81..a392294e 100644
--- a/src/renderer/less/bootstrap.less
+++ b/src/renderer/less/bootstrap.less
@@ -845,6 +845,7 @@
   padding         : 0.5rem 1rem;
   background-color: rgba(0, 0, 0, 0.03);
   border-top      : 1px solid rgba(0, 0, 0, 0.125);
+  text-align      : center;
 }
 
 .card-footer:last-child {

From 652e400b572f07f581ed658ec4d78d4ed47f1b38 Mon Sep 17 00:00:00 2001
From: Jason Chen <californiaroad1@gmail.com>
Date: Sun, 29 May 2022 14:04:48 -0700
Subject: [PATCH 06/10] change queue and history headers

---
 src/renderer/views/components/queue.ejs | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/renderer/views/components/queue.ejs b/src/renderer/views/components/queue.ejs
index 1c174e78..1b7274f9 100644
--- a/src/renderer/views/components/queue.ejs
+++ b/src/renderer/views/components/queue.ejs
@@ -2,7 +2,8 @@
     <div class="queue-panel">
         <div class="row">
             <div class="col">
-                <h3 class="queue-header-text">{{app.getLz('term.queue')}}</h3>
+                <h3 class="queue-header-text" v-if="page == 'queue'">{{app.getLz('term.queue')}}</h3>
+                <h3 class="queue-header-text" v-if="page == 'history'">{{app.getLz('term.history')}}</h3>
             </div>
             <div class="col-auto flex-center">
                 <button class="autoplay" :style="{'background': app.mk.autoplayEnabled ? 'var(--keyColor)' : ''}"

From ae7d74e239710964bfabe2fbcfe48d5b440422d7 Mon Sep 17 00:00:00 2001
From: Jason Chen <californiaroad1@gmail.com>
Date: Mon, 30 May 2022 10:20:40 -0700
Subject: [PATCH 07/10] fixed the duration css not working

---
 src/renderer/less/elements.less | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/renderer/less/elements.less b/src/renderer/less/elements.less
index cca8ced1..4411cccc 100644
--- a/src/renderer/less/elements.less
+++ b/src/renderer/less/elements.less
@@ -340,13 +340,13 @@
   .queue-duration-info {
     display: flex;
     flex-grow: 0;
+  }
 
-    .queue-duration {
-      font-size: 14px;
-      justify-content: center;
-      min-width: 60px;
-      height: 100%;
-    }
+  .queue-duration {
+    font-size: 14px;
+    justify-content: center;
+    min-width: 60px;
+    height: 100%;
   }
 
   .queue-explicit-icon {

From d6b51d4673940188829680bb7c82b84db985f492 Mon Sep 17 00:00:00 2001
From: Jason Chen <californiaroad1@gmail.com>
Date: Fri, 17 Jun 2022 11:25:39 -0700
Subject: [PATCH 08/10] copy songs from playlist

---
 src/renderer/views/pages/cider-playlist.ejs | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/src/renderer/views/pages/cider-playlist.ejs b/src/renderer/views/pages/cider-playlist.ejs
index cb21bba6..9fbfe4ba 100644
--- a/src/renderer/views/pages/cider-playlist.ejs
+++ b/src/renderer/views/pages/cider-playlist.ejs
@@ -294,6 +294,11 @@
                 this.isInLibrary()
             })
         },
+        beforeMount() {
+            if( window.location.hash.includes("playlist") ) {
+                window.addEventListener('keydown', this.getCopiedPlayListSongs);
+            }
+        },
         watch: {
             data: {
                 handler: function () {
@@ -780,6 +785,20 @@
                 if (data && typeof data.views != "undefined") return "";
                 return "d-none";
             },
+            async getCopiedPlayListSongs(event) {
+                if( event.ctrlKey && event.keyCode === 67 ) {
+                    let urls = [];
+                    app.selectedMediaItems.forEach(item => {
+                        this.app.mk.api.v3.music(`/v1/me/library/songs/${item.id}`).then((response) => {
+                            this.app.mk.api.v3.music(`/v1/catalog/${app.mk.storefrontId}/songs/${response.data.data[0].attributes.playParams.catalogId}`).then((response1) => {
+                                urls.push(response1.data.data[0].attributes.url)
+                                navigator.clipboard.writeText(urls)
+                            })
+                        })
+                    })
+                    notyf.success(app.getLz('term.share.success'))
+                }
+            },
             search() {
                 let filtered = [];
 

From 7670d0cac149ad638c7c45e2866532f6faebbe86 Mon Sep 17 00:00:00 2001
From: Jason Chen <californiaroad1@gmail.com>
Date: Fri, 17 Jun 2022 13:41:10 -0700
Subject: [PATCH 09/10] paste songs into playlist

---
 src/renderer/views/pages/cider-playlist.ejs | 36 +++++++++++++++++++++
 1 file changed, 36 insertions(+)

diff --git a/src/renderer/views/pages/cider-playlist.ejs b/src/renderer/views/pages/cider-playlist.ejs
index 7a2cfe13..7457a9d2 100644
--- a/src/renderer/views/pages/cider-playlist.ejs
+++ b/src/renderer/views/pages/cider-playlist.ejs
@@ -297,6 +297,13 @@
         beforeMount() {
             if( window.location.hash.includes("playlist") ) {
                 window.addEventListener('keydown', this.getCopiedPlayListSongs);
+                window.addEventListener('keydown', this.pasteSongs);
+            }
+        },
+        beforeDestroy() {
+            if( window.location.hash.includes("playlist") ) {
+                window.removeEventListener('keydown', this.getCopiedPlayListSongs);
+                window.removeEventListener('keydown', this.pasteSongs);
             }
         },
         watch: {
@@ -771,6 +778,35 @@
                     notyf.success(app.getLz('term.share.success'))
                 }
             },
+            async pasteSongs(event) {
+                if( event.ctrlKey && event.keyCode === 86 ) {
+                    let clipboard = await navigator.clipboard.readText()
+                    let songs = []
+
+                    clipboard = clipboard.split(",")
+                    clipboard.forEach(item => {
+                        songs.push({
+                            id: item.substring(item.indexOf("i=")+2, item.length),
+                            type: "songs",
+                        })
+                    })
+                    
+                    this.app.mk.api.v3.music(`/v1/me/library/playlists/${this.data.id}/tracks`, {}, {
+                        fetchOptions: {
+                            method: "POST",
+                            body: JSON.stringify({
+                                data: songs
+                            })
+                        }
+                    }).then((response) => {
+                        songs.forEach(item => {
+                            this.app.mk.api.v3.music(`/v1/catalog/${app.mk.storefrontId}/songs/${item.id}`).then((response1) => {
+                                this.displayListing.push(response1.data.data[0])
+                            })
+                        })
+                    })
+                }
+            },
             search() {
                 let filtered = [];
 

From b84e3dd572a65a805469e20e26bae29727d175b8 Mon Sep 17 00:00:00 2001
From: Jason Chen <californiaroad1@gmail.com>
Date: Fri, 17 Jun 2022 14:01:13 -0700
Subject: [PATCH 10/10] check for canEdit attribute

---
 src/renderer/views/pages/cider-playlist.ejs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/renderer/views/pages/cider-playlist.ejs b/src/renderer/views/pages/cider-playlist.ejs
index 7457a9d2..7d2cfd04 100644
--- a/src/renderer/views/pages/cider-playlist.ejs
+++ b/src/renderer/views/pages/cider-playlist.ejs
@@ -779,7 +779,7 @@
                 }
             },
             async pasteSongs(event) {
-                if( event.ctrlKey && event.keyCode === 86 ) {
+                if( event.ctrlKey && event.keyCode === 86 && this.data.attributes.canEdit ) {
                     let clipboard = await navigator.clipboard.readText()
                     let songs = []