From 1b5c95643347cdf2c94a077cf132183cde143cae Mon Sep 17 00:00:00 2001
From: UnbreakCode <unbreakcode@gmail.com>
Date: Thu, 28 Apr 2022 01:35:14 +0200
Subject: [PATCH 01/51] prefer musixmatch instead of qq

---
 src/renderer/main/vueapp.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/renderer/main/vueapp.js b/src/renderer/main/vueapp.js
index c6bfe12b..7951ed66 100644
--- a/src/renderer/main/vueapp.js
+++ b/src/renderer/main/vueapp.js
@@ -2810,7 +2810,7 @@ const app = new Vue({
                                             });
                                         app.lyrics = preLrc;
                                     }
-                                    if (lrcfile != null && lrcfile != '' && lang != "disabled") {
+                                    if (lrcfile != null && lrcfile != '') {
                                         // load translation
                                         getMXMTrans(id, lang, token);
                                     } else {

From f8386a60c614c64819b78320e662cae9836ccecf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AE=A5=E5=8F=A1?=
 <46503943+jay900604@users.noreply.github.com>
Date: Fri, 29 Apr 2022 22:41:56 +0800
Subject: [PATCH 02/51] Update zh_HK.json

Update HK language.
---
 src/i18n/zh_HK.json | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/src/i18n/zh_HK.json b/src/i18n/zh_HK.json
index 64f05a03..61281797 100644
--- a/src/i18n/zh_HK.json
+++ b/src/i18n/zh_HK.json
@@ -225,6 +225,10 @@
   "settings.option.general.resumebehavior.locally.description": "Cider 將還原你在這台電腦上的最後一次操作。",
   "settings.option.general.resumebehavior.history": "歷史",
   "settings.option.general.resumebehavior.history.description": "Cider 將跨裝置將你的整個 Apple Music 歷史記錄中的最後一首歌曲排隊入列。",
+  "settings.option.general.resumetabs" : "啟動時打開的選項",
+  "settings.option.general.resumetabs.description" : "你可以選擇啟動 Cider 時要打開的選項。",
+  "settings.option.general.resumetabs.dynamic"："動態",
+  "settings.option.general.resumetabs.dynamic.description" : "Cider 將打開你上次停留的選項。",
   "settings.option.general.language": "語言",
   "settings.option.general.language.main": "語言",
   "settings.option.general.language.fun": "惡搞語言",
@@ -236,6 +240,8 @@
   "settings.option.general.updateCider.branch.develop": "測試",
   "settings.option.general.customizeSidebar": "自訂側邊欄的功能",
   "settings.option.general.customizeSidebar.customize": "自訂",
+  "settings.option.general.keybindings": "快捷操作鍵",
+  "settings.option.general.keybindings.open": "開啟",
   "settings.notyf.updateCider.update-not-available": "沒有可用的更新",
   "settings.notyf.updateCider.update-downloaded": "更新已成功下載，重啟後進行更新",
   "settings.notyf.updateCider.update-error": "更新時，發生錯誤",
@@ -281,6 +287,7 @@
   "settings.option.audio.enableAdvancedFunctionality.tunedAudioSpatialization.profile.standard": "標準",
   "settings.option.audio.enableAdvancedFunctionality.tunedAudioSpatialization.profile.audiophile": "發燒友",
   "settings.warn.audio.enableAdvancedFunctionality.audioSpatialization.compatibility": "空間音訊無法與 CAP 相容，請關閉 CAP 再進行操作。",
+  "settings.option.visual.uiscale": "介面顯示大小",
   "settings.header.visual": "外觀",
   "settings.header.visual.description": "調整 Cider 的外觀",
   "settings.option.visual.windowBackgroundStyle": "視窗背景樣式",
@@ -335,14 +342,18 @@
   "settings.option.lyrics.enableMusixmatchKaraoke": "開啟卡拉OK模式（僅限Musixmatch）",
   "settings.option.lyrics.musixmatchPreferredLanguage": "Musixmatch 歌詞語言偏好",
   "settings.option.lyrics.enableYoutubeLyrics": "播放 MV 時，使用 YouTube 歌詞",
+  "settings.option.lyrics.enableQQLyrics": "開啟 QQ 音樂的歌詞",
   "settings.header.connectivity": "外部連結",
   "settings.header.connectivity.description": "調整 Cider 與外部的連結",
   "settings.option.connectivity.discordRPC": "Discord 狀態",
   "settings.option.connectivity.playbackNotifications": "播放通知",
+  "settings.option.connectivity.discordRPC.clientName": "應用程式名稱",
   "settings.header.connectivity.discordRPC.cider": "顯示為'Cider'",
   "settings.header.connectivity.discordRPC.appleMusic": "顯示為'Apple Music'",
   "settings.option.connectivity.discordRPC.clearOnPause": "暫停時清除 Discord 狀態",
   "settings.option.connectivity.discordRPC.hideButtons": "隱藏 Discord 狀態上的按鈕",
+  "settings.option.connectivity.discordRPC.detailsFormat": "詳細資訊格式",
+  "settings.option.connectivity.discordRPC.stateFormat": "狀態格式",
   "settings.option.connectivity.lastfmScrobble": "Last.fm Scrobbling 記錄",
   "settings.option.connectivity.lastfmScrobble.delay": "Last.fm Scrobble 延遲 (%)",
   "settings.option.connectivity.lastfmScrobble.nowPlaying": "開啟 Last.fm 正在播放",
@@ -366,6 +377,9 @@
   "settings.option.visual.transparent": "透明視窗框架",
   "settings.option.visual.transparent.description": "需主題有支援透明框架，且須重新啟動才會套用。",
   "settings.header.advanced": "進階",
+  "settings.header.connect": "同步",
+  "settings.option.connect.link_account": "開啟與 Cider Connect 同步",
+  "settings.option.connect.link_account.description": "將您的 Discord 帳戶與 Cider Connect 連接後，你可以儲存使用者資料，包括設定、等化器，並最終在完成後儲存更多資料。（正在進行中）",
   "spatial.notTurnedOn": "請先在設定中開啟空間音訊。",
   "spatial.spatialProperties": "空間音訊屬性",
   "spatial.width": "闊度",

From fee89baf770b2d9d2172103814044468d1874bf3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AE=A5=E5=8F=A1?=
 <46503943+jay900604@users.noreply.github.com>
Date: Fri, 29 Apr 2022 22:43:48 +0800
Subject: [PATCH 03/51] Update zh_HK.json

---
 src/i18n/zh_HK.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/i18n/zh_HK.json b/src/i18n/zh_HK.json
index 61281797..3717198f 100644
--- a/src/i18n/zh_HK.json
+++ b/src/i18n/zh_HK.json
@@ -115,7 +115,7 @@
   "term.contributors": "貢獻者",
   "term.equalizer": "均衡器",
   "term.reset": "重設",
-  "term.tracks": "首歌曲",
+  "term.tracks": "歌曲",
   "term.videos": "MV",
   "term.menu": "選項",
   "term.check": "檢查",
@@ -227,7 +227,7 @@
   "settings.option.general.resumebehavior.history.description": "Cider 將跨裝置將你的整個 Apple Music 歷史記錄中的最後一首歌曲排隊入列。",
   "settings.option.general.resumetabs" : "啟動時打開的選項",
   "settings.option.general.resumetabs.description" : "你可以選擇啟動 Cider 時要打開的選項。",
-  "settings.option.general.resumetabs.dynamic"："動態",
+  "settings.option.general.resumetabs.dynamic" : "動態",
   "settings.option.general.resumetabs.dynamic.description" : "Cider 將打開你上次停留的選項。",
   "settings.option.general.language": "語言",
   "settings.option.general.language.main": "語言",

From f403b52af1821580a14d32be53599829574b288c Mon Sep 17 00:00:00 2001
From: Amaru8 <52407090+Amaru8@users.noreply.github.com>
Date: Fri, 29 Apr 2022 21:44:15 +0200
Subject: [PATCH 04/51] test

---
 src/renderer/assets/feather/heart-fill.svg      |  1 +
 .../views/components/mediaitem-list-item.ejs    | 17 +++++++++++++++++
 2 files changed, 18 insertions(+)
 create mode 100644 src/renderer/assets/feather/heart-fill.svg

diff --git a/src/renderer/assets/feather/heart-fill.svg b/src/renderer/assets/feather/heart-fill.svg
new file mode 100644
index 00000000..1f790aad
--- /dev/null
+++ b/src/renderer/assets/feather/heart-fill.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="currentColor" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" class="feather feather-heart"><path d="M20.84 4.61a5.5 5.5 0 0 0-7.78 0L12 5.67l-1.06-1.06a5.5 5.5 0 0 0-7.78 7.78l1.06 1.06L12 21.23l7.78-7.78 1.06-1.06a5.5 5.5 0 0 0 0-7.78z"></path></svg>
\ No newline at end of file
diff --git a/src/renderer/views/components/mediaitem-list-item.ejs b/src/renderer/views/components/mediaitem-list-item.ejs
index 0a1ab179..4348b125 100644
--- a/src/renderer/views/components/mediaitem-list-item.ejs
+++ b/src/renderer/views/components/mediaitem-list-item.ejs
@@ -67,6 +67,9 @@
             </div>
             <div class="explicit-icon" v-if="item.attributes && item.attributes.contentRating == 'explicit'"></div>
             <template v-if="showMetaData == true" @dblclick="route()">
+                <div class="metainfo" style="min-width: 70px;" v-if="getHeartStatus(item)">
+                    <div class="svg-icon" :style="{'--url': 'url(./assets/feather/heart-fill.svg)'}"></div>
+                </div>
                 <div class="metainfo">
                     {{ item.attributes.releaseDate ? new Date(item.attributes.releaseDate).toLocaleDateString()
                     : "" }}
@@ -499,6 +502,20 @@
             visibilityChanged: function (isVisible, entry) {
                 this.isVisible = isVisible
             },
+            async getHeartStatus(item) {
+                try {
+                    let rating = await app.getRating(item)
+                    if (rating == 1) {
+                        console.log(item.attributes.name + " checked for heart status! Response: true")
+                        return true;
+                    } else {
+                        console.log(item.attributes.name + " checked for heart status! Response: false")
+                        return false;
+                    } 
+                } catch (err) {
+                    console.log(err)
+                }
+            },
             addToLibrary() {
                 let item = this.item
                 if (item.attributes.playParams.id) {

From f8e66968cdea396bf9e51516d0721d5d394d939f Mon Sep 17 00:00:00 2001
From: Amaru8 <52407090+Amaru8@users.noreply.github.com>
Date: Fri, 29 Apr 2022 23:24:52 +0200
Subject: [PATCH 05/51] remove some code that doesnt work

---
 src/renderer/views/components/mediaitem-list-item.ejs | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/renderer/views/components/mediaitem-list-item.ejs b/src/renderer/views/components/mediaitem-list-item.ejs
index 4348b125..6f137150 100644
--- a/src/renderer/views/components/mediaitem-list-item.ejs
+++ b/src/renderer/views/components/mediaitem-list-item.ejs
@@ -67,7 +67,7 @@
             </div>
             <div class="explicit-icon" v-if="item.attributes && item.attributes.contentRating == 'explicit'"></div>
             <template v-if="showMetaData == true" @dblclick="route()">
-                <div class="metainfo" style="min-width: 70px;" v-if="getHeartStatus(item)">
+                <div class="metainfo" style="min-width: 70px;" v-if="getHeartStatus()">
                     <div class="svg-icon" :style="{'--url': 'url(./assets/feather/heart-fill.svg)'}"></div>
                 </div>
                 <div class="metainfo">
@@ -502,14 +502,14 @@
             visibilityChanged: function (isVisible, entry) {
                 this.isVisible = isVisible
             },
-            async getHeartStatus(item) {
+            async getHeartStatus() {
                 try {
-                    let rating = await app.getRating(item)
+                    let rating = await app.getRating(this.item)
                     if (rating == 1) {
-                        console.log(item.attributes.name + " checked for heart status! Response: true")
+                        console.log(this.item.attributes.name + " checked for heart status! Response: true")
                         return true;
                     } else {
-                        console.log(item.attributes.name + " checked for heart status! Response: false")
+                        console.log(this.item.attributes.name + " checked for heart status! Response: false")
                         return false;
                     } 
                 } catch (err) {

From 818df11f68a4e37be81a78199fd085ddb2220a7b Mon Sep 17 00:00:00 2001
From: booploops <49113086+booploops@users.noreply.github.com>
Date: Fri, 29 Apr 2022 17:31:17 -0700
Subject: [PATCH 06/51] changed some console.logs

---
 src/renderer/main/vueapp.js                   | 90 ++++++++++---------
 .../views/components/listitem-horizontal.ejs  |  2 +-
 src/renderer/views/components/menu-panel.ejs  |  2 -
 3 files changed, 49 insertions(+), 45 deletions(-)

diff --git a/src/renderer/main/vueapp.js b/src/renderer/main/vueapp.js
index bcc7dfce..647e25cb 100644
--- a/src/renderer/main/vueapp.js
+++ b/src/renderer/main/vueapp.js
@@ -234,7 +234,7 @@ const app = new Vue({
     watch: {
         cfg: {
             handler: function (val, oldVal) {
-                console.log(`cfg changed from ${oldVal} to ${val}`);
+                console.debug(`cfg changed from ${oldVal} to ${val}`);
                 ipcRenderer.send("setStore", val);
             },
             deep: true
@@ -254,6 +254,12 @@ const app = new Vue({
             app.resetState()
         }
     },
+    mounted() {
+        window.addEventListener("hashchange", function(event) {
+            let currentPath = window.location.hash.slice(1);
+            console.debug("hashchange", currentPath);
+          }, false)
+    },
     methods: {
         setTimeout(func, time) {
             return setTimeout(func, time);
@@ -268,10 +274,10 @@ const app = new Vue({
                 if (httpRequest.readyState === 4) {
                     if (httpRequest.status === 200) {
                         let response = JSON.parse(httpRequest.responseText);
-                        console.log(response);
+                        console.debug(response);
                         self.copyToClipboard(response.pageUrl)
                     } else {
-                        console.log('There was a problem with the request.');
+                        console.warn('There was a problem with the request.');
                         notyf.error(app.getLz('term.requestError'))
                     }
                 }
@@ -940,7 +946,7 @@ const app = new Vue({
             })
         },
         async setTheme(theme = "", onlyPrefs = false) {
-            console.log(theme)
+            console.debug(theme)
             if (this.cfg.visual.theme == "") {
                 this.cfg.visual.theme = "default.less"
             }
@@ -1121,15 +1127,15 @@ const app = new Vue({
             const cachedTrackMapping = await CiderCache.getCache("library-playlists-tracks")
 
             if (cachedPlaylist) {
-                console.log("using cached playlists")
+                console.debug("using cached playlists")
                 this.playlists.listing = cachedPlaylist
                 self.sortPlaylists()
             } else {
-                console.log("playlist has no cache")
+                console.debug("playlist has no cache")
             }
 
             if (cachedTrackMapping) {
-                console.log("using cached track mapping")
+                console.debug("using cached track mapping")
                 this.playlists.trackMapping = cachedTrackMapping
             }
             if (localOnly) {
@@ -1140,7 +1146,7 @@ const app = new Vue({
             this.library.backgroundNotification.show = true
 
             async function deepScan(parent = "p.playlistsroot") {
-                console.log(`scanning ${parent}`)
+                console.debug(`scanning ${parent}`)
                 const playlistData = await app.mk.api.v3.music(`/v1/me/library/playlist-folders/${parent}/children/`)
                 await asyncForEach(playlistData.data.data, async (playlist) => {
                     playlist.parent = parent
@@ -1259,7 +1265,7 @@ const app = new Vue({
             // this.darwinShare(str)
             // } else {
             notyf.success(app.getLz('term.share.success'))
-            navigator.clipboard.writeText(str).then(r => console.log("Copied to clipboard."))
+            navigator.clipboard.writeText(str).then(r => console.debug("Copied to clipboard."))
             // }
         },
         newPlaylist(name = app.getLz('term.newPlaylist'), tracks = []) {
@@ -1282,7 +1288,7 @@ const app = new Vue({
                 }
             }).then(res => {
                 res = res.data.data[0]
-                console.log(res)
+                console.debug(res)
                 self.appRoute(`playlist_` + res.id);
                 self.showingPlaylist = [];
                 self.getPlaylistFromID(app.page.substring(9), true)
@@ -1317,7 +1323,7 @@ const app = new Vue({
         },
         async showCollection(response, title, type, requestBody = {}) {
             let self = this
-            console.log(response)
+            console.debug(response)
             this.collectionList.requestBody = {}
             this.collectionList.response = response
             this.collectionList.title = title
@@ -1327,7 +1333,7 @@ const app = new Vue({
         },
         async showArtistView(artist, title, view) {
             let response = (await app.mk.api.v3.music(`/v1/catalog/${app.mk.storefrontId}/artists/${artist}/view/${view}?l=${this.mklang}`, {}, { includeResponseMeta: !0 })).data
-            console.log(response)
+            console.debug(response)
             await this.showCollection(response, title, "artists")
         },
         async showRecordLabelView(label, title, view) {
@@ -1367,7 +1373,7 @@ const app = new Vue({
                 includeResponseMeta: !0
             })
 
-            console.log('searchres', response)
+            console.debug('searchres', response)
             let responseFormat = {
                 data: response.data.results[group].data,
                 next: response.data.results[group].next,
@@ -1421,13 +1427,13 @@ const app = new Vue({
             app.mk.api.v3.music(`/v1/me/library/playlists/${id}`, params).then(res => {
                 self.getPlaylistContinuous(res, transient)
             }).catch((e) => {
-                console.log(e);
+                console.debug(e);
                 try {
                     app.mk.api.v3.music(`/v1/catalog/${app.mk.storefrontId}/playlists/${id}`, params).then(res => {
                         self.getPlaylistContinuous(res, transient)
                     })
                 } catch (err) {
-                    console.log(err)
+                    console.debug(err)
                 }
             })
 
@@ -1444,7 +1450,7 @@ const app = new Vue({
                 "art[url]": "f",
                 l: this.mklang
             }, { includeResponseMeta: !0 })
-            console.log(artistData.data.data[0])
+            console.debug(artistData.data.data[0])
             this.artistPage.data = artistData.data.data[0]
             this.page = "artist-page"
         },
@@ -1479,12 +1485,12 @@ const app = new Vue({
                 "meta": {}
             }
             if (response.next) {
-                console.log("has next")
+                console.debug("has next")
                 returnData.data.concat(response.data)
                 returnData.meta = response.meta
                 return await this.getRecursive(await response.next())
             } else {
-                console.log("no next")
+                console.debug("no next")
                 returnData.data.concat(response.data)
                 return returnData
             }
@@ -1624,7 +1630,7 @@ const app = new Vue({
                 window.location.hash = `${kind}/${id}`
                 document.querySelector("#app-content").scrollTop = 0
             } else if (kind == "editorial-elements") {
-                console.log(item)
+                console.debug(item)
                 if (item.relationships?.contents?.data != null && item.relationships?.contents?.data.length > 0) {
                     this.routeView(item.relationships.contents.data[0])
                 } else if (item.attributes?.link?.url != null) {
@@ -1752,12 +1758,12 @@ const app = new Vue({
                         try {
                             if (artistQuery.artists.data.length > 0) {
                                 artistId = artistQuery.artists.data[0].id;
-                                console.log(artistId)
+                                console.debug(artistId)
                             }
                         } catch (e) {
                         }
                     }
-                    console.log(artistId);
+                    console.debug(artistId);
                     if (artistId != "")
                         self.appRoute(`artist/${artistId}`)
                     break;
@@ -1789,7 +1795,7 @@ const app = new Vue({
                             })).data.results;
                             if (albumQuery.albums.data.length > 0) {
                                 albumId = albumQuery.albums.data[0].id;
-                                console.log(albumId)
+                                console.debug(albumId)
                             }
                         } catch (e) {
                         }
@@ -1813,7 +1819,7 @@ const app = new Vue({
                             })).data.results;
                             if (labelQuery["record-labels"].data.length > 0) {
                                 labelId = labelQuery["record-labels"].data[0].id;
-                                console.log(labelId)
+                                console.debug(labelId)
                             }
                         } catch (e) {
                         }
@@ -1846,7 +1852,7 @@ const app = new Vue({
             }
         },
         followingArtist(id) {
-            console.log(`check for ${id}`)
+            console.debug(`check for ${id}`)
             return this.cfg.home.followedArtists.includes(id)
         },
         playMediaItem(item) {
@@ -1876,7 +1882,7 @@ const app = new Vue({
             try {
                 a = await this.mkapi(kind.toString(), isLibrary, id.toString(), params, params2);
             } catch (e) {
-                console.log(e);
+                console.debug(e);
                 try {
                     a = await this.mkapi(kind.toString(), !isLibrary, id.toString(), params, params2);
                 } catch (err) {
@@ -2131,7 +2137,7 @@ const app = new Vue({
                     return await this.mk.api.v3.music(`/v1/catalog/${app.mk.storefrontId}/${truemethod}/${term.toString()}`, params, params2)
                 }
             } catch (e) {
-                console.log(e)
+                console.debug(e)
                 return await this.mkapi(method, library, term, params, params2, attempts + 1)
             }
         },
@@ -2183,7 +2189,7 @@ const app = new Vue({
                     l: app.mklang,
                 },
                 onProgress: (data) => {
-                    console.log(`${data.total}/${data.response.data.meta.total}`)
+                    console.debug(`${data.total}/${data.response.data.meta.total}`)
                     self.library.backgroundNotification.show = true
                     self.library.backgroundNotification.message = app.getLz('notification.updatingLibrarySongs')
                     self.library.backgroundNotification.total = data.response.data.meta.total
@@ -2199,7 +2205,7 @@ const app = new Vue({
             self.library.backgroundNotification.show = false
             self.searchLibrarySongs()
             CiderCache.putCache(cacheId, library)
-            console.log("Done!")
+            console.debug("Done!")
 
             return
         },
@@ -2250,7 +2256,7 @@ const app = new Vue({
                     app.mk.api.v3.music(`/v1/me/library/albums/`, params).then((response) => {
                         processChunk(response.data)
                     }).catch((error) => {
-                        console.log('safe loading');
+                        console.debug('safe loading');
                         app.mk.api.v3.music(`/v1/me/library/albums/`, safeparams).then((response) => {
                             processChunk(response.data)
                         }).catch((error) => {
@@ -2264,7 +2270,7 @@ const app = new Vue({
                         app.mk.api.v3.music(downloaded.next, params).then((response) => {
                             processChunk(response.data)
                         }).catch((error) => {
-                            console.log('safe loading');
+                            console.debug('safe loading');
                             app.mk.api.v3.music(downloaded.next, safeparams).then((response) => {
                                 processChunk(response.data)
                             }).catch((error) => {
@@ -2274,7 +2280,7 @@ const app = new Vue({
                             })
                         })
                     } else {
-                        console.log("Download next", downloaded.next)
+                        console.debug("Download next", downloaded.next)
                     }
                 }
             }
@@ -2291,7 +2297,7 @@ const app = new Vue({
                     return
                 }
                 if (typeof downloaded.next == "undefined") {
-                    console.log("downloaded.next is undefined")
+                    console.debug("downloaded.next is undefined")
                     self.library.albums.listing = library
                     self.library.albums.downloadState = 2
                     self.library.backgroundNotification.show = false
@@ -2299,7 +2305,7 @@ const app = new Vue({
                     self.searchLibraryAlbums(index)
                 }
                 if (downloaded.meta.total > library.length || typeof downloaded.meta.next != "undefined") {
-                    console.log(`downloading next chunk - ${library.length
+                    console.debug(`downloading next chunk - ${library.length
                         } albums so far`)
                     downloadChunk()
                 } else {
@@ -2357,7 +2363,7 @@ const app = new Vue({
                     app.mk.api.v3.music(`/v1/me/library/artists/`, params).then((response) => {
                         processChunk(response.data)
                     }).catch((error) => {
-                        console.log('safe loading');
+                        console.debug('safe loading');
                         app.mk.api.v3.music(`/v1/me/library/artists/`, safeparams).then((response) => {
                             processChunk(response.data)
                         }).catch((error) => {
@@ -2485,7 +2491,7 @@ const app = new Vue({
                     reload: !0
                 })).data;
                 this.listennow.timestamp = Date.now()
-                console.log(this.listennow)
+                console.debug(this.listennow)
             } catch (e) {
                 console.log(e)
                 this.getListenNow(attempt + 1)
@@ -2513,7 +2519,7 @@ const app = new Vue({
                 });
                 this.browsepage = browse.data.data[0];
                 this.browsepage.timestamp = Date.now()
-                console.log(this.browsepage)
+                console.debug(this.browsepage)
             } catch (e) {
                 console.log(e)
                 this.getBrowsePage(attempt + 1)
@@ -2714,7 +2720,7 @@ const app = new Vue({
                             if (status2 == 200) {
                                 let token = jsonResponse["message"]["body"]["user_token"] ?? '';
                                 if (token != "" && token != "UpgradeOnlyUpgradeOnlyUpgradeOnlyUpgradeOnly") {
-                                    console.log('200 token', mode);
+                                    console.debug('200 token', mode);
                                     // token good
                                     app.mxmtoken = token;
 
@@ -2724,7 +2730,7 @@ const app = new Vue({
                                         getMXMTrans(songid, lang, app.mxmtoken);
                                     }
                                 } else {
-                                    console.log('fake 200 token');
+                                    console.debug('fake 200 token');
                                     getToken(mode, track, artist, songid, lang, time)
                                 }
                             } else {
@@ -2759,7 +2765,7 @@ const app = new Vue({
                 req.onload = function () {
                     try {
                         let jsonResponse = JSON.parse(this.responseText);
-                        console.log(jsonResponse);
+                        console.debug(jsonResponse);
                         let status1 = jsonResponse["message"]["header"]["status_code"];
 
                         if (status1 == 200) {
@@ -3145,7 +3151,7 @@ const app = new Vue({
         },
         playMediaItemById(id, kind, isLibrary, raurl = "") {
             let truekind = (!kind.endsWith("s")) ? (kind + "s") : kind;
-            console.log(id, truekind, isLibrary)
+            console.debug(id, truekind, isLibrary)
             try {
                 if (truekind.includes("artist")) {
                     app.mk.setStationQueue({ artist: 'a-' + id }).then(() => {
@@ -3770,7 +3776,7 @@ const app = new Vue({
         volumeUp() {
             if ((app.mk.volume + app.cfg.audio.volumeStep) > app.cfg.audio.maxVolume) {
                 app.mk.volume = app.cfg.audio.maxVolume;
-                console.log('setting max volume')
+                console.debug('setting max volume')
             } else {
                 console.log('volume up')
                 app.mk.volume = ((app.mk.volume * 100) + (app.cfg.audio.volumeStep * 100)) / 100
@@ -3779,7 +3785,7 @@ const app = new Vue({
         volumeDown() {
             if ((app.mk.volume - app.cfg.audio.volumeStep) < 0) {
                 app.mk.volume = 0;
-                console.log('setting volume to 0')
+                console.debug('setting volume to 0')
             } else {
                 console.log('volume down')
                 app.mk.volume = ((app.mk.volume * 100) - (app.cfg.audio.volumeStep * 100)) / 100
diff --git a/src/renderer/views/components/listitem-horizontal.ejs b/src/renderer/views/components/listitem-horizontal.ejs
index ba00fe6f..25296c47 100644
--- a/src/renderer/views/components/listitem-horizontal.ejs
+++ b/src/renderer/views/components/listitem-horizontal.ejs
@@ -40,7 +40,7 @@
             this.itemPages = app.arrayToChunk(this.items, 4);
             try{
             this.simplifiedParent = JSON.stringify(this.items.map ( function(x){return x.attributes.playParams}));
-            console.log("simplifiedParent: " + this.simplifiedParent);
+            console.debug("simplifiedParent: " + this.simplifiedParent);
             }
             catch (e){}
             
diff --git a/src/renderer/views/components/menu-panel.ejs b/src/renderer/views/components/menu-panel.ejs
index 28295375..b6908ed0 100644
--- a/src/renderer/views/components/menu-panel.ejs
+++ b/src/renderer/views/components/menu-panel.ejs
@@ -54,7 +54,6 @@
             }
         },
         mounted() {
-            console.log("MOUNTED")
             if (this.event) {
                 this.position = [this.event.clientX, this.event.clientY];
             }
@@ -81,7 +80,6 @@
             },
             getStyle() {
                 let style = {}
-                console.debug(this.$refs.menubody)
                 this.size = [this.$refs.menubody.offsetWidth, this.$refs.menubody.offsetHeight];
                 if (this.event) {
                     style["position"] = "absolute";

From 988282845f2221cc3e286d10aa0e58f0ddca18f6 Mon Sep 17 00:00:00 2001
From: booploops <49113086+booploops@users.noreply.github.com>
Date: Fri, 29 Apr 2022 18:00:50 -0700
Subject: [PATCH 07/51] isolated playlist_ and album_ to allow for future
 routing for other pages

---
 src/renderer/main/vueapp.js | 28 ++++++++--------------------
 1 file changed, 8 insertions(+), 20 deletions(-)

diff --git a/src/renderer/main/vueapp.js b/src/renderer/main/vueapp.js
index 647e25cb..d6dfb6cd 100644
--- a/src/renderer/main/vueapp.js
+++ b/src/renderer/main/vueapp.js
@@ -255,10 +255,10 @@ const app = new Vue({
         }
     },
     mounted() {
-        window.addEventListener("hashchange", function(event) {
+        window.addEventListener("hashchange", function (event) {
             let currentPath = window.location.hash.slice(1);
             console.debug("hashchange", currentPath);
-          }, false)
+        }, false)
     },
     methods: {
         setTimeout(func, time) {
@@ -1671,28 +1671,16 @@ const app = new Vue({
                     params["meta[albums:tracks]"] = 'popularity'
                     params["fields[albums]"] = "artistName,artistUrl,artwork,contentRating,editorialArtwork,editorialNotes,editorialVideo,name,playParams,releaseDate,url,copyright"
                 }
-
-                // if (this.cfg.advanced.experiments.includes('inline-playlists')) {
-                if (false) {
-                    let showModal = kind.toString().includes("album") || kind.toString().includes("playlist")
-                    if (app.page.includes("playlist") || app.page.includes("album")) {
-                        showModal = false
-                    }
-                    if (showModal) {
-                        app.modals.showPlaylist = true
-                        app.chrome.contentAreaScrolling = false
-                    } else {
-                        app.page = (kind) + "_" + (id);
-                        window.location.hash = `${kind}/${id}${isLibrary ? "/" + isLibrary : ''}`
-                    }
-                } else {
+                if(kind.includes("playlist") || kind.includes("album")){
                     app.page = (kind) + "_" + (id);
                     window.location.hash = `${kind}/${id}${isLibrary ? "/" + isLibrary : ''}`
+                    app.getTypeFromID((kind), (id), (isLibrary), params);
+                }else{
+                    app.page = (kind)
+                    window.location.hash = `${kind}/${id}${isLibrary ? "/" + isLibrary : ''}`
                 }
 
-
-                app.getTypeFromID((kind), (id), (isLibrary), params);
-                // document.querySelector("#app-content").scrollTop = 0
+                // app.getTypeFromID((kind), (id), (isLibrary), params);
             } else {
                 app.playMediaItemById((id), (kind), (isLibrary), item.attributes.url ?? '')
             }

From 4dc96056a2637978dc16809773f4dd86856e97e8 Mon Sep 17 00:00:00 2001
From: booploops <49113086+booploops@users.noreply.github.com>
Date: Fri, 29 Apr 2022 18:14:44 -0700
Subject: [PATCH 08/51] settings tabs now remember their previous state

---
 src/renderer/views/pages/settings.ejs | 588 +++++++++++++-------------
 1 file changed, 303 insertions(+), 285 deletions(-)

diff --git a/src/renderer/views/pages/settings.ejs b/src/renderer/views/pages/settings.ejs
index bacca2d8..5e4fc9c5 100644
--- a/src/renderer/views/pages/settings.ejs
+++ b/src/renderer/views/pages/settings.ejs
@@ -1,6 +1,6 @@
 <script type="text/x-template" id="cider-settings">
     <div class="content-inner settings-page">
-        <b-tabs pills fill content-class="mt-3">
+        <b-tabs pills fill content-class="mt-3" v-model="tabIndex">
             <b-tab :title="$root.getLz('settings.header.general')" active>
                 <div class="md-option-container">
                     <!-- General Settings -->
@@ -1410,10 +1410,10 @@
 </script>
 
 <script>
-	// do not translate
-	Vue.component('stylestack-editor', {
-		/*html*/
-		template: `
+    // do not translate
+    Vue.component('stylestack-editor', {
+        /*html*/
+        template: `
             <div class="stylestack-editor">
                 <draggable class="list-group" v-model="$root.cfg.visual.styles" @end="$root.reloadStyles()">
                     <b-list-group-item variant="dark" v-for="theme in $root.cfg.visual.styles" :key="theme">
@@ -1439,290 +1439,308 @@
                 </draggable>    
             </div>
         `,
-		props: {
-			themes: {
-				type: Array,
-				default: []
-			}
-		},
-		data: function () {
-			return {
-				selected: null,
-				newTheme: null,
-				themeList: []
-			}
-		},
-		mounted() {
-			this.themeList = [...this.themes]
-			this.themeList.unshift({
-				name: "Acrylic Grain",
-				file: "grain.less"
-			})
-			this.themeList.unshift({
-				name: "Sweetener",
-				file: "sweetener.less"
-			})
-			this.themeList.unshift({
-				name: "Reduce Visuals",
-				file: "reduce_visuals.less"
-			})
-			this.themeList.unshift({
-				name: "Inline Drawer",
-				file: "inline_drawer.less"
-			})
-		},
-		methods: {
-			gitHubExplore() {
-				this.$root.appRoute("themes-github")
-			},
-			getThemeName(filename) {
-				try {
-					return this.themeList.find(theme => theme.file === filename).name;
-				} catch (e) {
-					return filename;
-				}
-			},
-			moveUp() {
-				const styles = this.$root.cfg.visual.styles
-				const index = styles.indexOf(this.selected)
-				if (index > 0) {
-					styles.splice(index, 1)
-					styles.splice(index - 1, 0, this.selected)
-				}
-				this.$root.reloadStyles()
-			},
-			moveDown() {
-				const styles = this.$root.cfg.visual.styles
-				const index = styles.indexOf(this.selected)
-				if (index < styles.length - 1) {
-					styles.splice(index, 1)
-					styles.splice(index + 1, 0, this.selected)
-				}
-				this.$root.reloadStyles()
-			},
-			remove(style) {
-				const styles = this.$root.cfg.visual.styles
-				const index = styles.indexOf(style)
-				styles.splice(index, 1)
-				this.$root.reloadStyles()
-			},
-			addStyle(style) {
-				const styles = this.$root.cfg.visual.styles
-				styles.push(style)
-				this.$root.reloadStyles()
-			}
-		}
-	})
+        props: {
+            themes: {
+                type: Array,
+                default: []
+            }
+        },
+        data: function () {
+            return {
+                selected: null,
+                newTheme: null,
+                themeList: []
+            }
+        },
+        mounted() {
+            this.themeList = [...this.themes]
+            this.themeList.unshift({
+                name: "Acrylic Grain",
+                file: "grain.less"
+            })
+            this.themeList.unshift({
+                name: "Sweetener",
+                file: "sweetener.less"
+            })
+            this.themeList.unshift({
+                name: "Reduce Visuals",
+                file: "reduce_visuals.less"
+            })
+            this.themeList.unshift({
+                name: "Inline Drawer",
+                file: "inline_drawer.less"
+            })
+        },
+        methods: {
+            gitHubExplore() {
+                this.$root.appRoute("themes-github")
+            },
+            getThemeName(filename) {
+                try {
+                    return this.themeList.find(theme => theme.file === filename).name;
+                } catch (e) {
+                    return filename;
+                }
+            },
+            moveUp() {
+                const styles = this.$root.cfg.visual.styles
+                const index = styles.indexOf(this.selected)
+                if (index > 0) {
+                    styles.splice(index, 1)
+                    styles.splice(index - 1, 0, this.selected)
+                }
+                this.$root.reloadStyles()
+            },
+            moveDown() {
+                const styles = this.$root.cfg.visual.styles
+                const index = styles.indexOf(this.selected)
+                if (index < styles.length - 1) {
+                    styles.splice(index, 1)
+                    styles.splice(index + 1, 0, this.selected)
+                }
+                this.$root.reloadStyles()
+            },
+            remove(style) {
+                const styles = this.$root.cfg.visual.styles
+                const index = styles.indexOf(style)
+                styles.splice(index, 1)
+                this.$root.reloadStyles()
+            },
+            addStyle(style) {
+                const styles = this.$root.cfg.visual.styles
+                styles.push(style)
+                this.$root.reloadStyles()
+            }
+        }
+    })
 </script>
 
 <script>
-	Vue.component('cider-settings', {
-		template: "#cider-settings",
-		props: [],
-		data: function () {
-			return {
-				app: this.$root,
-				themes: ipcRenderer.sendSync("get-themes")
-			}
-		},
-		mounted: function () {
-			if (app.cfg.lastfm.enabled) {
-				const element = document.getElementById('lfmConnect');
-				if (element) {
-					element.innerHTML = `Disconnect\n<p style="font-size: 8px"><i>(Authed: ${app.cfg.lastfm.auth_token})</i></p>`;
-					element.onclick = app.LastFMDeauthorize;
-				}
-			}
-		},
-		methods: {
-			windowBgStyleChange() {
-				this.$root.getNowPlayingArtworkBG(undefined, true)
-				if (this.$root.cfg.visual.window_background_style === "mica") {
-					this.$root.spawnMica()
-				}
-			},
-			reinstallWidevineCDM() {
-				bootbox.confirm(app.getLz("settings.option.experimental.reinstallwidevine.confirm"), (ok) => {
-					if (ok) {
-						ipcRenderer.invoke("reinstall-widevine-cdm");
-					}
-				})
-			},
-			keyBindUpdate: function (action) {
-				const blur = document.createElement('div');
-				blur.className = 'blur';
-				blur.style.backgroundColor = 'rgba(0,0,0,0.25)';
-				blur.style.position = 'fixed';
-				blur.style.top = '0';
-				blur.style.left = '0';
-				blur.style.width = '100%';
-				blur.style.height = '100%';
-				blur.style.zIndex = '9999';
-				blur.style.display = 'flex';
-				blur.style.alignItems = 'center';
-				blur.style.justifyContent = 'center';
-				blur.style.fontSize = '2em';
-				blur.style.color = 'white';
-				blur.innerHTML = 'Press a combination of two keys to update keybinding. Press Escape key to go back.'
-				document.body.appendChild(blur);
+    Vue.component('cider-settings', {
+        template: "#cider-settings",
+        props: [],
+        data: function () {
+            return {
+                app: this.$root,
+                themes: ipcRenderer.sendSync("get-themes"),
+                tabIndex: 0,
+                canChangeHash: false
+            }
+        }, watch: {
+            tabIndex: function (val) {
+                if (this.canChangeHash) {
+                    window.location.hash = `#settings/${val}`
+                }
+            }
+        },
+        mounted: function () {
+            this.$nextTick(function () {
+                if (window.location.hash.split("/").length > 1) {
+                    this.tabIndex = parseInt(window.location.hash.split("/")[1])
+                    console.debug("tabIndex", this.tabIndex)
+                    this.canChangeHash = true
+                }else{
+                    this.canChangeHash = true
+                }
+            })
 
-				let keyBind = [];
-				const keyBindTimeout = setTimeout(function () {
-					keyBind = [];
-					document.body.removeChild(blur);
-				}, 30000);
-				const keyBindUpdate = function (e) {
-					if (document.body.contains(blur)) {
-						if (e.key == 'Escape') {
-							document.body.removeChild(blur);
-							clearTimeout(keyBindTimeout);
-							return;
-						} else {
-							if (e.keyCode >= 65 && e.keyCode <= 90 && e.keyCode <= 97 && e.keyCode <= 122) {
-								keyBind.push(e.key.toUpperCase());
-							} else {
-								keyBind.push(e.key);
-							}
-							if (keyBind.length === 2) {
-								if (keyBind[0] !== keyBind[1]) {
-									app.cfg.general.keybindings[action] = keyBind
-									document.body.removeChild(blur);
-									clearTimeout(keyBindTimeout);
-									notyf.success(app.getLz('settings.notyf.general.keybindings.update.success'));
-									bootbox.confirm(app.getLz("settings.prompt.general.keybindings.update.success"), (ok) => {
-										if (ok) ipcRenderer.invoke("relaunchApp")
-									})
-								} else {
-									keyBind = [];
-								}
-							}
-						}
-					}
-				};
-				document.addEventListener('keydown', keyBindUpdate);
-			},
-			keyBindReset: function () {
-				app.cfg.general.keybindings.search = [app.platform == "darwin" ? "Command" : "Control", "S"];
-				app.cfg.general.keybindings.albums = [app.platform == "darwin" ? "Command" : "Control", "F"];
-				app.cfg.general.keybindings.artists = [app.platform == "darwin" ? "Command" : "Control", "D"];
-				app.cfg.general.keybindings.browse = [app.platform == "darwin" ? "Command" : "Control", "B"];
-				app.cfg.general.keybindings.togglePrivateSession = [app.platform == "darwin" ? "Command" : "Control", "P"];
-				app.cfg.general.keybindings.webRemote = [app.platform == "darwin" ? "Command" : "Control", "W"];
-				app.cfg.general.keybindings.audioSettings = [app.platform == "darwin" ? "Option" : "Shift", "A"];
-				app.cfg.general.keybindings.pluginMenu = [app.platform == "darwin" ? "Option" : "Shift", "P"];
-				app.cfg.general.keybindings.castToDevices = [app.platform == "darwin" ? "Option" : "Shift", "C"];
-				app.cfg.general.keybindings.settings = [app.platform == "darwin" ? "Option" : "Shift", "S"];
-				app.cfg.general.keybindings.openDeveloperTools = [app.platform == "darwin" ? "Command" : "Control", app.platform == "darwin" ? "Option" : "Shift", "I"];
-				notyf.success(app.getLz('settings.notyf.general.keybindings.update.success'));
-				bootbox.confirm(app.getLz("settings.prompt.general.keybindings.update.success"), (ok) => {
-					if (ok) ipcRenderer.invoke("relaunchApp")
-				})
-			},
-			gitHubExplore() {
-				app.appRoute("themes-github")
-			},
-			copyLogs() {
-				ipcRenderer.send('fetch-log')
-				notyf.success(app.getLz('term.share.success'));
-			},
-			openAppData() {
-				ipcRenderer.send('open-appdata')
-			},
-			getLanguages: function () {
-				let langs = this.$root.lzListing
-				let categories = {
-					"main": [],
-					"fun": [],
-					"unsorted": []
-				}
-				// sort by category if category is undefined or empty put it in "unsorted"
-				for (let i = 0; i < langs.length; i++) {
-					if (langs[i].category === undefined || langs[i].category === "") {
-						categories.unsorted.push(langs[i])
-					} else {
-						categories[langs[i].category].push(langs[i])
-					}
-				}
-				// return
-				return categories
-			},
-			addExperiment(flag) {
-				app.cfg.advanced.experiments.push(flag);
-			},
-			removeExperiment(flag) {
-				app.cfg.advanced.experiments.splice(app.cfg.advanced.experiments.indexOf(flag), 1);
-			},
-			toggleAudioContext: function () {
-				if (app.cfg.advanced.AudioContext === true) {
-					if (navigator.hardwareConcurrency < 6) {
-						bootbox.confirm(app.getLz("settings.warn.audio.enableAdvancedFunctionality.lowcores"), function (result) {
-							if (result) {
-								CiderAudio.init();
-								if (app.cfg.audio.normalization === true) {
-									CiderAudio.normalizerOn()
-								}
-								if (app.cfg.audio.spatial === true) {
-									CiderAudio.spatialOn()
-									CiderAudio.hierarchical_loading();
-								}
-							}
-						})
-					} else {
-						CiderAudio.init();
-						if (app.cfg.audio.normalization === true) {
-							CiderAudio.normalizerOn()
-						}
-						if (app.cfg.audio.spatial === true) {
-							CiderAudio.spatialOn()
-							CiderAudio.hierarchical_loading();
-						}
-					}
-				} else {
-					CiderAudio.off();
-				}
-			},
-			toggleNormalization: function () {
-				if (app.cfg.audio.normalization) {
-					CiderAudio.normalizerOn()
-				} else {
-					CiderAudio.normalizerOff()
-				}
-			},
-			changeAudioQuality: function () {
-				1
-				app.mk.bitrate = MusicKit.PlaybackBitrate[app.cfg.audio.quality];
-			},
-			toggleUserInfo: function () {
-				app.chrome.hideUserInfo = !app.cfg.visual.showuserinfo
-			},
-			sendDataToMTT: function () {
-				ipcRenderer.invoke('setStoreValue', 'general.close_behavior', app.cfg.general.close_behavior);
-				//  setStoreValue does not change plugin store values somehow
-				ipcRenderer.invoke('update-store-mtt', app.cfg.general.close_behavior);
-			},
-			checkIfUpdateDisabled() {
-				if (app.cfg.main.UPDATABLE) return;
+            if (app.cfg.lastfm.enabled) {
+                const element = document.getElementById('lfmConnect');
+                if (element) {
+                    element.innerHTML = `Disconnect\n<p style="font-size: 8px"><i>(Authed: ${app.cfg.lastfm.auth_token})</i></p>`;
+                    element.onclick = app.LastFMDeauthorize;
+                }
+            }
+        },
+        methods: {
+            windowBgStyleChange() {
+                this.$root.getNowPlayingArtworkBG(undefined, true)
+                if (this.$root.cfg.visual.window_background_style === "mica") {
+                    this.$root.spawnMica()
+                }
+            },
+            reinstallWidevineCDM() {
+                bootbox.confirm(app.getLz("settings.option.experimental.reinstallwidevine.confirm"), (ok) => {
+                    if (ok) {
+                        ipcRenderer.invoke("reinstall-widevine-cdm");
+                    }
+                })
+            },
+            keyBindUpdate: function (action) {
+                const blur = document.createElement('div');
+                blur.className = 'blur';
+                blur.style.backgroundColor = 'rgba(0,0,0,0.25)';
+                blur.style.position = 'fixed';
+                blur.style.top = '0';
+                blur.style.left = '0';
+                blur.style.width = '100%';
+                blur.style.height = '100%';
+                blur.style.zIndex = '9999';
+                blur.style.display = 'flex';
+                blur.style.alignItems = 'center';
+                blur.style.justifyContent = 'center';
+                blur.style.fontSize = '2em';
+                blur.style.color = 'white';
+                blur.innerHTML = 'Press a combination of two keys to update keybinding. Press Escape key to go back.'
+                document.body.appendChild(blur);
 
-				let updateFields = document.getElementsByClassName('update-check');
-				for (let i = 0; i < updateFields.length; i++) {
-					updateFields[i].style = "opacity: 0.5; pointer-events: none;";
-					updateFields[i].title = "Not available on this type of build";
-				}
+                let keyBind = [];
+                const keyBindTimeout = setTimeout(function () {
+                    keyBind = [];
+                    document.body.removeChild(blur);
+                }, 30000);
+                const keyBindUpdate = function (e) {
+                    if (document.body.contains(blur)) {
+                        if (e.key == 'Escape') {
+                            document.body.removeChild(blur);
+                            clearTimeout(keyBindTimeout);
+                            return;
+                        } else {
+                            if (e.keyCode >= 65 && e.keyCode <= 90 && e.keyCode <= 97 && e.keyCode <= 122) {
+                                keyBind.push(e.key.toUpperCase());
+                            } else {
+                                keyBind.push(e.key);
+                            }
+                            if (keyBind.length === 2) {
+                                if (keyBind[0] !== keyBind[1]) {
+                                    app.cfg.general.keybindings[action] = keyBind
+                                    document.body.removeChild(blur);
+                                    clearTimeout(keyBindTimeout);
+                                    notyf.success(app.getLz('settings.notyf.general.keybindings.update.success'));
+                                    bootbox.confirm(app.getLz("settings.prompt.general.keybindings.update.success"), (ok) => {
+                                        if (ok) ipcRenderer.invoke("relaunchApp")
+                                    })
+                                } else {
+                                    keyBind = [];
+                                }
+                            }
+                        }
+                    }
+                };
+                document.addEventListener('keydown', keyBindUpdate);
+            },
+            keyBindReset: function () {
+                app.cfg.general.keybindings.search = [app.platform == "darwin" ? "Command" : "Control", "S"];
+                app.cfg.general.keybindings.albums = [app.platform == "darwin" ? "Command" : "Control", "F"];
+                app.cfg.general.keybindings.artists = [app.platform == "darwin" ? "Command" : "Control", "D"];
+                app.cfg.general.keybindings.browse = [app.platform == "darwin" ? "Command" : "Control", "B"];
+                app.cfg.general.keybindings.togglePrivateSession = [app.platform == "darwin" ? "Command" : "Control", "P"];
+                app.cfg.general.keybindings.webRemote = [app.platform == "darwin" ? "Command" : "Control", "W"];
+                app.cfg.general.keybindings.audioSettings = [app.platform == "darwin" ? "Option" : "Shift", "A"];
+                app.cfg.general.keybindings.pluginMenu = [app.platform == "darwin" ? "Option" : "Shift", "P"];
+                app.cfg.general.keybindings.castToDevices = [app.platform == "darwin" ? "Option" : "Shift", "C"];
+                app.cfg.general.keybindings.settings = [app.platform == "darwin" ? "Option" : "Shift", "S"];
+                app.cfg.general.keybindings.openDeveloperTools = [app.platform == "darwin" ? "Command" : "Control", app.platform == "darwin" ? "Option" : "Shift", "I"];
+                notyf.success(app.getLz('settings.notyf.general.keybindings.update.success'));
+                bootbox.confirm(app.getLz("settings.prompt.general.keybindings.update.success"), (ok) => {
+                    if (ok) ipcRenderer.invoke("relaunchApp")
+                })
+            },
+            gitHubExplore() {
+                app.appRoute("themes-github")
+            },
+            copyLogs() {
+                ipcRenderer.send('fetch-log')
+                notyf.success(app.getLz('term.share.success'));
+            },
+            openAppData() {
+                ipcRenderer.send('open-appdata')
+            },
+            getLanguages: function () {
+                let langs = this.$root.lzListing
+                let categories = {
+                    "main": [],
+                    "fun": [],
+                    "unsorted": []
+                }
+                // sort by category if category is undefined or empty put it in "unsorted"
+                for (let i = 0; i < langs.length; i++) {
+                    if (langs[i].category === undefined || langs[i].category === "") {
+                        categories.unsorted.push(langs[i])
+                    } else {
+                        categories[langs[i].category].push(langs[i])
+                    }
+                }
+                // return
+                return categories
+            },
+            addExperiment(flag) {
+                app.cfg.advanced.experiments.push(flag);
+            },
+            removeExperiment(flag) {
+                app.cfg.advanced.experiments.splice(app.cfg.advanced.experiments.indexOf(flag), 1);
+            },
+            toggleAudioContext: function () {
+                if (app.cfg.advanced.AudioContext === true) {
+                    if (navigator.hardwareConcurrency < 6) {
+                        bootbox.confirm(app.getLz("settings.warn.audio.enableAdvancedFunctionality.lowcores"), function (result) {
+                            if (result) {
+                                CiderAudio.init();
+                                if (app.cfg.audio.normalization === true) {
+                                    CiderAudio.normalizerOn()
+                                }
+                                if (app.cfg.audio.spatial === true) {
+                                    CiderAudio.spatialOn()
+                                    CiderAudio.hierarchical_loading();
+                                }
+                            }
+                        })
+                    } else {
+                        CiderAudio.init();
+                        if (app.cfg.audio.normalization === true) {
+                            CiderAudio.normalizerOn()
+                        }
+                        if (app.cfg.audio.spatial === true) {
+                            CiderAudio.spatialOn()
+                            CiderAudio.hierarchical_loading();
+                        }
+                    }
+                } else {
+                    CiderAudio.off();
+                }
+            },
+            toggleNormalization: function () {
+                if (app.cfg.audio.normalization) {
+                    CiderAudio.normalizerOn()
+                } else {
+                    CiderAudio.normalizerOff()
+                }
+            },
+            changeAudioQuality: function () {
+                1
+                app.mk.bitrate = MusicKit.PlaybackBitrate[app.cfg.audio.quality];
+            },
+            toggleUserInfo: function () {
+                app.chrome.hideUserInfo = !app.cfg.visual.showuserinfo
+            },
+            sendDataToMTT: function () {
+                ipcRenderer.invoke('setStoreValue', 'general.close_behavior', app.cfg.general.close_behavior);
+                //  setStoreValue does not change plugin store values somehow
+                ipcRenderer.invoke('update-store-mtt', app.cfg.general.close_behavior);
+            },
+            checkIfUpdateDisabled() {
+                if (app.cfg.main.UPDATABLE) return;
 
-			},
-			promptForRelaunch() {
-				bootbox.confirm(app.getLz('action.relaunch.confirm'), function (result) {
-					if (result) {
-						ipcRenderer.send('relaunchApp', '');
-					}
-				});
-			},
-			authCC() {
-				ipcRenderer.send('cc-auth')
-			},
-			logoutCC() {
-				ipcRenderer.send('cc-logout')
-			},
-		}
-	})
+                let updateFields = document.getElementsByClassName('update-check');
+                for (let i = 0; i < updateFields.length; i++) {
+                    updateFields[i].style = "opacity: 0.5; pointer-events: none;";
+                    updateFields[i].title = "Not available on this type of build";
+                }
+
+            },
+            promptForRelaunch() {
+                bootbox.confirm(app.getLz('action.relaunch.confirm'), function (result) {
+                    if (result) {
+                        ipcRenderer.send('relaunchApp', '');
+                    }
+                });
+            },
+            authCC() {
+                ipcRenderer.send('cc-auth')
+            },
+            logoutCC() {
+                ipcRenderer.send('cc-logout')
+            },
+        }
+    })
 </script>
\ No newline at end of file

From df4c4d679b1e2c0c1293994dbe1050e87f246bb8 Mon Sep 17 00:00:00 2001
From: booploops <49113086+booploops@users.noreply.github.com>
Date: Fri, 29 Apr 2022 18:19:27 -0700
Subject: [PATCH 09/51] removed extra drag regions from redmond layout

---
 src/renderer/less/directives.less | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/renderer/less/directives.less b/src/renderer/less/directives.less
index 22f839ea..5c9253da 100644
--- a/src/renderer/less/directives.less
+++ b/src/renderer/less/directives.less
@@ -16,6 +16,7 @@
     height: var(--chromeHeight1);
 
     &.chrome-bottom {
+      -webkit-app-region: no-drag;
       height    : var(--chromeHeight2);
       box-shadow: 0px -1px 0px rgba(0, 0, 0, 0.25);
       z-index   : 1;
@@ -30,6 +31,7 @@
     .app-playback-controls .actions {
       align-self: center;
     }
+    -webkit-app-region: no-drag;
 
     .playback-button.play,
     .playback-button.pause {
@@ -120,8 +122,9 @@
       width          : 30%;
       justify-content: flex-start;
       align-items    : flex-start;
-
+      -webkit-app-region: no-drag!important;
       .playback-controls {
+        -webkit-app-region: no-drag!important;
         .artwork {
           width     : var(--chromeHeight2);
           height    : var(--chromeHeight2);

From c262a361900165135e6f3198b3baa296f3ea5994 Mon Sep 17 00:00:00 2001
From: Amaru8 <52407090+Amaru8@users.noreply.github.com>
Date: Sat, 30 Apr 2022 13:34:23 +0200
Subject: [PATCH 10/51] Remove term.dynamic from Hungarian

---
 src/i18n/hu_HU.json | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/i18n/hu_HU.json b/src/i18n/hu_HU.json
index 814ab20e..f1c47c8b 100644
--- a/src/i18n/hu_HU.json
+++ b/src/i18n/hu_HU.json
@@ -73,7 +73,6 @@
   "term.viewAs": "Megjelenítés",
   "term.viewAs.coverArt": "Borító",
   "term.viewAs.list": "Lista",
-  "term.dynamic": "Dinamikus",
   "term.size": "Méret",
   "term.size.normal": "Normál",
   "term.size.compact": "Kompakt",

From 100d1bf3ba0e8d1cfc6af3328da336c636d5d821 Mon Sep 17 00:00:00 2001
From: Amaru8 <52407090+Amaru8@users.noreply.github.com>
Date: Sat, 30 Apr 2022 13:42:40 +0200
Subject: [PATCH 11/51] Add Apple Music category to Resume Tabs

---
 src/renderer/main/vueapp.js           | 2 +-
 src/renderer/views/pages/settings.ejs | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/renderer/main/vueapp.js b/src/renderer/main/vueapp.js
index d1315b6a..58b49752 100644
--- a/src/renderer/main/vueapp.js
+++ b/src/renderer/main/vueapp.js
@@ -1579,7 +1579,7 @@ const app = new Vue({
             }
             route = route.replace(/#/g, "")
             if (app.cfg.general.resumeTabs.tab == "dynamic") {
-                if (route == "home" || route == "library-songs" || route == "library-albums" || route == "library-artists" || route == "library-videos" || route == "podcasts") {
+                if (route == "home" || route == "listen_now" || route == "browse" || route == "radio" || route == "library-songs" || route == "library-albums" || route == "library-artists" || route == "library-videos" || route == "podcasts") {
                     app.cfg.general.resumeTabs.dynamicData = route
                 } else {
                     app.cfg.general.resumeTabs.dynamicData = "home"
diff --git a/src/renderer/views/pages/settings.ejs b/src/renderer/views/pages/settings.ejs
index 5e4fc9c5..09ff4a8c 100644
--- a/src/renderer/views/pages/settings.ejs
+++ b/src/renderer/views/pages/settings.ejs
@@ -90,6 +90,9 @@
                                     <select class="md-select" style="width:180px;"
                                             v-model="$root.cfg.general.resumeTabs.tab">
                                         <option value="home">{{$root.getLz('home.title')}}</option>
+                                        <option value="listen_now">{{$root.getLz('term.listenNow')}}</option>
+                                        <option value="browse">{{$root.getLz('term.browse')}}</option>
+                                        <option value="radio">{{$root.getLz('term.radio')}}</option>
                                         <option value="library-recentlyadded">{{$root.getLz('term.recentlyAdded')}}</option>
                                         <option value="library-songs">{{$root.getLz('term.songs')}}</option>
                                         <option value="library-albums">{{$root.getLz('term.albums')}}</option>

From b0a8c18e438452a02a96b388ef589f4838268de6 Mon Sep 17 00:00:00 2001
From: Core <64542347+coredev-uk@users.noreply.github.com>
Date: Sat, 30 Apr 2022 14:58:15 +0100
Subject: [PATCH 12/51] fix

---
 .circleci/config.yml | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 62dc1183..9d722d40 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -1,16 +1,15 @@
 version: 2.1
 orbs: # adds orbs to your configuration
   jira: circleci/jira@1.0.5 # invokes the Jira orb, making its commands accessible
-branches:
-      only:
-        - main
-        - develop
 jobs:
   build:
     working_directory: ~/Cider
     docker:
       - image: circleci/node:16
-      
+    filters:
+      branches:
+        only:
+          - main
     steps:
       - checkout
       - run:

From 0261362f143bc0d39280378479aae11f63772336 Mon Sep 17 00:00:00 2001
From: Core <64542347+coredev-uk@users.noreply.github.com>
Date: Sat, 30 Apr 2022 15:06:52 +0100
Subject: [PATCH 13/51] Updated config.yml

---
 .circleci/config.yml | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 9d722d40..d999784d 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -1,15 +1,13 @@
 version: 2.1
 orbs: # adds orbs to your configuration
   jira: circleci/jira@1.0.5 # invokes the Jira orb, making its commands accessible
+branches:
+  only: main
 jobs:
   build:
     working_directory: ~/Cider
     docker:
       - image: circleci/node:16
-    filters:
-      branches:
-        only:
-          - main
     steps:
       - checkout
       - run:

From 8c7f2e459e4c61373f9a7fcb80da40c1aef9f0d9 Mon Sep 17 00:00:00 2001
From: Core <64542347+coredev-uk@users.noreply.github.com>
Date: Sat, 30 Apr 2022 15:19:03 +0100
Subject: [PATCH 14/51] Updated config.yml

---
 .circleci/config.yml | 61 ++++++++++++++++++++++++++++++++++++++------
 1 file changed, 53 insertions(+), 8 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index d999784d..baf974ad 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -1,10 +1,11 @@
 version: 2.1
+
 orbs: # adds orbs to your configuration
   jira: circleci/jira@1.0.5 # invokes the Jira orb, making its commands accessible
-branches:
-  only: main
+
+# The jobs for this project
 jobs:
-  build:
+  prepare-build:
     working_directory: ~/Cider
     docker:
       - image: circleci/node:16
@@ -45,21 +46,45 @@ jobs:
       - run:
           name: TypeScript Compile
           command: yarn build
-      - run:
-          name: Generate Builds (Linux)
-          command: yarn electron-builder -l -p never
-          post-steps:
-            - jira/notify
+  
+  build-windows:
+    working_directory: ~/Cider
+    docker:
+      - image: circleci/node:16
+    steps:
       - run:
           name: Generate Builds (Windows)
           command: yarn electron-builder -w --x64 -p never
           post-steps:
             - jira/notify
+
+  build-linux:
+    working_directory: ~/Cider
+    docker:
+      - image: circleci/node:16
+    steps:
+      - run:
+          name: Generate Builds (Linux)
+          command: yarn electron-builder -l -p never
+          post-steps:
+            - jira/notify
+
+  build-winget:
+    working_directory: ~/Cider
+    docker:
+      - image: circleci/node:16
+    steps:
       - run:
           name: Generate Builds (Winget)
           command: yarn electron-builder --win -c winget.json -p never
           post-steps:
             - jira/notify
+
+  release:
+    working_directory: ~/Cider
+    docker:
+      - image: circleci/node:16
+    steps:
       - run:
           name: Move Build Files
           command: |
@@ -76,3 +101,23 @@ jobs:
           name: Publish Release
           command: |
               gh release create "v${APP_VERSION}.${CIRCLE_BUILD_NUM}" --title "Cider Version ${APP_VERSION} - Build ${CIRCLE_BUILD_NUM} (${CIRCLE_BRANCH})" --generate-notes -R ciderapp/cider-releases ~/Cider/dist/artifacts/*.deb ~/Cider/dist/artifacts/*.AppImage ~/Cider/dist/artifacts/*.snap ~/Cider/dist/artifacts/*.exe ~/Cider/dist/artifacts/*.yml ~/Cider/dist/artifacts/*.blockmap
+
+# Orchestrate our job run sequence
+workflows:
+  build_and_test:
+    jobs:
+      - prepare-build
+      - build-windows:
+          requires:
+            - prepare-build
+      - build-linux:
+          requires:
+            - prepare-build
+      - build-winget:
+          requires:
+            - prepare-build
+      - release:
+          requires:
+            - build-windows
+            - build-linux
+            - build-winget
\ No newline at end of file

From 1f5982f50da4254256dfd3c2651fa2557bd79fee Mon Sep 17 00:00:00 2001
From: Core <64542347+coredev-uk@users.noreply.github.com>
Date: Sat, 30 Apr 2022 15:27:03 +0100
Subject: [PATCH 15/51] Updated config.yml

---
 .circleci/config.yml | 63 ++++++++++++++++++++++++++++++++++++--------
 1 file changed, 52 insertions(+), 11 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index baf974ad..f6025161 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -1,10 +1,45 @@
 version: 2.1
 
+executors:
+  my-executor:
+    docker:
+      - image: circleci/node:16
+    working_directory: ~/Cider
+
 orbs: # adds orbs to your configuration
   jira: circleci/jira@1.0.5 # invokes the Jira orb, making its commands accessible
 
 # The jobs for this project
 jobs:
+  flow:
+    executor: my-executor
+    steps:
+      - run: mkdir -p workspace
+      - run: echo "Hello, world!" > workspace/echo-output
+
+      # Persist the specified paths (workspace/echo-output) into the workspace for use in downstream job.
+      - persist_to_workspace:
+          # Must be an absolute path, or relative path from working_directory. This is a directory on the container which is
+          # taken to be the root directory of the workspace.
+          root: workspace
+          # Must be relative path from root
+          paths:
+            - echo-output
+
+  downstream:
+    executor: my-executor
+    steps:
+      - attach_workspace:
+          # Must be absolute path or relative path from working_directory
+          at: /tmp/workspace
+
+      - run: |
+          if [[ `cat /tmp/workspace/echo-output` == "Hello, world!" ]]; then
+            echo "It worked!";
+          else
+            echo "Nope!"; exit 1
+          fi
+
   prepare-build:
     working_directory: ~/Cider
     docker:
@@ -46,7 +81,7 @@ jobs:
       - run:
           name: TypeScript Compile
           command: yarn build
-  
+
   build-windows:
     working_directory: ~/Cider
     docker:
@@ -88,22 +123,28 @@ jobs:
       - run:
           name: Move Build Files
           command: |
-              mkdir ~/Cider/dist/artifacts/
-              mv ~/Cider/dist/*.exe ~/Cider/dist/artifacts
-              mv ~/Cider/dist/*.deb ~/Cider/dist/artifacts
-              mv ~/Cider/dist/*.AppImage ~/Cider/dist/artifacts
-              mv ~/Cider/dist/*.snap ~/Cider/dist/artifacts
-              mv ~/Cider/dist/*.yml ~/Cider/dist/artifacts
-              mv ~/Cider/dist/*.blockmap ~/Cider/dist/artifacts
+            mkdir ~/Cider/dist/artifacts/
+            mv ~/Cider/dist/*.exe ~/Cider/dist/artifacts
+            mv ~/Cider/dist/*.deb ~/Cider/dist/artifacts
+            mv ~/Cider/dist/*.AppImage ~/Cider/dist/artifacts
+            mv ~/Cider/dist/*.snap ~/Cider/dist/artifacts
+            mv ~/Cider/dist/*.yml ~/Cider/dist/artifacts
+            mv ~/Cider/dist/*.blockmap ~/Cider/dist/artifacts
       - store_artifacts:
-          path: ~/Cider/dist/artifacts 
+          path: ~/Cider/dist/artifacts
       - run:
           name: Publish Release
           command: |
-              gh release create "v${APP_VERSION}.${CIRCLE_BUILD_NUM}" --title "Cider Version ${APP_VERSION} - Build ${CIRCLE_BUILD_NUM} (${CIRCLE_BRANCH})" --generate-notes -R ciderapp/cider-releases ~/Cider/dist/artifacts/*.deb ~/Cider/dist/artifacts/*.AppImage ~/Cider/dist/artifacts/*.snap ~/Cider/dist/artifacts/*.exe ~/Cider/dist/artifacts/*.yml ~/Cider/dist/artifacts/*.blockmap
+            gh release create "v${APP_VERSION}.${CIRCLE_BUILD_NUM}" --title "Cider Version ${APP_VERSION} - Build ${CIRCLE_BUILD_NUM} (${CIRCLE_BRANCH})" --generate-notes -R ciderapp/cider-releases ~/Cider/dist/artifacts/*.deb ~/Cider/dist/artifacts/*.AppImage ~/Cider/dist/artifacts/*.snap ~/Cider/dist/artifacts/*.exe ~/Cider/dist/artifacts/*.yml ~/Cider/dist/artifacts/*.blockmap
 
 # Orchestrate our job run sequence
 workflows:
+  btd:
+    jobs:
+      - flow
+      - downstream:
+          requires:
+            - flow
   build_and_test:
     jobs:
       - prepare-build
@@ -120,4 +161,4 @@ workflows:
           requires:
             - build-windows
             - build-linux
-            - build-winget
\ No newline at end of file
+            - build-winget

From 18cd463579db8c763e221477b882158389a4132a Mon Sep 17 00:00:00 2001
From: Core <64542347+coredev-uk@users.noreply.github.com>
Date: Sat, 30 Apr 2022 15:34:07 +0100
Subject: [PATCH 16/51] Updated config.yml

---
 .circleci/config.yml | 96 ++++++++++++++++----------------------------
 1 file changed, 34 insertions(+), 62 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index f6025161..d18124bc 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -1,50 +1,20 @@
 version: 2.1
 
 executors:
-  my-executor:
+  cider-ci:
     docker:
       - image: circleci/node:16
-    working_directory: ~/Cider
+    working_directory: /tmp/cider
 
 orbs: # adds orbs to your configuration
   jira: circleci/jira@1.0.5 # invokes the Jira orb, making its commands accessible
 
 # The jobs for this project
 jobs:
-  flow:
-    executor: my-executor
-    steps:
-      - run: mkdir -p workspace
-      - run: echo "Hello, world!" > workspace/echo-output
-
-      # Persist the specified paths (workspace/echo-output) into the workspace for use in downstream job.
-      - persist_to_workspace:
-          # Must be an absolute path, or relative path from working_directory. This is a directory on the container which is
-          # taken to be the root directory of the workspace.
-          root: workspace
-          # Must be relative path from root
-          paths:
-            - echo-output
-
-  downstream:
-    executor: my-executor
-    steps:
-      - attach_workspace:
-          # Must be absolute path or relative path from working_directory
-          at: /tmp/workspace
-
-      - run: |
-          if [[ `cat /tmp/workspace/echo-output` == "Hello, world!" ]]; then
-            echo "It worked!";
-          else
-            echo "Nope!"; exit 1
-          fi
-
   prepare-build:
-    working_directory: ~/Cider
-    docker:
-      - image: circleci/node:16
+    executor: cider-ci
     steps:
+      - run: mkdir -p Cider
       - checkout
       - run:
           name: Set App Version
@@ -81,12 +51,20 @@ jobs:
       - run:
           name: TypeScript Compile
           command: yarn build
+      # Persist the specified paths (workspace/echo-output) into the workspace for use in downstream job.
+      - persist_to_workspace:
+          # Must be an absolute path, or relative path from working_directory. This is a directory on the container which is
+          # taken to be the root directory of the workspace.
+          root: workspace
+          # Must be relative path from root
+          paths:
+            - echo-output
 
   build-windows:
-    working_directory: ~/Cider
-    docker:
-      - image: circleci/node:16
+    executor: cider-ci
     steps:
+      - attach_workspace:
+          at: /tmp/cider
       - run:
           name: Generate Builds (Windows)
           command: yarn electron-builder -w --x64 -p never
@@ -94,10 +72,10 @@ jobs:
             - jira/notify
 
   build-linux:
-    working_directory: ~/Cider
-    docker:
-      - image: circleci/node:16
+    executor: cider-ci
     steps:
+      - attach_workspace:
+          at: /tmp/cider
       - run:
           name: Generate Builds (Linux)
           command: yarn electron-builder -l -p never
@@ -105,10 +83,10 @@ jobs:
             - jira/notify
 
   build-winget:
-    working_directory: ~/Cider
-    docker:
-      - image: circleci/node:16
+    executor: cider-ci
     steps:
+      - attach_workspace:
+          at: /tmp/cider
       - run:
           name: Generate Builds (Winget)
           command: yarn electron-builder --win -c winget.json -p never
@@ -116,36 +94,30 @@ jobs:
             - jira/notify
 
   release:
-    working_directory: ~/Cider
-    docker:
-      - image: circleci/node:16
+    executor: cider-ci
     steps:
+      - attach_workspace:
+          at: /tmp/cider
       - run:
           name: Move Build Files
           command: |
-            mkdir ~/Cider/dist/artifacts/
-            mv ~/Cider/dist/*.exe ~/Cider/dist/artifacts
-            mv ~/Cider/dist/*.deb ~/Cider/dist/artifacts
-            mv ~/Cider/dist/*.AppImage ~/Cider/dist/artifacts
-            mv ~/Cider/dist/*.snap ~/Cider/dist/artifacts
-            mv ~/Cider/dist/*.yml ~/Cider/dist/artifacts
-            mv ~/Cider/dist/*.blockmap ~/Cider/dist/artifacts
+            mkdir /tmp/cider/dist/artifacts/
+            mv /tmp/cider/dist/*.exe /tmp/cider/dist/artifacts
+            mv /tmp/cider/dist/*.deb /tmp/cider/dist/artifacts
+            mv /tmp/cider/dist/*.AppImage /tmp/cider/dist/artifacts
+            mv /tmp/cider/dist/*.snap /tmp/cider/dist/artifacts
+            mv /tmp/cider/dist/*.yml /tmp/cider/dist/artifacts
+            mv /tmp/cider/dist/*.blockmap /tmp/cider/dist/artifacts
       - store_artifacts:
-          path: ~/Cider/dist/artifacts
+          path: /tmp/cider/dist/artifacts
       - run:
           name: Publish Release
           command: |
-            gh release create "v${APP_VERSION}.${CIRCLE_BUILD_NUM}" --title "Cider Version ${APP_VERSION} - Build ${CIRCLE_BUILD_NUM} (${CIRCLE_BRANCH})" --generate-notes -R ciderapp/cider-releases ~/Cider/dist/artifacts/*.deb ~/Cider/dist/artifacts/*.AppImage ~/Cider/dist/artifacts/*.snap ~/Cider/dist/artifacts/*.exe ~/Cider/dist/artifacts/*.yml ~/Cider/dist/artifacts/*.blockmap
+            gh release create "v${APP_VERSION}.${CIRCLE_BUILD_NUM}" --title "Cider Version ${APP_VERSION} - Build ${CIRCLE_BUILD_NUM} (${CIRCLE_BRANCH})" --generate-notes -R ciderapp/cider-releases /tmp/cider/dist/artifacts/*.deb /tmp/cider/dist/artifacts/*.AppImage /tmp/cider/dist/artifacts/*.snap /tmp/cider/dist/artifacts/*.exe /tmp/cider/dist/artifacts/*.yml /tmp/cider/dist/artifacts/*.blockmap
 
 # Orchestrate our job run sequence
 workflows:
-  btd:
-    jobs:
-      - flow
-      - downstream:
-          requires:
-            - flow
-  build_and_test:
+  build_and_release:
     jobs:
       - prepare-build
       - build-windows:

From 29d06d109ce1ad64f3586620d3cec8cdd462f5c4 Mon Sep 17 00:00:00 2001
From: Core <64542347+coredev-uk@users.noreply.github.com>
Date: Sat, 30 Apr 2022 15:36:28 +0100
Subject: [PATCH 17/51] Updated config.yml

---
 .circleci/config.yml | 30 +++++++++++++++---------------
 1 file changed, 15 insertions(+), 15 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index d18124bc..592d62b2 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -4,7 +4,7 @@ executors:
   cider-ci:
     docker:
       - image: circleci/node:16
-    working_directory: /tmp/cider
+    working_directory: ~/Cider
 
 orbs: # adds orbs to your configuration
   jira: circleci/jira@1.0.5 # invokes the Jira orb, making its commands accessible
@@ -14,8 +14,8 @@ jobs:
   prepare-build:
     executor: cider-ci
     steps:
-      - run: mkdir -p Cider
       - checkout
+      - run: mkdir -p Cider
       - run:
           name: Set App Version
           command: echo "export APP_VERSION=$(grep '"version":.*' package.json | cut -d '"' -f 4 | head -1)" >> $BASH_ENV
@@ -64,7 +64,7 @@ jobs:
     executor: cider-ci
     steps:
       - attach_workspace:
-          at: /tmp/cider
+          at: ~/Cider
       - run:
           name: Generate Builds (Windows)
           command: yarn electron-builder -w --x64 -p never
@@ -75,7 +75,7 @@ jobs:
     executor: cider-ci
     steps:
       - attach_workspace:
-          at: /tmp/cider
+          at: ~/Cider
       - run:
           name: Generate Builds (Linux)
           command: yarn electron-builder -l -p never
@@ -86,7 +86,7 @@ jobs:
     executor: cider-ci
     steps:
       - attach_workspace:
-          at: /tmp/cider
+          at: ~/Cider
       - run:
           name: Generate Builds (Winget)
           command: yarn electron-builder --win -c winget.json -p never
@@ -97,23 +97,23 @@ jobs:
     executor: cider-ci
     steps:
       - attach_workspace:
-          at: /tmp/cider
+          at: ~/Cider
       - run:
           name: Move Build Files
           command: |
-            mkdir /tmp/cider/dist/artifacts/
-            mv /tmp/cider/dist/*.exe /tmp/cider/dist/artifacts
-            mv /tmp/cider/dist/*.deb /tmp/cider/dist/artifacts
-            mv /tmp/cider/dist/*.AppImage /tmp/cider/dist/artifacts
-            mv /tmp/cider/dist/*.snap /tmp/cider/dist/artifacts
-            mv /tmp/cider/dist/*.yml /tmp/cider/dist/artifacts
-            mv /tmp/cider/dist/*.blockmap /tmp/cider/dist/artifacts
+            mkdir ~/Cider/dist/artifacts/
+            mv ~/Cider/dist/*.exe ~/Cider/dist/artifacts
+            mv ~/Cider/dist/*.deb ~/Cider/dist/artifacts
+            mv ~/Cider/dist/*.AppImage ~/Cider/dist/artifacts
+            mv ~/Cider/dist/*.snap ~/Cider/dist/artifacts
+            mv ~/Cider/dist/*.yml ~/Cider/dist/artifacts
+            mv ~/Cider/dist/*.blockmap ~/Cider/dist/artifacts
       - store_artifacts:
-          path: /tmp/cider/dist/artifacts
+          path: ~/Cider/dist/artifacts
       - run:
           name: Publish Release
           command: |
-            gh release create "v${APP_VERSION}.${CIRCLE_BUILD_NUM}" --title "Cider Version ${APP_VERSION} - Build ${CIRCLE_BUILD_NUM} (${CIRCLE_BRANCH})" --generate-notes -R ciderapp/cider-releases /tmp/cider/dist/artifacts/*.deb /tmp/cider/dist/artifacts/*.AppImage /tmp/cider/dist/artifacts/*.snap /tmp/cider/dist/artifacts/*.exe /tmp/cider/dist/artifacts/*.yml /tmp/cider/dist/artifacts/*.blockmap
+            gh release create "v${APP_VERSION}.${CIRCLE_BUILD_NUM}" --title "Cider Version ${APP_VERSION} - Build ${CIRCLE_BUILD_NUM} (${CIRCLE_BRANCH})" --generate-notes -R ciderapp/cider-releases ~/Cider/dist/artifacts/*.deb ~/Cider/dist/artifacts/*.AppImage ~/Cider/dist/artifacts/*.snap ~/Cider/dist/artifacts/*.exe ~/Cider/dist/artifacts/*.yml ~/Cider/dist/artifacts/*.blockmap
 
 # Orchestrate our job run sequence
 workflows:

From 489ebbc31d1d042b1e6b2a0dc20a3757a583c1fb Mon Sep 17 00:00:00 2001
From: Core <64542347+coredev-uk@users.noreply.github.com>
Date: Sat, 30 Apr 2022 15:39:12 +0100
Subject: [PATCH 18/51] Updated config.yml

---
 .circleci/config.yml | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 592d62b2..a6fb377c 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -15,7 +15,6 @@ jobs:
     executor: cider-ci
     steps:
       - checkout
-      - run: mkdir -p Cider
       - run:
           name: Set App Version
           command: echo "export APP_VERSION=$(grep '"version":.*' package.json | cut -d '"' -f 4 | head -1)" >> $BASH_ENV
@@ -55,10 +54,10 @@ jobs:
       - persist_to_workspace:
           # Must be an absolute path, or relative path from working_directory. This is a directory on the container which is
           # taken to be the root directory of the workspace.
-          root: workspace
+          root: .
           # Must be relative path from root
           paths:
-            - echo-output
+            - Cider
 
   build-windows:
     executor: cider-ci

From 79e6907b9bf82a71093e366a286ef782bf59ab3f Mon Sep 17 00:00:00 2001
From: Core <64542347+coredev-uk@users.noreply.github.com>
Date: Sat, 30 Apr 2022 15:42:52 +0100
Subject: [PATCH 19/51] Updated config.yml

---
 .circleci/config.yml | 103 ++++++++++++++++++++++---------------------
 1 file changed, 52 insertions(+), 51 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index a6fb377c..7e864198 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -4,7 +4,7 @@ executors:
   cider-ci:
     docker:
       - image: circleci/node:16
-    working_directory: ~/Cider
+    working_directory: /tmp
 
 orbs: # adds orbs to your configuration
   jira: circleci/jira@1.0.5 # invokes the Jira orb, making its commands accessible
@@ -14,47 +14,48 @@ jobs:
   prepare-build:
     executor: cider-ci
     steps:
-      - checkout
-      - run:
-          name: Set App Version
-          command: echo "export APP_VERSION=$(grep '"version":.*' package.json | cut -d '"' -f 4 | head -1)" >> $BASH_ENV
-      - run:
-          name: Update Package Managers
-          command: sudo npm update -g npm yarn
-      - restore_cache:
-          name: Restore Yarn Package Cache
-          keys:
-            - yarn-packages-{{ checksum "cider.lock" }}
-      - run:
-          name: Install Dependencies
-          command: yarn install --frozen-lockfile --cache-folder ~/.cache/yarn
-      - save_cache:
-          name: Save Yarn Package Cache
-          key: yarn-packages-{{ checksum "cider.lock" }}
-          paths:
-            - ~/.cache/yarn
-      - run:
-          name: Install system build dependencies
-          command: |
-            sudo apt-get update -y
-            curl -fsSL https://cli.github.com/packages/githubcli-archive-keyring.gpg | sudo dd of=/usr/share/keyrings/githubcli-archive-keyring.gpg
-            echo "deb [arch=$(dpkg --print-architecture) signed-by=/usr/share/keyrings/githubcli-archive-keyring.gpg] https://cli.github.com/packages stable main" | sudo tee /etc/apt/sources.list.d/github-cli.list > /dev/null
-            sudo apt-get install -y dpkg fakeroot wine64
-            sudo dpkg --add-architecture i386
-            sudo apt-get update -y
-            sudo apt-get install -y wine32
-            sudo apt install -y gh
-      - run:
-          name: Fix Versioning and Add Channel
-          command: yarn circle:script
-      - run:
-          name: TypeScript Compile
-          command: yarn build
+      - run: ls -la
+      # - checkout
+      # - run:
+      #     name: Set App Version
+      #     command: echo "export APP_VERSION=$(grep '"version":.*' package.json | cut -d '"' -f 4 | head -1)" >> $BASH_ENV
+      # - run:
+      #     name: Update Package Managers
+      #     command: sudo npm update -g npm yarn
+      # - restore_cache:
+      #     name: Restore Yarn Package Cache
+      #     keys:
+      #       - yarn-packages-{{ checksum "cider.lock" }}
+      # - run:
+      #     name: Install Dependencies
+      #     command: yarn install --frozen-lockfile --cache-folder ~/.cache/yarn
+      # - save_cache:
+      #     name: Save Yarn Package Cache
+      #     key: yarn-packages-{{ checksum "cider.lock" }}
+      #     paths:
+      #       - ~/.cache/yarn
+      # - run:
+      #     name: Install system build dependencies
+      #     command: |
+      #       sudo apt-get update -y
+      #       curl -fsSL https://cli.github.com/packages/githubcli-archive-keyring.gpg | sudo dd of=/usr/share/keyrings/githubcli-archive-keyring.gpg
+      #       echo "deb [arch=$(dpkg --print-architecture) signed-by=/usr/share/keyrings/githubcli-archive-keyring.gpg] https://cli.github.com/packages stable main" | sudo tee /etc/apt/sources.list.d/github-cli.list > /dev/null
+      #       sudo apt-get install -y dpkg fakeroot wine64
+      #       sudo dpkg --add-architecture i386
+      #       sudo apt-get update -y
+      #       sudo apt-get install -y wine32
+      #       sudo apt install -y gh
+      # - run:
+      #     name: Fix Versioning and Add Channel
+      #     command: yarn circle:script
+      # - run:
+      #     name: TypeScript Compile
+      #     command: yarn build
       # Persist the specified paths (workspace/echo-output) into the workspace for use in downstream job.
       - persist_to_workspace:
           # Must be an absolute path, or relative path from working_directory. This is a directory on the container which is
           # taken to be the root directory of the workspace.
-          root: .
+          root: /tmp
           # Must be relative path from root
           paths:
             - Cider
@@ -63,7 +64,7 @@ jobs:
     executor: cider-ci
     steps:
       - attach_workspace:
-          at: ~/Cider
+          at: /tmp/Cider
       - run:
           name: Generate Builds (Windows)
           command: yarn electron-builder -w --x64 -p never
@@ -74,7 +75,7 @@ jobs:
     executor: cider-ci
     steps:
       - attach_workspace:
-          at: ~/Cider
+          at: /tmp/Cider
       - run:
           name: Generate Builds (Linux)
           command: yarn electron-builder -l -p never
@@ -85,7 +86,7 @@ jobs:
     executor: cider-ci
     steps:
       - attach_workspace:
-          at: ~/Cider
+          at: /tmp/Cider
       - run:
           name: Generate Builds (Winget)
           command: yarn electron-builder --win -c winget.json -p never
@@ -96,23 +97,23 @@ jobs:
     executor: cider-ci
     steps:
       - attach_workspace:
-          at: ~/Cider
+          at: /tmp/Cider
       - run:
           name: Move Build Files
           command: |
-            mkdir ~/Cider/dist/artifacts/
-            mv ~/Cider/dist/*.exe ~/Cider/dist/artifacts
-            mv ~/Cider/dist/*.deb ~/Cider/dist/artifacts
-            mv ~/Cider/dist/*.AppImage ~/Cider/dist/artifacts
-            mv ~/Cider/dist/*.snap ~/Cider/dist/artifacts
-            mv ~/Cider/dist/*.yml ~/Cider/dist/artifacts
-            mv ~/Cider/dist/*.blockmap ~/Cider/dist/artifacts
+            mkdir /tmp/Cider/dist/artifacts/
+            mv /tmp/Cider/dist/*.exe /tmp/Cider/dist/artifacts
+            mv /tmp/Cider/dist/*.deb /tmp/Cider/dist/artifacts
+            mv /tmp/Cider/dist/*.AppImage /tmp/Cider/dist/artifacts
+            mv /tmp/Cider/dist/*.snap /tmp/Cider/dist/artifacts
+            mv /tmp/Cider/dist/*.yml /tmp/Cider/dist/artifacts
+            mv /tmp/Cider/dist/*.blockmap /tmp/Cider/dist/artifacts
       - store_artifacts:
-          path: ~/Cider/dist/artifacts
+          path: /tmp/Cider/dist/artifacts
       - run:
           name: Publish Release
           command: |
-            gh release create "v${APP_VERSION}.${CIRCLE_BUILD_NUM}" --title "Cider Version ${APP_VERSION} - Build ${CIRCLE_BUILD_NUM} (${CIRCLE_BRANCH})" --generate-notes -R ciderapp/cider-releases ~/Cider/dist/artifacts/*.deb ~/Cider/dist/artifacts/*.AppImage ~/Cider/dist/artifacts/*.snap ~/Cider/dist/artifacts/*.exe ~/Cider/dist/artifacts/*.yml ~/Cider/dist/artifacts/*.blockmap
+            gh release create "v${APP_VERSION}.${CIRCLE_BUILD_NUM}" --title "Cider Version ${APP_VERSION} - Build ${CIRCLE_BUILD_NUM} (${CIRCLE_BRANCH})" --generate-notes -R ciderapp/cider-releases /tmp/Cider/dist/artifacts/*.deb /tmp/Cider/dist/artifacts/*.AppImage /tmp/Cider/dist/artifacts/*.snap /tmp/Cider/dist/artifacts/*.exe /tmp/Cider/dist/artifacts/*.yml /tmp/Cider/dist/artifacts/*.blockmap
 
 # Orchestrate our job run sequence
 workflows:

From ca5ca9e729f936eac2c2cc1bcf4238a830efa965 Mon Sep 17 00:00:00 2001
From: Core <64542347+coredev-uk@users.noreply.github.com>
Date: Sat, 30 Apr 2022 15:45:13 +0100
Subject: [PATCH 20/51] Updated config.yml

---
 .circleci/config.yml | 34 ++++++++++++++++++----------------
 1 file changed, 18 insertions(+), 16 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 7e864198..4fdf8d99 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -4,7 +4,7 @@ executors:
   cider-ci:
     docker:
       - image: circleci/node:16
-    working_directory: /tmp
+    working_directory: ~/Cider
 
 orbs: # adds orbs to your configuration
   jira: circleci/jira@1.0.5 # invokes the Jira orb, making its commands accessible
@@ -55,16 +55,18 @@ jobs:
       - persist_to_workspace:
           # Must be an absolute path, or relative path from working_directory. This is a directory on the container which is
           # taken to be the root directory of the workspace.
-          root: /tmp
+          root: .
           # Must be relative path from root
           paths:
-            - Cider
+            - node_modules
+            - build
+            - yarn.lock
 
   build-windows:
     executor: cider-ci
     steps:
       - attach_workspace:
-          at: /tmp/Cider
+          at: ~/Cider
       - run:
           name: Generate Builds (Windows)
           command: yarn electron-builder -w --x64 -p never
@@ -75,7 +77,7 @@ jobs:
     executor: cider-ci
     steps:
       - attach_workspace:
-          at: /tmp/Cider
+          at: ~/Cider
       - run:
           name: Generate Builds (Linux)
           command: yarn electron-builder -l -p never
@@ -86,7 +88,7 @@ jobs:
     executor: cider-ci
     steps:
       - attach_workspace:
-          at: /tmp/Cider
+          at: ~/Cider
       - run:
           name: Generate Builds (Winget)
           command: yarn electron-builder --win -c winget.json -p never
@@ -97,23 +99,23 @@ jobs:
     executor: cider-ci
     steps:
       - attach_workspace:
-          at: /tmp/Cider
+          at: ~/Cider
       - run:
           name: Move Build Files
           command: |
-            mkdir /tmp/Cider/dist/artifacts/
-            mv /tmp/Cider/dist/*.exe /tmp/Cider/dist/artifacts
-            mv /tmp/Cider/dist/*.deb /tmp/Cider/dist/artifacts
-            mv /tmp/Cider/dist/*.AppImage /tmp/Cider/dist/artifacts
-            mv /tmp/Cider/dist/*.snap /tmp/Cider/dist/artifacts
-            mv /tmp/Cider/dist/*.yml /tmp/Cider/dist/artifacts
-            mv /tmp/Cider/dist/*.blockmap /tmp/Cider/dist/artifacts
+            mkdir ~/Cider/dist/artifacts/
+            mv ~/Cider/dist/*.exe ~/Cider/dist/artifacts
+            mv ~/Cider/dist/*.deb ~/Cider/dist/artifacts
+            mv ~/Cider/dist/*.AppImage ~/Cider/dist/artifacts
+            mv ~/Cider/dist/*.snap ~/Cider/dist/artifacts
+            mv ~/Cider/dist/*.yml ~/Cider/dist/artifacts
+            mv ~/Cider/dist/*.blockmap ~/Cider/dist/artifacts
       - store_artifacts:
-          path: /tmp/Cider/dist/artifacts
+          path: ~/Cider/dist/artifacts
       - run:
           name: Publish Release
           command: |
-            gh release create "v${APP_VERSION}.${CIRCLE_BUILD_NUM}" --title "Cider Version ${APP_VERSION} - Build ${CIRCLE_BUILD_NUM} (${CIRCLE_BRANCH})" --generate-notes -R ciderapp/cider-releases /tmp/Cider/dist/artifacts/*.deb /tmp/Cider/dist/artifacts/*.AppImage /tmp/Cider/dist/artifacts/*.snap /tmp/Cider/dist/artifacts/*.exe /tmp/Cider/dist/artifacts/*.yml /tmp/Cider/dist/artifacts/*.blockmap
+            gh release create "v${APP_VERSION}.${CIRCLE_BUILD_NUM}" --title "Cider Version ${APP_VERSION} - Build ${CIRCLE_BUILD_NUM} (${CIRCLE_BRANCH})" --generate-notes -R ciderapp/cider-releases ~/Cider/dist/artifacts/*.deb ~/Cider/dist/artifacts/*.AppImage ~/Cider/dist/artifacts/*.snap ~/Cider/dist/artifacts/*.exe ~/Cider/dist/artifacts/*.yml ~/Cider/dist/artifacts/*.blockmap
 
 # Orchestrate our job run sequence
 workflows:

From 6be02711a0784d76c6ade88f8c1811f29678e56c Mon Sep 17 00:00:00 2001
From: Amaru8 <52407090+Amaru8@users.noreply.github.com>
Date: Sat, 30 Apr 2022 16:45:55 +0200
Subject: [PATCH 21/51] kinda works

---
 .../views/components/mediaitem-list-item.ejs  | 23 +++++++++++--------
 1 file changed, 13 insertions(+), 10 deletions(-)

diff --git a/src/renderer/views/components/mediaitem-list-item.ejs b/src/renderer/views/components/mediaitem-list-item.ejs
index 6f137150..22a26f36 100644
--- a/src/renderer/views/components/mediaitem-list-item.ejs
+++ b/src/renderer/views/components/mediaitem-list-item.ejs
@@ -67,7 +67,7 @@
             </div>
             <div class="explicit-icon" v-if="item.attributes && item.attributes.contentRating == 'explicit'"></div>
             <template v-if="showMetaData == true" @dblclick="route()">
-                <div class="metainfo" style="min-width: 70px;" v-if="getHeartStatus()">
+                <div class="metainfo" style="min-width: 70px;" v-if="isLoved">
                     <div class="svg-icon" :style="{'--url': 'url(./assets/feather/heart-fill.svg)'}"></div>
                 </div>
                 <div class="metainfo">
@@ -101,7 +101,8 @@
                 displayDuration: true,
                 addClasses: {},
                 itemId: 0,
-                isLibrary: false
+                isLibrary: false,
+                isLoved: null
             }
         },
         props: {
@@ -124,6 +125,9 @@
             } else {
                 this.itemId = this.item.id;
             }
+            if (this.item.attributes.playParams) {
+                this.getHeartStatus();
+            }
             let duration = this.item.attributes.durationInMillis ?? 0
             if (duration == 0 || !this.showDuration) {
                 this.displayDuration = false
@@ -504,14 +508,13 @@
             },
             async getHeartStatus() {
                 try {
-                    let rating = await app.getRating(this.item)
-                    if (rating == 1) {
-                        console.log(this.item.attributes.name + " checked for heart status! Response: true")
-                        return true;
-                    } else {
-                        console.log(this.item.attributes.name + " checked for heart status! Response: false")
-                        return false;
-                    } 
+                    await app.getRating(this.item).then(res => {
+                        if (res == 1) {
+                            this.isLoved = true
+                        } else {
+                            this.isLoved = false
+                        }
+                    })
                 } catch (err) {
                     console.log(err)
                 }

From a486de3fdc1ac4ca8b3b9fb75dbad1a0ecb44a69 Mon Sep 17 00:00:00 2001
From: Core <64542347+coredev-uk@users.noreply.github.com>
Date: Sat, 30 Apr 2022 15:46:34 +0100
Subject: [PATCH 22/51] Updated config.yml

---
 .circleci/config.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 4fdf8d99..6cc5bcc2 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -14,8 +14,8 @@ jobs:
   prepare-build:
     executor: cider-ci
     steps:
+      - checkout
       - run: ls -la
-      # - checkout
       # - run:
       #     name: Set App Version
       #     command: echo "export APP_VERSION=$(grep '"version":.*' package.json | cut -d '"' -f 4 | head -1)" >> $BASH_ENV

From a55dbc716e1cbb92e78abd7e131767ca21cdf479 Mon Sep 17 00:00:00 2001
From: Core <64542347+coredev-uk@users.noreply.github.com>
Date: Sat, 30 Apr 2022 15:47:43 +0100
Subject: [PATCH 23/51] Updated config.yml

---
 .circleci/config.yml | 70 ++++++++++++++++++++++----------------------
 1 file changed, 35 insertions(+), 35 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 6cc5bcc2..92de906e 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -16,41 +16,41 @@ jobs:
     steps:
       - checkout
       - run: ls -la
-      # - run:
-      #     name: Set App Version
-      #     command: echo "export APP_VERSION=$(grep '"version":.*' package.json | cut -d '"' -f 4 | head -1)" >> $BASH_ENV
-      # - run:
-      #     name: Update Package Managers
-      #     command: sudo npm update -g npm yarn
-      # - restore_cache:
-      #     name: Restore Yarn Package Cache
-      #     keys:
-      #       - yarn-packages-{{ checksum "cider.lock" }}
-      # - run:
-      #     name: Install Dependencies
-      #     command: yarn install --frozen-lockfile --cache-folder ~/.cache/yarn
-      # - save_cache:
-      #     name: Save Yarn Package Cache
-      #     key: yarn-packages-{{ checksum "cider.lock" }}
-      #     paths:
-      #       - ~/.cache/yarn
-      # - run:
-      #     name: Install system build dependencies
-      #     command: |
-      #       sudo apt-get update -y
-      #       curl -fsSL https://cli.github.com/packages/githubcli-archive-keyring.gpg | sudo dd of=/usr/share/keyrings/githubcli-archive-keyring.gpg
-      #       echo "deb [arch=$(dpkg --print-architecture) signed-by=/usr/share/keyrings/githubcli-archive-keyring.gpg] https://cli.github.com/packages stable main" | sudo tee /etc/apt/sources.list.d/github-cli.list > /dev/null
-      #       sudo apt-get install -y dpkg fakeroot wine64
-      #       sudo dpkg --add-architecture i386
-      #       sudo apt-get update -y
-      #       sudo apt-get install -y wine32
-      #       sudo apt install -y gh
-      # - run:
-      #     name: Fix Versioning and Add Channel
-      #     command: yarn circle:script
-      # - run:
-      #     name: TypeScript Compile
-      #     command: yarn build
+      - run:
+          name: Set App Version
+          command: echo "export APP_VERSION=$(grep '"version":.*' package.json | cut -d '"' -f 4 | head -1)" >> $BASH_ENV
+      - run:
+          name: Update Package Managers
+          command: sudo npm update -g npm yarn
+      - restore_cache:
+          name: Restore Yarn Package Cache
+          keys:
+            - yarn-packages-{{ checksum "cider.lock" }}
+      - run:
+          name: Install Dependencies
+          command: yarn install --frozen-lockfile --cache-folder ~/.cache/yarn
+      - save_cache:
+          name: Save Yarn Package Cache
+          key: yarn-packages-{{ checksum "cider.lock" }}
+          paths:
+            - ~/.cache/yarn
+      - run:
+          name: Install system build dependencies
+          command: |
+            sudo apt-get update -y
+            curl -fsSL https://cli.github.com/packages/githubcli-archive-keyring.gpg | sudo dd of=/usr/share/keyrings/githubcli-archive-keyring.gpg
+            echo "deb [arch=$(dpkg --print-architecture) signed-by=/usr/share/keyrings/githubcli-archive-keyring.gpg] https://cli.github.com/packages stable main" | sudo tee /etc/apt/sources.list.d/github-cli.list > /dev/null
+            sudo apt-get install -y dpkg fakeroot wine64
+            sudo dpkg --add-architecture i386
+            sudo apt-get update -y
+            sudo apt-get install -y wine32
+            sudo apt install -y gh
+      - run:
+          name: Fix Versioning and Add Channel
+          command: yarn circle:script
+      - run:
+          name: TypeScript Compile
+          command: yarn build
       # Persist the specified paths (workspace/echo-output) into the workspace for use in downstream job.
       - persist_to_workspace:
           # Must be an absolute path, or relative path from working_directory. This is a directory on the container which is

From a85a15eaf3d238b3283fcd9747c928483a631f6a Mon Sep 17 00:00:00 2001
From: Core <64542347+coredev-uk@users.noreply.github.com>
Date: Sat, 30 Apr 2022 15:50:49 +0100
Subject: [PATCH 24/51] Updated config.yml

---
 .circleci/config.yml | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 92de906e..81b54690 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -65,6 +65,7 @@ jobs:
   build-windows:
     executor: cider-ci
     steps:
+      - checkout
       - attach_workspace:
           at: ~/Cider
       - run:
@@ -76,6 +77,7 @@ jobs:
   build-linux:
     executor: cider-ci
     steps:
+      - checkout
       - attach_workspace:
           at: ~/Cider
       - run:
@@ -87,6 +89,7 @@ jobs:
   build-winget:
     executor: cider-ci
     steps:
+      - checkout
       - attach_workspace:
           at: ~/Cider
       - run:
@@ -98,6 +101,7 @@ jobs:
   release:
     executor: cider-ci
     steps:
+      - checkout
       - attach_workspace:
           at: ~/Cider
       - run:

From 6e693339325c36eaf8731a8b8d67f46cafc28a2c Mon Sep 17 00:00:00 2001
From: Core <64542347+coredev-uk@users.noreply.github.com>
Date: Sat, 30 Apr 2022 15:56:09 +0100
Subject: [PATCH 25/51] Updated config.yml

---
 .circleci/config.yml | 69 ++++++++++++++++++++++++++++++++++----------
 1 file changed, 54 insertions(+), 15 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 81b54690..3447903e 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -34,24 +34,9 @@ jobs:
           key: yarn-packages-{{ checksum "cider.lock" }}
           paths:
             - ~/.cache/yarn
-      - run:
-          name: Install system build dependencies
-          command: |
-            sudo apt-get update -y
-            curl -fsSL https://cli.github.com/packages/githubcli-archive-keyring.gpg | sudo dd of=/usr/share/keyrings/githubcli-archive-keyring.gpg
-            echo "deb [arch=$(dpkg --print-architecture) signed-by=/usr/share/keyrings/githubcli-archive-keyring.gpg] https://cli.github.com/packages stable main" | sudo tee /etc/apt/sources.list.d/github-cli.list > /dev/null
-            sudo apt-get install -y dpkg fakeroot wine64
-            sudo dpkg --add-architecture i386
-            sudo apt-get update -y
-            sudo apt-get install -y wine32
-            sudo apt install -y gh
-      - run:
-          name: Fix Versioning and Add Channel
-          command: yarn circle:script
       - run:
           name: TypeScript Compile
           command: yarn build
-      # Persist the specified paths (workspace/echo-output) into the workspace for use in downstream job.
       - persist_to_workspace:
           # Must be an absolute path, or relative path from working_directory. This is a directory on the container which is
           # taken to be the root directory of the workspace.
@@ -68,11 +53,29 @@ jobs:
       - checkout
       - attach_workspace:
           at: ~/Cider
+      - run:
+          name: Install system build dependencies
+          command: |
+            sudo apt-get update -y
+            curl -fsSL https://cli.github.com/packages/githubcli-archive-keyring.gpg | sudo dd of=/usr/share/keyrings/githubcli-archive-keyring.gpg
+            echo "deb [arch=$(dpkg --print-architecture) signed-by=/usr/share/keyrings/githubcli-archive-keyring.gpg] https://cli.github.com/packages stable main" | sudo tee /etc/apt/sources.list.d/github-cli.list > /dev/null
+            sudo apt-get install -y dpkg fakeroot wine64
+            sudo dpkg --add-architecture i386
+            sudo apt-get update -y
+            sudo apt-get install -y wine32
+            sudo apt install -y gh
+      - run:
+          name: Fix Versioning and Add Channel
+          command: yarn circle:script
       - run:
           name: Generate Builds (Windows)
           command: yarn electron-builder -w --x64 -p never
           post-steps:
             - jira/notify
+      - persist_to_workspace:
+          root: .
+          paths:
+            - dist
 
   build-linux:
     executor: cider-ci
@@ -80,11 +83,29 @@ jobs:
       - checkout
       - attach_workspace:
           at: ~/Cider
+      - run:
+          name: Install system build dependencies
+          command: |
+            sudo apt-get update -y
+            curl -fsSL https://cli.github.com/packages/githubcli-archive-keyring.gpg | sudo dd of=/usr/share/keyrings/githubcli-archive-keyring.gpg
+            echo "deb [arch=$(dpkg --print-architecture) signed-by=/usr/share/keyrings/githubcli-archive-keyring.gpg] https://cli.github.com/packages stable main" | sudo tee /etc/apt/sources.list.d/github-cli.list > /dev/null
+            sudo apt-get install -y dpkg fakeroot wine64
+            sudo dpkg --add-architecture i386
+            sudo apt-get update -y
+            sudo apt-get install -y wine32
+            sudo apt install -y gh
+      - run:
+          name: Fix Versioning and Add Channel
+          command: yarn circle:script
       - run:
           name: Generate Builds (Linux)
           command: yarn electron-builder -l -p never
           post-steps:
             - jira/notify
+      - persist_to_workspace:
+          root: .
+          paths:
+            - dist
 
   build-winget:
     executor: cider-ci
@@ -92,11 +113,29 @@ jobs:
       - checkout
       - attach_workspace:
           at: ~/Cider
+      - run:
+          name: Install system build dependencies
+          command: |
+            sudo apt-get update -y
+            curl -fsSL https://cli.github.com/packages/githubcli-archive-keyring.gpg | sudo dd of=/usr/share/keyrings/githubcli-archive-keyring.gpg
+            echo "deb [arch=$(dpkg --print-architecture) signed-by=/usr/share/keyrings/githubcli-archive-keyring.gpg] https://cli.github.com/packages stable main" | sudo tee /etc/apt/sources.list.d/github-cli.list > /dev/null
+            sudo apt-get install -y dpkg fakeroot wine64
+            sudo dpkg --add-architecture i386
+            sudo apt-get update -y
+            sudo apt-get install -y wine32
+            sudo apt install -y gh
+      - run:
+          name: Fix Versioning and Add Channel
+          command: yarn circle:script
       - run:
           name: Generate Builds (Winget)
           command: yarn electron-builder --win -c winget.json -p never
           post-steps:
             - jira/notify
+      - persist_to_workspace:
+          root: .
+          paths:
+            - dist
 
   release:
     executor: cider-ci

From 5158205f28b9a8b6e39c8690847d09f87fa53b9f Mon Sep 17 00:00:00 2001
From: Core <64542347+coredev-uk@users.noreply.github.com>
Date: Sat, 30 Apr 2022 16:04:24 +0100
Subject: [PATCH 26/51] Updated config.yml

---
 .circleci/config.yml | 44 +++++++++++++++-----------------------------
 1 file changed, 15 insertions(+), 29 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 3447903e..fbbb5e95 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -54,16 +54,10 @@ jobs:
       - attach_workspace:
           at: ~/Cider
       - run:
-          name: Install system build dependencies
+          name: Install Windows System Build Dependencies
           command: |
-            sudo apt-get update -y
-            curl -fsSL https://cli.github.com/packages/githubcli-archive-keyring.gpg | sudo dd of=/usr/share/keyrings/githubcli-archive-keyring.gpg
-            echo "deb [arch=$(dpkg --print-architecture) signed-by=/usr/share/keyrings/githubcli-archive-keyring.gpg] https://cli.github.com/packages stable main" | sudo tee /etc/apt/sources.list.d/github-cli.list > /dev/null
-            sudo apt-get install -y dpkg fakeroot wine64
-            sudo dpkg --add-architecture i386
             sudo apt-get update -y
             sudo apt-get install -y wine32
-            sudo apt install -y gh
       - run:
           name: Fix Versioning and Add Channel
           command: yarn circle:script
@@ -75,7 +69,7 @@ jobs:
       - persist_to_workspace:
           root: .
           paths:
-            - dist
+            - dist/*.exe
 
   build-linux:
     executor: cider-ci
@@ -83,17 +77,6 @@ jobs:
       - checkout
       - attach_workspace:
           at: ~/Cider
-      - run:
-          name: Install system build dependencies
-          command: |
-            sudo apt-get update -y
-            curl -fsSL https://cli.github.com/packages/githubcli-archive-keyring.gpg | sudo dd of=/usr/share/keyrings/githubcli-archive-keyring.gpg
-            echo "deb [arch=$(dpkg --print-architecture) signed-by=/usr/share/keyrings/githubcli-archive-keyring.gpg] https://cli.github.com/packages stable main" | sudo tee /etc/apt/sources.list.d/github-cli.list > /dev/null
-            sudo apt-get install -y dpkg fakeroot wine64
-            sudo dpkg --add-architecture i386
-            sudo apt-get update -y
-            sudo apt-get install -y wine32
-            sudo apt install -y gh
       - run:
           name: Fix Versioning and Add Channel
           command: yarn circle:script
@@ -105,7 +88,9 @@ jobs:
       - persist_to_workspace:
           root: .
           paths:
-            - dist
+            - dist/*.deb
+            - dist/*.appimage
+            - dist/*.snap
 
   build-winget:
     executor: cider-ci
@@ -114,16 +99,10 @@ jobs:
       - attach_workspace:
           at: ~/Cider
       - run:
-          name: Install system build dependencies
+          name: Install Windows System Build Dependencies
           command: |
-            sudo apt-get update -y
-            curl -fsSL https://cli.github.com/packages/githubcli-archive-keyring.gpg | sudo dd of=/usr/share/keyrings/githubcli-archive-keyring.gpg
-            echo "deb [arch=$(dpkg --print-architecture) signed-by=/usr/share/keyrings/githubcli-archive-keyring.gpg] https://cli.github.com/packages stable main" | sudo tee /etc/apt/sources.list.d/github-cli.list > /dev/null
-            sudo apt-get install -y dpkg fakeroot wine64
-            sudo dpkg --add-architecture i386
             sudo apt-get update -y
             sudo apt-get install -y wine32
-            sudo apt install -y gh
       - run:
           name: Fix Versioning and Add Channel
           command: yarn circle:script
@@ -135,14 +114,21 @@ jobs:
       - persist_to_workspace:
           root: .
           paths:
-            - dist
+            - dist/*.exe
 
   release:
     executor: cider-ci
     steps:
       - checkout
       - attach_workspace:
-          at: ~/Cider
+          at: ~/Cider/dist
+      - run:
+          name: Installing GitHub Command Line Interface
+          command: |
+            sudo apt-get update -y
+            curl -fsSL https://cli.github.com/packages/githubcli-archive-keyring.gpg | sudo dd of=/usr/share/keyrings/githubcli-archive-keyring.gpg
+            echo "deb [arch=$(dpkg --print-architecture) signed-by=/usr/share/keyrings/githubcli-archive-keyring.gpg] https://cli.github.com/packages stable main" | sudo tee /etc/apt/sources.list.d/github-cli.list > /dev/null
+            sudo apt install -y gh
       - run:
           name: Move Build Files
           command: |

From 19d6d06a8d01c419dbcfbae204693d2013b3f111 Mon Sep 17 00:00:00 2001
From: Core <64542347+coredev-uk@users.noreply.github.com>
Date: Sat, 30 Apr 2022 16:07:56 +0100
Subject: [PATCH 27/51] Updated config.yml

---
 .circleci/config.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index fbbb5e95..44e956ce 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -57,7 +57,7 @@ jobs:
           name: Install Windows System Build Dependencies
           command: |
             sudo apt-get update -y
-            sudo apt-get install -y wine32
+            sudo apt-get install -y wine
       - run:
           name: Fix Versioning and Add Channel
           command: yarn circle:script
@@ -102,7 +102,7 @@ jobs:
           name: Install Windows System Build Dependencies
           command: |
             sudo apt-get update -y
-            sudo apt-get install -y wine32
+            sudo apt-get install -y wine
       - run:
           name: Fix Versioning and Add Channel
           command: yarn circle:script

From b02214173c39017abf538cead786e8b1da260429 Mon Sep 17 00:00:00 2001
From: Core <64542347+coredev-uk@users.noreply.github.com>
Date: Sat, 30 Apr 2022 16:17:07 +0100
Subject: [PATCH 28/51] Updated config.yml

---
 .circleci/config.yml | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 44e956ce..de602401 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -102,7 +102,10 @@ jobs:
           name: Install Windows System Build Dependencies
           command: |
             sudo apt-get update -y
-            sudo apt-get install -y wine
+            sudo apt-get install -y dpkg fakeroot wine64
+            sudo dpkg --add-architecture i386
+            sudo apt-get update -y
+            sudo apt-get install -y wine32
       - run:
           name: Fix Versioning and Add Channel
           command: yarn circle:script

From 5c76eb97bc7a988a319ca4c80fd78b7fe24d9049 Mon Sep 17 00:00:00 2001
From: Core <64542347+coredev-uk@users.noreply.github.com>
Date: Sat, 30 Apr 2022 16:22:51 +0100
Subject: [PATCH 29/51] Updated config.yml

---
 .circleci/config.yml | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index de602401..70d6f4a1 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -46,18 +46,22 @@ jobs:
             - node_modules
             - build
             - yarn.lock
+            - package.json
+            - winget.json # winget.json is a file that is generated by the winget package manager
 
   build-windows:
     executor: cider-ci
     steps:
-      - checkout
       - attach_workspace:
           at: ~/Cider
       - run:
           name: Install Windows System Build Dependencies
           command: |
             sudo apt-get update -y
-            sudo apt-get install -y wine
+            sudo apt-get install -y dpkg fakeroot wine64
+            sudo dpkg --add-architecture i386
+            sudo apt-get update -y
+            sudo apt-get install -y wine32
       - run:
           name: Fix Versioning and Add Channel
           command: yarn circle:script
@@ -74,7 +78,6 @@ jobs:
   build-linux:
     executor: cider-ci
     steps:
-      - checkout
       - attach_workspace:
           at: ~/Cider
       - run:
@@ -95,7 +98,6 @@ jobs:
   build-winget:
     executor: cider-ci
     steps:
-      - checkout
       - attach_workspace:
           at: ~/Cider
       - run:
@@ -122,7 +124,6 @@ jobs:
   release:
     executor: cider-ci
     steps:
-      - checkout
       - attach_workspace:
           at: ~/Cider/dist
       - run:

From bcf91c561f85b7a9f66bb59fb363f0fe72ea6bf5 Mon Sep 17 00:00:00 2001
From: Core <64542347+coredev-uk@users.noreply.github.com>
Date: Sat, 30 Apr 2022 16:30:23 +0100
Subject: [PATCH 30/51] Updated config.yml

---
 .circleci/config.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 70d6f4a1..b910579b 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -48,6 +48,7 @@ jobs:
             - yarn.lock
             - package.json
             - winget.json # winget.json is a file that is generated by the winget package manager
+            - resources/circle.js
 
   build-windows:
     executor: cider-ci

From 5fe0b80664c84eef785071d861e043a5a55034b7 Mon Sep 17 00:00:00 2001
From: Core <64542347+coredev-uk@users.noreply.github.com>
Date: Sat, 30 Apr 2022 16:33:18 +0100
Subject: [PATCH 31/51] Updated config.yml

---
 .circleci/config.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index b910579b..50b6c112 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -45,10 +45,10 @@ jobs:
           paths:
             - node_modules
             - build
+            - resources
             - yarn.lock
             - package.json
             - winget.json # winget.json is a file that is generated by the winget package manager
-            - resources/circle.js
 
   build-windows:
     executor: cider-ci

From 1dbced62176cc9aee019691ae3006929a0e0ca23 Mon Sep 17 00:00:00 2001
From: Core <64542347+coredev-uk@users.noreply.github.com>
Date: Sat, 30 Apr 2022 16:37:33 +0100
Subject: [PATCH 32/51] Updated config.yml

---
 .circleci/config.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 50b6c112..1dfd6f8f 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -49,6 +49,8 @@ jobs:
             - yarn.lock
             - package.json
             - winget.json # winget.json is a file that is generated by the winget package manager
+            - LICENSE
+            - license.txt
 
   build-windows:
     executor: cider-ci

From aa1ecd44505f7ce555222f475ff4d7f6d3234350 Mon Sep 17 00:00:00 2001
From: Core <64542347+coredev-uk@users.noreply.github.com>
Date: Sat, 30 Apr 2022 16:42:49 +0100
Subject: [PATCH 33/51] Updated config.yml

---
 .circleci/config.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 1dfd6f8f..41dd98e5 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -135,6 +135,7 @@ jobs:
             sudo apt-get update -y
             curl -fsSL https://cli.github.com/packages/githubcli-archive-keyring.gpg | sudo dd of=/usr/share/keyrings/githubcli-archive-keyring.gpg
             echo "deb [arch=$(dpkg --print-architecture) signed-by=/usr/share/keyrings/githubcli-archive-keyring.gpg] https://cli.github.com/packages stable main" | sudo tee /etc/apt/sources.list.d/github-cli.list > /dev/null
+            sudo apt-get update -y
             sudo apt install -y gh
       - run:
           name: Move Build Files

From 49f402d0ff1193c4019fedf0791a338194ddd741 Mon Sep 17 00:00:00 2001
From: Core <64542347+coredev-uk@users.noreply.github.com>
Date: Sat, 30 Apr 2022 16:48:32 +0100
Subject: [PATCH 34/51] Updated config.yml

---
 .circleci/config.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 41dd98e5..005bf25e 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -128,7 +128,7 @@ jobs:
     executor: cider-ci
     steps:
       - attach_workspace:
-          at: ~/Cider/dist
+          at: ~/Cider/
       - run:
           name: Installing GitHub Command Line Interface
           command: |

From decf313094920e2a2ff0ffa29f38666d3862582b Mon Sep 17 00:00:00 2001
From: Core <64542347+coredev-uk@users.noreply.github.com>
Date: Sat, 30 Apr 2022 16:54:05 +0100
Subject: [PATCH 35/51] Updated config.yml

---
 .circleci/config.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 005bf25e..26492b1f 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -95,7 +95,7 @@ jobs:
           root: .
           paths:
             - dist/*.deb
-            - dist/*.appimage
+            - dist/*.AppImage
             - dist/*.snap
 
   build-winget:

From 7335e71b40877eefd9be89b1ec432e043428e9bd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AE=A5=E5=8F=A1?=
 <46503943+jay900604@users.noreply.github.com>
Date: Sat, 30 Apr 2022 23:55:09 +0800
Subject: [PATCH 36/51] Update zh_TW.json

Update TW language.
---
 src/i18n/zh_TW.json | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/i18n/zh_TW.json b/src/i18n/zh_TW.json
index 8c5083cc..ace4cc50 100644
--- a/src/i18n/zh_TW.json
+++ b/src/i18n/zh_TW.json
@@ -215,6 +215,10 @@
   "settings.option.general.resumebehavior.locally.description": "Cider 將還原你在這台電腦上的最後一次操作。",
   "settings.option.general.resumebehavior.history": "歷史",
   "settings.option.general.resumebehavior.history.description": "Cider 將跨裝置將你的整個 Apple Music 歷史記錄中的最後一首歌曲排隊入列。",
+  "settings.option.general.resumetabs" : "啟動時打開的選項",
+  "settings.option.general.resumetabs.description" : "你可以選擇啟動 Cider 時要預設打開的左側選項欄。",
+  "settings.option.general.resumetabs.dynamic" : "動態",
+  "settings.option.general.resumetabs.dynamic.description" : "Cider 將打開你上次停留的左側選項欄。",
   "settings.option.general.language.main": "語言",
   "settings.option.general.language.fun": "特殊語言",
   "settings.option.general.language.unsorted": "未分類",
@@ -345,8 +349,8 @@
   "settings.option.connectivity.discordRPC.hideButtons": "隱藏 Discord 動態上的按鈕",
   "settings.option.connectivity.discordRPC.detailsFormat": "詳細資訊格式",
   "settings.option.connectivity.discordRPC.stateFormat": "狀態格式",
-  "settings.option.connectivity.lastfmScrobble": "Last.FM Scrobbling 記錄",
-  "settings.option.connectivity.lastfmScrobble.delay": "Last.FM Scrobble 延遲 (%)",
+  "settings.option.connectivity.lastfmScrobble": "Last.FM 音樂記錄",
+  "settings.option.connectivity.lastfmScrobble.delay": "Last.FM 歌曲追蹤延遲 (%)",
   "settings.option.connectivity.lastfmScrobble.nowPlaying": "開啟 Last.FM 正在聆聽",
   "settings.option.connectivity.lastfmScrobble.removeFeatured": "從歌名中移除客串藝人 (Last.FM)",
   "settings.option.connectivity.lastfmScrobble.filterLoop": "不記錄單曲循環 (Last.FM)",

From a8a638e9278a50d07da9f80479f3cc36197e9af4 Mon Sep 17 00:00:00 2001
From: Core <64542347+coredev-uk@users.noreply.github.com>
Date: Sat, 30 Apr 2022 16:59:38 +0100
Subject: [PATCH 37/51] Updated config.yml

---
 .circleci/config.yml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 26492b1f..d73dc419 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -77,6 +77,7 @@ jobs:
           root: .
           paths:
             - dist/*.exe
+            - dist/*.yml
 
   build-linux:
     executor: cider-ci
@@ -97,6 +98,7 @@ jobs:
             - dist/*.deb
             - dist/*.AppImage
             - dist/*.snap
+            - dist/*.yml
 
   build-winget:
     executor: cider-ci
@@ -123,6 +125,7 @@ jobs:
           root: .
           paths:
             - dist/*.exe
+            - dist/*.yml
 
   release:
     executor: cider-ci

From 62cda31eeeed6ece32203fbc1daf25adc2b48efa Mon Sep 17 00:00:00 2001
From: Core <64542347+coredev-uk@users.noreply.github.com>
Date: Sat, 30 Apr 2022 17:08:26 +0100
Subject: [PATCH 38/51] Updated config.yml

---
 .circleci/config.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index d73dc419..83d25acc 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -77,7 +77,7 @@ jobs:
           root: .
           paths:
             - dist/*.exe
-            - dist/*.yml
+            - dist/latest.yml
 
   build-linux:
     executor: cider-ci
@@ -98,7 +98,7 @@ jobs:
             - dist/*.deb
             - dist/*.AppImage
             - dist/*.snap
-            - dist/*.yml
+            - dist/latest-linux.yml
 
   build-winget:
     executor: cider-ci
@@ -125,7 +125,7 @@ jobs:
           root: .
           paths:
             - dist/*.exe
-            - dist/*.yml
+            # - dist/*.yml
 
   release:
     executor: cider-ci

From ee228566ae68a59eefcc9f884ddde0bcf5358899 Mon Sep 17 00:00:00 2001
From: Amaru8 <52407090+Amaru8@users.noreply.github.com>
Date: Sat, 30 Apr 2022 18:21:26 +0200
Subject: [PATCH 39/51] recheck on context menu button click

---
 src/renderer/views/components/mediaitem-list-item.ejs | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/renderer/views/components/mediaitem-list-item.ejs b/src/renderer/views/components/mediaitem-list-item.ejs
index 22a26f36..7ae5ed4e 100644
--- a/src/renderer/views/components/mediaitem-list-item.ejs
+++ b/src/renderer/views/components/mediaitem-list-item.ejs
@@ -331,6 +331,7 @@
                                 "disabled": true,
                                 "action": function () {
                                     app.love(self.item)
+                                    self.getHeartStatus()
                                 }
                             },
                             {
@@ -341,6 +342,7 @@
                                 "hidden": true,
                                 "action": function () {
                                     app.unlove(self.item)
+                                    self.getHeartStatus()
                                 }
                             },
                             {

From 1a3ceb7299adfb23c086e1b3116b9217e31853d4 Mon Sep 17 00:00:00 2001
From: Amaru8 <52407090+Amaru8@users.noreply.github.com>
Date: Sat, 30 Apr 2022 19:36:47 +0200
Subject: [PATCH 40/51] Remove spaces after strings

---
 src/i18n/zh_TW.json | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/i18n/zh_TW.json b/src/i18n/zh_TW.json
index ace4cc50..ce9cf9a4 100644
--- a/src/i18n/zh_TW.json
+++ b/src/i18n/zh_TW.json
@@ -215,10 +215,10 @@
   "settings.option.general.resumebehavior.locally.description": "Cider 將還原你在這台電腦上的最後一次操作。",
   "settings.option.general.resumebehavior.history": "歷史",
   "settings.option.general.resumebehavior.history.description": "Cider 將跨裝置將你的整個 Apple Music 歷史記錄中的最後一首歌曲排隊入列。",
-  "settings.option.general.resumetabs" : "啟動時打開的選項",
-  "settings.option.general.resumetabs.description" : "你可以選擇啟動 Cider 時要預設打開的左側選項欄。",
-  "settings.option.general.resumetabs.dynamic" : "動態",
-  "settings.option.general.resumetabs.dynamic.description" : "Cider 將打開你上次停留的左側選項欄。",
+  "settings.option.general.resumetabs": "啟動時打開的選項",
+  "settings.option.general.resumetabs.description": "你可以選擇啟動 Cider 時要預設打開的左側選項欄。",
+  "settings.option.general.resumetabs.dynamic": "動態",
+  "settings.option.general.resumetabs.dynamic.description": "Cider 將打開你上次停留的左側選項欄。",
   "settings.option.general.language.main": "語言",
   "settings.option.general.language.fun": "特殊語言",
   "settings.option.general.language.unsorted": "未分類",

From 70ca60fa43e9d336bbb5937c0338be2fc1f81069 Mon Sep 17 00:00:00 2001
From: Amaru8 <52407090+Amaru8@users.noreply.github.com>
Date: Sat, 30 Apr 2022 19:45:44 +0200
Subject: [PATCH 41/51] finally ffs

---
 src/renderer/views/components/mediaitem-list-item.ejs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/renderer/views/components/mediaitem-list-item.ejs b/src/renderer/views/components/mediaitem-list-item.ejs
index 7ae5ed4e..d4a96c93 100644
--- a/src/renderer/views/components/mediaitem-list-item.ejs
+++ b/src/renderer/views/components/mediaitem-list-item.ejs
@@ -330,8 +330,8 @@
                                 "hidden": false,
                                 "disabled": true,
                                 "action": function () {
+                                    self.isLoved = true
                                     app.love(self.item)
-                                    self.getHeartStatus()
                                 }
                             },
                             {
@@ -341,8 +341,8 @@
                                 "name": this.app.getLz('action.unlove'),
                                 "hidden": true,
                                 "action": function () {
+                                    self.isLoved = false
                                     app.unlove(self.item)
-                                    self.getHeartStatus()
                                 }
                             },
                             {

From 4e22857ccda94deba06476ef1a04f530a8f3e553 Mon Sep 17 00:00:00 2001
From: Amaru8 <52407090+Amaru8@users.noreply.github.com>
Date: Sat, 30 Apr 2022 20:21:28 +0200
Subject: [PATCH 42/51] Align heart icon

---
 src/renderer/less/elements.css                        | 6 ++++++
 src/renderer/less/elements.less                       | 7 +++++++
 src/renderer/style.css                                | 6 ++++++
 src/renderer/style.less                               | 8 ++++++++
 src/renderer/views/components/mediaitem-list-item.ejs | 2 +-
 5 files changed, 28 insertions(+), 1 deletion(-)

diff --git a/src/renderer/less/elements.css b/src/renderer/less/elements.css
index d4547eae..7aef758e 100644
--- a/src/renderer/less/elements.css
+++ b/src/renderer/less/elements.css
@@ -371,6 +371,12 @@
   filter: contrast(0);
   background-repeat: no-repeat;
 }
+.heart-icon {
+  height: 18px;
+  width: 39px;
+  filter: contrast(0);
+  background-repeat: no-repeat;
+}
 @keyframes load-bar {
   10% {
     box-shadow: inset 0 -4px 0;
diff --git a/src/renderer/less/elements.less b/src/renderer/less/elements.less
index 716b71a4..c5fae7a8 100644
--- a/src/renderer/less/elements.less
+++ b/src/renderer/less/elements.less
@@ -456,6 +456,13 @@
     background-repeat: no-repeat;
   }
 
+  .heart-icon {
+    height: 18px;
+    width: 39px;
+    filter: contrast(0);
+    background-repeat: no-repeat;
+  }
+
   /* CSS.gg
   */
   @keyframes load-bar {
diff --git a/src/renderer/style.css b/src/renderer/style.css
index 180d1296..4ef47570 100644
--- a/src/renderer/style.css
+++ b/src/renderer/style.css
@@ -7936,6 +7936,12 @@ fieldset:disabled .btn {
   filter: contrast(0);
   background-repeat: no-repeat;
 }
+.cd-mediaitem-list-item .heart-icon {
+  height: 18px;
+  width: 39px;
+  filter: contrast(0);
+  background-repeat: no-repeat;
+}
 @keyframes load-bar {
   10% {
     box-shadow: inset 0 -4px 0;
diff --git a/src/renderer/style.less b/src/renderer/style.less
index 13e7de3b..3900c772 100644
--- a/src/renderer/style.less
+++ b/src/renderer/style.less
@@ -1207,6 +1207,14 @@ body[platform="darwin"] .app-chrome .app-chrome-item > .window-controls > div.cl
       background-repeat: no-repeat;
       margin-left: 3px;
     }
+
+    .heart-icon {
+      height: 9px;
+      width: 13px;
+      filter: contrast(0);
+      background-repeat: no-repeat;
+      margin-left: 3px;
+    }
   }
 
   .lossless-icon {
diff --git a/src/renderer/views/components/mediaitem-list-item.ejs b/src/renderer/views/components/mediaitem-list-item.ejs
index d4a96c93..83189c1e 100644
--- a/src/renderer/views/components/mediaitem-list-item.ejs
+++ b/src/renderer/views/components/mediaitem-list-item.ejs
@@ -67,7 +67,7 @@
             </div>
             <div class="explicit-icon" v-if="item.attributes && item.attributes.contentRating == 'explicit'"></div>
             <template v-if="showMetaData == true" @dblclick="route()">
-                <div class="metainfo" style="min-width: 70px;" v-if="isLoved">
+                <div class="heart-icon" v-if="isLoved">
                     <div class="svg-icon" :style="{'--url': 'url(./assets/feather/heart-fill.svg)'}"></div>
                 </div>
                 <div class="metainfo">

From 91ac19974cc5407473757bbbf6a72a4f1cefbefe Mon Sep 17 00:00:00 2001
From: Amaru8 <52407090+Amaru8@users.noreply.github.com>
Date: Sat, 30 Apr 2022 21:06:25 +0200
Subject: [PATCH 43/51] Translate enableQQLyrics to Hungarian

---
 src/i18n/hu_HU.json | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/i18n/hu_HU.json b/src/i18n/hu_HU.json
index f1c47c8b..55706b2c 100644
--- a/src/i18n/hu_HU.json
+++ b/src/i18n/hu_HU.json
@@ -406,6 +406,7 @@
   "settings.option.lyrics.enableMusixmatchKaraoke": "Karaoke mód bekapcsolása (Csak MusixMatch)",
   "settings.option.lyrics.musixmatchPreferredLanguage": "MusixMatch fordítás nyelve",
   "settings.option.lyrics.enableYoutubeLyrics": "YouTube dalszövegek engedélyezése a zenei videóknál",
+  "settings.option.lyrics.enableQQLyrics": "QQLyrics dalszövegek engedélyezése",
   "settings.header.connectivity": "Csatlakozások",
   "settings.header.connectivity.description": "A Cider csatlakozás beállításainak módosítása.",
   "settings.option.connectivity.playbackNotifications": "Lejátszási értesítések",

From 9c85fafd1dd38684b89baa7536af360ba05218a1 Mon Sep 17 00:00:00 2001
From: Amaru8 <52407090+Amaru8@users.noreply.github.com>
Date: Sat, 30 Apr 2022 21:27:00 +0200
Subject: [PATCH 44/51] Changed if() to if ()

---
 src/main/base/plugins.ts                       |  2 +-
 src/renderer/index.js                          |  4 ++--
 src/renderer/main/events.js                    |  2 +-
 src/renderer/main/gamepad.js                   |  4 ++--
 src/renderer/main/vueapp.js                    |  2 +-
 src/renderer/main/wsapi_interop.js             |  4 ++--
 src/renderer/todo.js                           |  2 +-
 src/renderer/views/components/artist-chip.ejs  |  2 +-
 .../views/components/audio-settings.ejs        |  2 +-
 src/renderer/views/components/lyrics-view.ejs  |  4 ++--
 .../views/components/mediaitem-artwork.ejs     |  2 +-
 .../views/components/mediaitem-list-item.ejs   |  2 +-
 .../views/components/mediaitem-mvview.ejs      |  2 +-
 .../views/components/mediaitem-square.ejs      | 18 +++++++++---------
 src/renderer/views/components/queue.ejs        |  6 +++---
 src/renderer/views/components/share-sheet.ejs  |  2 +-
 .../views/components/spatial-properties.ejs    |  6 +++---
 src/renderer/views/pages/artist.ejs            |  2 +-
 src/renderer/views/pages/plugins-github.ejs    |  4 ++--
 src/renderer/views/pages/podcasts.ejs          |  4 ++--
 .../views/components/mediaitem-artwork.ejs     |  2 +-
 .../views/components/mediaitem-square.ejs      | 10 +++++-----
 22 files changed, 44 insertions(+), 44 deletions(-)

diff --git a/src/main/base/plugins.ts b/src/main/base/plugins.ts
index a09ee3e9..08bbb653 100644
--- a/src/main/base/plugins.ts
+++ b/src/main/base/plugins.ts
@@ -26,7 +26,7 @@ export class Plugins {
     }
 
     public static getPluginFromMap(plugin: string): any {
-        if(Plugins.PluginMap[plugin]) {
+        if (Plugins.PluginMap[plugin]) {
             return Plugins.PluginMap[plugin];
         }else{
             return plugin;
diff --git a/src/renderer/index.js b/src/renderer/index.js
index 8df442f8..6f83b9b1 100644
--- a/src/renderer/index.js
+++ b/src/renderer/index.js
@@ -105,7 +105,7 @@ function fallbackinitMusicKit() {
         })
         setTimeout(() => {
             app.init()
-            if(app.cfg.visual.window_background_style == "mica" && !app.isDev) {
+            if (app.cfg.visual.window_background_style == "mica" && !app.isDev) {
                 app.spawnMica()
             }
         }, 1000)
@@ -134,7 +134,7 @@ document.addEventListener('musickitloaded', function () {
             function waitForApp() {
                 if (typeof app.init !== "undefined") {
                     app.init()
-                    if(app.cfg.visual.window_background_style == "mica" && !app.isDev) {
+                    if (app.cfg.visual.window_background_style == "mica" && !app.isDev) {
                         app.spawnMica()
                     }
                 }
diff --git a/src/renderer/main/events.js b/src/renderer/main/events.js
index 0b2e13d3..f2140460 100644
--- a/src/renderer/main/events.js
+++ b/src/renderer/main/events.js
@@ -22,7 +22,7 @@ const Events = {
             if (event.keyCode === 82 && event.ctrlKey) {
                 event.preventDefault()
                 bootbox.confirm("Reload Cider?", (res)=>{
-                    if(res) {
+                    if (res) {
                         window.location.reload()
                     }
                 })
diff --git a/src/renderer/main/gamepad.js b/src/renderer/main/gamepad.js
index a902cd5f..e46c78c4 100644
--- a/src/renderer/main/gamepad.js
+++ b/src/renderer/main/gamepad.js
@@ -251,7 +251,7 @@ function simulateGamepad () {
 
                 cursorPos[1] -= cursorSpeed
                 // sounds.Hover.play()
-                // if(intTabIndex <= 0) {
+                // if (intTabIndex <= 0) {
                 //     intTabIndex = 0
                 // }else{
                 //     intTabIndex--
@@ -263,7 +263,7 @@ function simulateGamepad () {
                 e.preventDefault()
 
                 cursorPos[1] += cursorSpeed
-                // if(intTabIndex < tabbable.length) {
+                // if (intTabIndex < tabbable.length) {
                 //     intTabIndex++
                 // }else{
                 //     intTabIndex = tabbable.length
diff --git a/src/renderer/main/vueapp.js b/src/renderer/main/vueapp.js
index 58b49752..4ac66422 100644
--- a/src/renderer/main/vueapp.js
+++ b/src/renderer/main/vueapp.js
@@ -1671,7 +1671,7 @@ const app = new Vue({
                     params["meta[albums:tracks]"] = 'popularity'
                     params["fields[albums]"] = "artistName,artistUrl,artwork,contentRating,editorialArtwork,editorialNotes,editorialVideo,name,playParams,releaseDate,url,copyright"
                 }
-                if(kind.includes("playlist") || kind.includes("album")){
+                if (kind.includes("playlist") || kind.includes("album")){
                     app.page = (kind) + "_" + (id);
                     window.location.hash = `${kind}/${id}${isLibrary ? "/" + isLibrary : ''}`
                     app.getTypeFromID((kind), (id), (isLibrary), params);
diff --git a/src/renderer/main/wsapi_interop.js b/src/renderer/main/wsapi_interop.js
index d9477a23..8f5e8f9e 100644
--- a/src/renderer/main/wsapi_interop.js
+++ b/src/renderer/main/wsapi_interop.js
@@ -108,9 +108,9 @@ const wsapi = {
         app.mk.isPlaying ? app.mk.pause() : app.mk.play()
     },
     toggleRepeat() {
-        if(MusicKit.getInstance().repeatMode == 0) {
+        if (MusicKit.getInstance().repeatMode == 0) {
             MusicKit.getInstance().repeatMode = 1
-        }else if(MusicKit.getInstance().repeatMode == 1){
+        }else if (MusicKit.getInstance().repeatMode == 1){
             MusicKit.getInstance().repeatMode = 2
         }else{
             MusicKit.getInstance().repeatMode = 0
diff --git a/src/renderer/todo.js b/src/renderer/todo.js
index 3e8deaf9..5ef529f2 100644
--- a/src/renderer/todo.js
+++ b/src/renderer/todo.js
@@ -133,7 +133,7 @@ app.mkapi("artists", false, "412778295", {
 var library = []
 var downloaded = null;
 function downloadChunk () {
-    if(downloaded == null) {
+    if (downloaded == null) {
         app.mk.api.library.songs("", {limit: 100}, {includeResponseMeta: !0}).then((response)=>{
             processChunk(response)
         })
diff --git a/src/renderer/views/components/artist-chip.ejs b/src/renderer/views/components/artist-chip.ejs
index 12453996..9c2d884b 100644
--- a/src/renderer/views/components/artist-chip.ejs
+++ b/src/renderer/views/components/artist-chip.ejs
@@ -29,7 +29,7 @@
         template: '#artist-chip',
         async mounted() {
             let artistId = this.item.id
-            if(typeof this.item.relationships == "object") {
+            if (typeof this.item.relationships == "object") {
                 artistId = this.item.relationships.catalog.data[0].id
             }
             app.mk.api.v3.music(`/v1/catalog/${app.mk.storefrontId}/artists/${artistId}`).then(response => {
diff --git a/src/renderer/views/components/audio-settings.ejs b/src/renderer/views/components/audio-settings.ejs
index c8e0c5d4..249d49ca 100644
--- a/src/renderer/views/components/audio-settings.ejs
+++ b/src/renderer/views/components/audio-settings.ejs
@@ -54,7 +54,7 @@
                 app.modals.audioSettings = false
             },
             openSpatialAudio() {
-                if(app.cfg.audio.spatial === true && app.cfg.audio.maikiwiAudio.spatial === false) {
+                if (app.cfg.audio.spatial === true && app.cfg.audio.maikiwiAudio.spatial === false) {
                     app.modals.spatialProperties = true
                     app.modals.audioSettings = false
                 } else {
diff --git a/src/renderer/views/components/lyrics-view.ejs b/src/renderer/views/components/lyrics-view.ejs
index 3047bde6..26001890 100644
--- a/src/renderer/views/components/lyrics-view.ejs
+++ b/src/renderer/views/components/lyrics-view.ejs
@@ -115,7 +115,7 @@
         },
         methods: {
             seekTo(startTime) {
-                if(startTime != 9999999) this.app.seekTo(startTime, false);
+                if (startTime != 9999999) this.app.seekTo(startTime, false);
             },
             getActiveLyric() {
                 const delayfix = 0.1
@@ -125,7 +125,7 @@
                         if (app.currentLyricsLine != i) {
                             app.currentLyricsLine = i;
                             if (((app.lyricon && app.drawer.open) || app.appMode == 'fullscreen') && this.$refs.lyricsview.querySelector(`.lyric-line[line-index="${i}"]`)) {
-                               if(this.$refs.lyricsview.querySelector(`.lyric-line[line-index="${prevLine}"]`)) {this.$refs.lyricsview.querySelector(`.lyric-line[line-index="${prevLine}"]`).classList.remove("active");}
+                               if (this.$refs.lyricsview.querySelector(`.lyric-line[line-index="${prevLine}"]`)) {this.$refs.lyricsview.querySelector(`.lyric-line[line-index="${prevLine}"]`).classList.remove("active");}
                                 this.$refs.lyricsview.querySelector(`.lyric-line[line-index="${i}"]`).classList.add("active")
                                 if (this.checkIfScrollIsStatic) {
                                     let lyricElement = this.$refs.lyricsview.querySelector(`.lyric-line[line-index="${i}"]`)
diff --git a/src/renderer/views/components/mediaitem-artwork.ejs b/src/renderer/views/components/mediaitem-artwork.ejs
index f282629b..73cb478d 100644
--- a/src/renderer/views/components/mediaitem-artwork.ejs
+++ b/src/renderer/views/components/mediaitem-artwork.ejs
@@ -76,7 +76,7 @@
                 }, event)
             },
             getVideoPriority() {
-                if(app.cfg.visual.animated_artwork == "always") {
+                if (app.cfg.visual.animated_artwork == "always") {
                     return true;
                 }else if (this.videoPriority && app.cfg.visual.animated_artwork == "limited") {
                     return true
diff --git a/src/renderer/views/components/mediaitem-list-item.ejs b/src/renderer/views/components/mediaitem-list-item.ejs
index 83189c1e..f532f33a 100644
--- a/src/renderer/views/components/mediaitem-list-item.ejs
+++ b/src/renderer/views/components/mediaitem-list-item.ejs
@@ -152,7 +152,7 @@
             },
             getClasses() {
                 this.addClasses = {}
-                if(typeof this.item.attributes.playParams == "undefined") {
+                if (typeof this.item.attributes.playParams == "undefined") {
                     this.addClasses["disabled"] = true
                 }
                 if (this.classList) {
diff --git a/src/renderer/views/components/mediaitem-mvview.ejs b/src/renderer/views/components/mediaitem-mvview.ejs
index 3dc241e8..b915768f 100644
--- a/src/renderer/views/components/mediaitem-mvview.ejs
+++ b/src/renderer/views/components/mediaitem-mvview.ejs
@@ -27,7 +27,7 @@
                 <div class="title text-overflow-elipsis" @click='app.routeView(item)'>
                     {{ item.attributes.name ?? '' }}
                 </div>
-                <div class="subtitle text-overflow-elipsis item-navigate" v-if="item.attributes.artistName" :style = "{'z-index': ((item.attributes.editorialNotes == null) && item.attributes.artistName) ? '4' : ''}" @click="if(item.attributes.artistName)app.searchAndNavigate(item,'artist')">
+                <div class="subtitle text-overflow-elipsis item-navigate" v-if="item.attributes.artistName" :style = "{'z-index': ((item.attributes.editorialNotes == null) && item.attributes.artistName) ? '4' : ''}" @click="if (item.attributes.artistName)app.searchAndNavigate(item,'artist')">
                     {{ item.attributes.artistName ?? '' }}
                 </div>
 
diff --git a/src/renderer/views/components/mediaitem-square.ejs b/src/renderer/views/components/mediaitem-square.ejs
index 93fc2dfd..9a7ac134 100644
--- a/src/renderer/views/components/mediaitem-square.ejs
+++ b/src/renderer/views/components/mediaitem-square.ejs
@@ -93,12 +93,12 @@
         },
         async mounted() {
             await this.getBadges()
-            if(typeof this.item.attributes.playParams == "object") {
-                if(this.item.attributes.playParams.kind.includes("radioStation") && (this.item.attributes.playParams.streamingKind == 1 || this.item.attributes.playParams.streamingKind == 2)) {
+            if (typeof this.item.attributes.playParams == "object") {
+                if (this.item.attributes.playParams.kind.includes("radioStation") && (this.item.attributes.playParams.streamingKind == 1 || this.item.attributes.playParams.streamingKind == 2)) {
                     this.unavailable = true
                 }
             }else{
-                if(this.item.type == "music-movies" || this.item.type == "tv-episodes") {
+                if (this.item.type == "music-movies" || this.item.type == "tv-episodes") {
                     this.unavailable = true
                 }
             }
@@ -116,7 +116,7 @@
                 }
             },
             getSubtitle() {
-                if(this.kind == 'card') {
+                if (this.kind == 'card') {
                     try {
                         if (typeof this.item.attributes.artistNames != "undefined") {
                             return this.item.attributes.artistNames
@@ -139,7 +139,7 @@
                 }
             },
             getSubtitleNavigation() {
-                if(this.kind == 'card') {
+                if (this.kind == 'card') {
                     try {
                         if (typeof this.item.attributes.artistNames != "undefined") {
                             return app.routeView(this.item)
@@ -224,7 +224,7 @@
             },
             getArtworkUrl(size = -1, includeUrl = false) {
                 let artwork = this.item.attributes.artwork ? this.item.attributes.artwork.url : ''
-                if(size != -1) {
+                if (size != -1) {
                     artwork = artwork.replace('{w}', size).replace('{h}', size).replace('{f}', "webp").replace('{c}', ((size === 900) ? "sr" : "cc"))
                 }
                 switch (this.kind) {
@@ -232,7 +232,7 @@
                         artwork = this.item.attributes.editorialArtwork?.subscriptionHero?.url ?? (this.item.attributes.artwork?.url ?? (this.item.relationships?.contents?.data[0]?.attributes?.editorialArtwork?.subscriptionHero?.url ?? ''))
                         break;
                 }
-                if(!includeUrl) {
+                if (!includeUrl) {
                     return artwork
                 }else{
                     return `url("${artwork}")`
@@ -471,7 +471,7 @@
 
                 try {
                     await this.isInLibrary().then((_) => {
-                        if(self.addedToLibrary) {
+                        if (self.addedToLibrary) {
                             menus.normal.items.find(x => x.id == 'addToLibrary').hidden = true
                             menus.normal.items.find(x => x.id == 'removeFromLibrary').hidden = false
                         }else{
@@ -530,7 +530,7 @@
                         }
                     }
                 }
-                if(self.app.cfg.home.followedArtists.includes(this.item.id)) {
+                if (self.app.cfg.home.followedArtists.includes(this.item.id)) {
                     followAction = "unfollow"
                 }
                 app.showMenuPanel({
diff --git a/src/renderer/views/components/queue.ejs b/src/renderer/views/components/queue.ejs
index fc675bd5..92d8329f 100644
--- a/src/renderer/views/components/queue.ejs
+++ b/src/renderer/views/components/queue.ejs
@@ -70,8 +70,8 @@
                 this.history = history.data.data
             },
             select(e, position) {
-                if(e.ctrlKey || e.shiftKey) {
-                    if(this.selectedItems.indexOf(position) == -1) {
+                if (e.ctrlKey || e.shiftKey) {
+                    if (this.selectedItems.indexOf(position) == -1) {
                         this.selectedItems.push(position)
                     } else {
                         this.selectedItems.splice(this.selectedItems.indexOf(position), 1)
@@ -83,7 +83,7 @@
             queueContext(event, item, position) {
                 let self = this
                 let useMenu = "single"
-                if(this.selectedItems.length > 1) {
+                if (this.selectedItems.length > 1) {
                     useMenu = "multiple"
                 }
                 let menus = {
diff --git a/src/renderer/views/components/share-sheet.ejs b/src/renderer/views/components/share-sheet.ejs
index ee093413..9e08a438 100644
--- a/src/renderer/views/components/share-sheet.ejs
+++ b/src/renderer/views/components/share-sheet.ejs
@@ -63,7 +63,7 @@
         },
         methods: {
             playlistSelect(playlist) {
-                if(playlist.type != "library-playlist-folders") {
+                if (playlist.type != "library-playlist-folders") {
                     this.addToPlaylist(playlist.id)
                 }
             },
diff --git a/src/renderer/views/components/spatial-properties.ejs b/src/renderer/views/components/spatial-properties.ejs
index d802ca2a..ccaf53cb 100644
--- a/src/renderer/views/components/spatial-properties.ejs
+++ b/src/renderer/views/components/spatial-properties.ejs
@@ -294,7 +294,7 @@
             this.room_materials = JSON.parse(JSON.stringify(this.$root.cfg.audio.spatial_properties.room_materials))
             this.audio_position = JSON.parse(JSON.stringify(this.$root.cfg.audio.spatial_properties.audio_position))
             this.listener_position = JSON.parse(JSON.stringify(this.$root.cfg.audio.spatial_properties.listener_position))
-            if(typeof this.app.mk.nowPlayingItem != "undefined") {
+            if (typeof this.app.mk.nowPlayingItem != "undefined") {
                 this.setRoom()
             }
             this.ready = true
@@ -320,7 +320,7 @@
             },
             objectContainerStyle() {
                 let scale = 1
-                if(this.room_dimensions.width * this.visualMultiplier > 300) {
+                if (this.room_dimensions.width * this.visualMultiplier > 300) {
                     scale = 300 / (this.room_dimensions.width * this.visualMultiplier)
                 }
                 let style = {
@@ -346,7 +346,7 @@
                 window.CiderAudio.audioNodes.spatialNode.setRoomProperties(this.room_dimensions, this.room_materials);
                 CiderAudio.audioNodes.spatialInput.setPosition(...this.audio_position)
                 CiderAudio.audioNodes.spatialNode.setListenerPosition(...this.listener_position)
-                if(!this.app.cfg.audio.normalization) {
+                if (!this.app.cfg.audio.normalization) {
                     window.CiderAudio.audioNodes.gainNode.gain.value = app.cfg.audio.spatial_properties.gain
                 }
             }
diff --git a/src/renderer/views/pages/artist.ejs b/src/renderer/views/pages/artist.ejs
index 04171b26..3136dd12 100644
--- a/src/renderer/views/pages/artist.ejs
+++ b/src/renderer/views/pages/artist.ejs
@@ -172,7 +172,7 @@
                         }
                     }
                 }
-                if(this.app.cfg.home.followedArtists.includes(self.data.id)) {
+                if (this.app.cfg.home.followedArtists.includes(self.data.id)) {
                     followAction = "unfollow"
                 }
                 app.showMenuPanel({
diff --git a/src/renderer/views/pages/plugins-github.ejs b/src/renderer/views/pages/plugins-github.ejs
index 5d0bc28b..f760cdee 100644
--- a/src/renderer/views/pages/plugins-github.ejs
+++ b/src/renderer/views/pages/plugins-github.ejs
@@ -132,7 +132,7 @@
                                 self.themes = []
                                 notyf.success(app.getLz('settings.notyf.visual.plugin.install.success'));
                                 bootbox.confirm(app.getLz("settings.prompt.visual.plugin.github.success"), (ok)=>{
-                                    if(ok) {
+                                    if (ok) {
                                         ipcRenderer.invoke("relaunchApp")
                                     }else{
                                         return
@@ -154,7 +154,7 @@
                             if (arg.success) {
                                 self.themes = ipcRenderer.sendSync("get-themes")
                                 bootbox.confirm(app.getLz("settings.prompt.visual.plugin.github.success"), (ok)=>{
-                                    if(ok) {
+                                    if (ok) {
                                         ipcRenderer.invoke("relaunchApp")
                                     }else{
                                         return
diff --git a/src/renderer/views/pages/podcasts.ejs b/src/renderer/views/pages/podcasts.ejs
index b13821ff..7430c01d 100644
--- a/src/renderer/views/pages/podcasts.ejs
+++ b/src/renderer/views/pages/podcasts.ejs
@@ -187,7 +187,7 @@
             },
             searchPodcasts() {
                 let self = this
-                if(this.search.term == "") {
+                if (this.search.term == "") {
                     return
                 }
                 app.mk.api.v3.podcasts("/v1/catalog/us/search", {term: this.search.term, types: ["podcasts"], limit: 25}).then(response => {
@@ -227,7 +227,7 @@
             async getNextEpisodes(next, podcastId) {
 
                 let podcastShow = await app.mk.api.v3.podcasts(next)
-                if(podcastId != this.podcastSelected.id) {
+                if (podcastId != this.podcastSelected.id) {
                     return
                 }
                 podcastShow.data.data.forEach(ep => {
diff --git a/src/web-remote/views/components/mediaitem-artwork.ejs b/src/web-remote/views/components/mediaitem-artwork.ejs
index faf19dd4..0f8dc225 100644
--- a/src/web-remote/views/components/mediaitem-artwork.ejs
+++ b/src/web-remote/views/components/mediaitem-artwork.ejs
@@ -90,7 +90,7 @@
                 return "https://beta.music.apple.com/assets/product/MissingArtworkMusic.svg"
             }
             height = parseInt(height * window.devicePixelRatio)
-            if(width) {
+            if (width) {
                 width = parseInt(width * window.devicePixelRatio)
             }
             let newurl = `${url.replace('{w}', width ?? height).replace('{h}', height).replace('{f}', "webp").replace('{c}', ((width === 900) ? "sr" : "cc"))}`;
diff --git a/src/web-remote/views/components/mediaitem-square.ejs b/src/web-remote/views/components/mediaitem-square.ejs
index 90e9aa9b..04aef194 100644
--- a/src/web-remote/views/components/mediaitem-square.ejs
+++ b/src/web-remote/views/components/mediaitem-square.ejs
@@ -93,7 +93,7 @@
 
             },
             getSubtitle() {
-                if(this.kind == 'card') {
+                if (this.kind == 'card') {
                     try {
                         if (typeof this.item.attributes.artistNames != "undefined") {
                             return this.item.attributes.artistNames
@@ -116,7 +116,7 @@
                 }
             },
             getSubtitleNavigation() {
-                if(this.kind == 'card') {
+                if (this.kind == 'card') {
                     try {
                         if (typeof this.item.attributes.artistNames != "undefined") {
                             return app.routeView(this.item)
@@ -200,7 +200,7 @@
             },
             getArtworkUrl(size = -1, includeUrl = false) {
                 let artwork = this.item.attributes.artwork ? this.item.attributes.artwork.url : ''
-                if(size != -1) {
+                if (size != -1) {
                     artwork = artwork.replace('{w}', size).replace('{h}', size).replace('{f}', "webp").replace('{c}', ((size === 900) ? "sr" : "cc"))
                 }
                 switch (this.kind) {
@@ -208,7 +208,7 @@
                         artwork = this.item.attributes.editorialArtwork.subscriptionHero.url
                         break;
                 }
-                if(!includeUrl) {
+                if (!includeUrl) {
                     return artwork
                 }else{
                     return `url("${artwork}")`
@@ -423,7 +423,7 @@
 
                 try {
                     await this.isInLibrary().then((_) => {
-                        if(self.addedToLibrary) {
+                        if (self.addedToLibrary) {
                             menus.normal.items.find(x => x.id == 'addToLibrary').hidden = true
                             menus.normal.items.find(x => x.id == 'removeFromLibrary').hidden = false
                         }else{

From 422c869568fc69bdb33e0e52208ec0b890b4d32d Mon Sep 17 00:00:00 2001
From: Amaru8 <52407090+Amaru8@users.noreply.github.com>
Date: Sat, 30 Apr 2022 21:28:18 +0200
Subject: [PATCH 45/51] Change }else to } else

---
 src/main/base/plugins.ts                           |  2 +-
 src/renderer/main/gamepad.js                       |  4 ++--
 src/renderer/main/vueapp.js                        |  2 +-
 src/renderer/main/wsapi_interop.js                 |  4 ++--
 src/renderer/todo.js                               |  2 +-
 .../views/components/mediaitem-artwork.ejs         |  2 +-
 .../views/components/mediaitem-list-item.ejs       |  2 +-
 src/renderer/views/components/mediaitem-square.ejs | 14 +++++++-------
 src/renderer/views/pages/plugins-github.ejs        |  4 ++--
 src/renderer/views/pages/settings.ejs              |  2 +-
 .../views/components/mediaitem-square.ejs          | 10 +++++-----
 11 files changed, 24 insertions(+), 24 deletions(-)

diff --git a/src/main/base/plugins.ts b/src/main/base/plugins.ts
index 08bbb653..6cc593d4 100644
--- a/src/main/base/plugins.ts
+++ b/src/main/base/plugins.ts
@@ -28,7 +28,7 @@ export class Plugins {
     public static getPluginFromMap(plugin: string): any {
         if (Plugins.PluginMap[plugin]) {
             return Plugins.PluginMap[plugin];
-        }else{
+        } else{
             return plugin;
         }
     }
diff --git a/src/renderer/main/gamepad.js b/src/renderer/main/gamepad.js
index e46c78c4..3a176616 100644
--- a/src/renderer/main/gamepad.js
+++ b/src/renderer/main/gamepad.js
@@ -253,7 +253,7 @@ function simulateGamepad () {
                 // sounds.Hover.play()
                 // if (intTabIndex <= 0) {
                 //     intTabIndex = 0
-                // }else{
+                // } else{
                 //     intTabIndex--
                 // }
                 // $(tabbable[intTabIndex]).focus()
@@ -265,7 +265,7 @@ function simulateGamepad () {
                 cursorPos[1] += cursorSpeed
                 // if (intTabIndex < tabbable.length) {
                 //     intTabIndex++
-                // }else{
+                // } else{
                 //     intTabIndex = tabbable.length
                 // }
                 // $(tabbable[intTabIndex]).focus()
diff --git a/src/renderer/main/vueapp.js b/src/renderer/main/vueapp.js
index 4ac66422..ee9c9bce 100644
--- a/src/renderer/main/vueapp.js
+++ b/src/renderer/main/vueapp.js
@@ -1675,7 +1675,7 @@ const app = new Vue({
                     app.page = (kind) + "_" + (id);
                     window.location.hash = `${kind}/${id}${isLibrary ? "/" + isLibrary : ''}`
                     app.getTypeFromID((kind), (id), (isLibrary), params);
-                }else{
+                } else{
                     app.page = (kind)
                     window.location.hash = `${kind}/${id}${isLibrary ? "/" + isLibrary : ''}`
                 }
diff --git a/src/renderer/main/wsapi_interop.js b/src/renderer/main/wsapi_interop.js
index 8f5e8f9e..3d9f9fcf 100644
--- a/src/renderer/main/wsapi_interop.js
+++ b/src/renderer/main/wsapi_interop.js
@@ -110,9 +110,9 @@ const wsapi = {
     toggleRepeat() {
         if (MusicKit.getInstance().repeatMode == 0) {
             MusicKit.getInstance().repeatMode = 1
-        }else if (MusicKit.getInstance().repeatMode == 1){
+        } else if (MusicKit.getInstance().repeatMode == 1){
             MusicKit.getInstance().repeatMode = 2
-        }else{
+        } else{
             MusicKit.getInstance().repeatMode = 0
         }
     },
diff --git a/src/renderer/todo.js b/src/renderer/todo.js
index 5ef529f2..15b30520 100644
--- a/src/renderer/todo.js
+++ b/src/renderer/todo.js
@@ -137,7 +137,7 @@ function downloadChunk () {
         app.mk.api.library.songs("", {limit: 100}, {includeResponseMeta: !0}).then((response)=>{
             processChunk(response)
         })
-    }else{
+    } else{
         downloaded.next("", {limit: 100}, {includeResponseMeta: !0}).then((response)=>{
             processChunk(response)
         })
diff --git a/src/renderer/views/components/mediaitem-artwork.ejs b/src/renderer/views/components/mediaitem-artwork.ejs
index 73cb478d..7fa4ea0d 100644
--- a/src/renderer/views/components/mediaitem-artwork.ejs
+++ b/src/renderer/views/components/mediaitem-artwork.ejs
@@ -78,7 +78,7 @@
             getVideoPriority() {
                 if (app.cfg.visual.animated_artwork == "always") {
                     return true;
-                }else if (this.videoPriority && app.cfg.visual.animated_artwork == "limited") {
+                } else if (this.videoPriority && app.cfg.visual.animated_artwork == "limited") {
                     return true
                 } else if (app.cfg.visual.animated_artwork == "disabled") {
                     return false
diff --git a/src/renderer/views/components/mediaitem-list-item.ejs b/src/renderer/views/components/mediaitem-list-item.ejs
index f532f33a..e4e4b0a9 100644
--- a/src/renderer/views/components/mediaitem-list-item.ejs
+++ b/src/renderer/views/components/mediaitem-list-item.ejs
@@ -185,7 +185,7 @@
                     } else {
                         return this.item.attributes.playParams.kind
                     }
-                }else{
+                } else{
                     return this.item.type
                 }
             },
diff --git a/src/renderer/views/components/mediaitem-square.ejs b/src/renderer/views/components/mediaitem-square.ejs
index 9a7ac134..96f1407b 100644
--- a/src/renderer/views/components/mediaitem-square.ejs
+++ b/src/renderer/views/components/mediaitem-square.ejs
@@ -97,7 +97,7 @@
                 if (this.item.attributes.playParams.kind.includes("radioStation") && (this.item.attributes.playParams.streamingKind == 1 || this.item.attributes.playParams.streamingKind == 2)) {
                     this.unavailable = true
                 }
-            }else{
+            } else{
                 if (this.item.type == "music-movies" || this.item.type == "tv-episodes") {
                     this.unavailable = true
                 }
@@ -130,7 +130,7 @@
                     }catch(e) {
                         return ''
                     }
-                }else {
+                } else {
                     if (typeof this.item.attributes.artistName != "undefined") {
                         return this.item.attributes.artistName
                     } else {
@@ -153,7 +153,7 @@
                     }catch(e) {
                         return app.routeView(this.item)
                     }
-                }else {
+                } else {
                     if (typeof this.item.attributes.artistName != "undefined") {
                         return app.searchAndNavigate(this.item,'artist')
                     } else {
@@ -234,7 +234,7 @@
                 }
                 if (!includeUrl) {
                     return artwork
-                }else{
+                } else{
                     return `url("${artwork}")`
                 }
             },
@@ -442,7 +442,7 @@
                                         if (self.item.relationships.catalog){
                                             app.mkapi(self.item.attributes.playParams.kind, false, self.item.relationships.catalog.data[0].id).then(u => {self.app.copyToClipboard((u.data.data.length && u.data.data.length > 0)? u.data.data[0].attributes.url : u.data.data.attributes.url)})
                                         }
-                                    }else {
+                                    } else {
                                     self.app.copyToClipboard(self.item.attributes.url)}
                                 }
                             },
@@ -454,7 +454,7 @@
                                         if (self.item.relationships.catalog){
                                             app.mkapi(self.item.attributes.playParams.kind, false, self.item.relationships.catalog.data[0].id).then(u => {self.app.songLinkShare((u.data.data.length && u.data.data.length > 0)? u.data.data[0].attributes.url : u.data.data.attributes.url)})
                                         }
-                                    }else {
+                                    } else {
                                     self.app.songLinkShare(self.item.attributes.url)}
                                 }
                             }
@@ -474,7 +474,7 @@
                         if (self.addedToLibrary) {
                             menus.normal.items.find(x => x.id == 'addToLibrary').hidden = true
                             menus.normal.items.find(x => x.id == 'removeFromLibrary').hidden = false
-                        }else{
+                        } else{
                             menus.normal.items.find(x => x.id == 'addToLibrary').disabled = false
                         }
                     })
diff --git a/src/renderer/views/pages/plugins-github.ejs b/src/renderer/views/pages/plugins-github.ejs
index f760cdee..8a636d7e 100644
--- a/src/renderer/views/pages/plugins-github.ejs
+++ b/src/renderer/views/pages/plugins-github.ejs
@@ -134,7 +134,7 @@
                                 bootbox.confirm(app.getLz("settings.prompt.visual.plugin.github.success"), (ok)=>{
                                     if (ok) {
                                         ipcRenderer.invoke("relaunchApp")
-                                    }else{
+                                    } else{
                                         return
                                     }
                                 })
@@ -156,7 +156,7 @@
                                 bootbox.confirm(app.getLz("settings.prompt.visual.plugin.github.success"), (ok)=>{
                                     if (ok) {
                                         ipcRenderer.invoke("relaunchApp")
-                                    }else{
+                                    } else{
                                         return
                                     }
                                 })
diff --git a/src/renderer/views/pages/settings.ejs b/src/renderer/views/pages/settings.ejs
index 09ff4a8c..377aea79 100644
--- a/src/renderer/views/pages/settings.ejs
+++ b/src/renderer/views/pages/settings.ejs
@@ -1542,7 +1542,7 @@
                     this.tabIndex = parseInt(window.location.hash.split("/")[1])
                     console.debug("tabIndex", this.tabIndex)
                     this.canChangeHash = true
-                }else{
+                } else{
                     this.canChangeHash = true
                 }
             })
diff --git a/src/web-remote/views/components/mediaitem-square.ejs b/src/web-remote/views/components/mediaitem-square.ejs
index 04aef194..5c907484 100644
--- a/src/web-remote/views/components/mediaitem-square.ejs
+++ b/src/web-remote/views/components/mediaitem-square.ejs
@@ -86,7 +86,7 @@
 
                 if (luma > 140) {
                     return "#aaaaaa"
-                }else{
+                } else{
                     return color
                 }
 
@@ -107,7 +107,7 @@
                     }catch(e) {
                         return ''
                     }
-                }else {
+                } else {
                     if (typeof this.item.attributes.artistName != "undefined") {
                         return this.item.attributes.artistName
                     } else {
@@ -130,7 +130,7 @@
                     }catch(e) {
                         return app.routeView(this.item)
                     }
-                }else {
+                } else {
                     if (typeof this.item.attributes.artistName != "undefined") {
                         return app.searchAndNavigate(this.item,'artist')
                     } else {
@@ -210,7 +210,7 @@
                 }
                 if (!includeUrl) {
                     return artwork
-                }else{
+                } else{
                     return `url("${artwork}")`
                 }
             },
@@ -426,7 +426,7 @@
                         if (self.addedToLibrary) {
                             menus.normal.items.find(x => x.id == 'addToLibrary').hidden = true
                             menus.normal.items.find(x => x.id == 'removeFromLibrary').hidden = false
-                        }else{
+                        } else{
                             menus.normal.items.find(x => x.id == 'addToLibrary').disabled = false
                         }
                     })

From 48cce96beac6070fadff57ec959b3d550fe8591b Mon Sep 17 00:00:00 2001
From: Amaru8 <52407090+Amaru8@users.noreply.github.com>
Date: Sat, 30 Apr 2022 21:29:44 +0200
Subject: [PATCH 46/51] Change else{ to else {

---
 src/main/base/plugins.ts                              | 2 +-
 src/renderer/main/gamepad.js                          | 4 ++--
 src/renderer/main/vueapp.js                           | 2 +-
 src/renderer/main/wsapi_interop.js                    | 2 +-
 src/renderer/todo.js                                  | 2 +-
 src/renderer/views/components/mediaitem-list-item.ejs | 2 +-
 src/renderer/views/components/mediaitem-square.ejs    | 6 +++---
 src/renderer/views/pages/plugins-github.ejs           | 4 ++--
 src/renderer/views/pages/settings.ejs                 | 2 +-
 src/web-remote/views/components/mediaitem-square.ejs  | 6 +++---
 10 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/src/main/base/plugins.ts b/src/main/base/plugins.ts
index 6cc593d4..d51e8a85 100644
--- a/src/main/base/plugins.ts
+++ b/src/main/base/plugins.ts
@@ -28,7 +28,7 @@ export class Plugins {
     public static getPluginFromMap(plugin: string): any {
         if (Plugins.PluginMap[plugin]) {
             return Plugins.PluginMap[plugin];
-        } else{
+        } else {
             return plugin;
         }
     }
diff --git a/src/renderer/main/gamepad.js b/src/renderer/main/gamepad.js
index 3a176616..abe20631 100644
--- a/src/renderer/main/gamepad.js
+++ b/src/renderer/main/gamepad.js
@@ -253,7 +253,7 @@ function simulateGamepad () {
                 // sounds.Hover.play()
                 // if (intTabIndex <= 0) {
                 //     intTabIndex = 0
-                // } else{
+                // } else {
                 //     intTabIndex--
                 // }
                 // $(tabbable[intTabIndex]).focus()
@@ -265,7 +265,7 @@ function simulateGamepad () {
                 cursorPos[1] += cursorSpeed
                 // if (intTabIndex < tabbable.length) {
                 //     intTabIndex++
-                // } else{
+                // } else {
                 //     intTabIndex = tabbable.length
                 // }
                 // $(tabbable[intTabIndex]).focus()
diff --git a/src/renderer/main/vueapp.js b/src/renderer/main/vueapp.js
index ee9c9bce..a00c345d 100644
--- a/src/renderer/main/vueapp.js
+++ b/src/renderer/main/vueapp.js
@@ -1675,7 +1675,7 @@ const app = new Vue({
                     app.page = (kind) + "_" + (id);
                     window.location.hash = `${kind}/${id}${isLibrary ? "/" + isLibrary : ''}`
                     app.getTypeFromID((kind), (id), (isLibrary), params);
-                } else{
+                } else {
                     app.page = (kind)
                     window.location.hash = `${kind}/${id}${isLibrary ? "/" + isLibrary : ''}`
                 }
diff --git a/src/renderer/main/wsapi_interop.js b/src/renderer/main/wsapi_interop.js
index 3d9f9fcf..4439d956 100644
--- a/src/renderer/main/wsapi_interop.js
+++ b/src/renderer/main/wsapi_interop.js
@@ -112,7 +112,7 @@ const wsapi = {
             MusicKit.getInstance().repeatMode = 1
         } else if (MusicKit.getInstance().repeatMode == 1){
             MusicKit.getInstance().repeatMode = 2
-        } else{
+        } else {
             MusicKit.getInstance().repeatMode = 0
         }
     },
diff --git a/src/renderer/todo.js b/src/renderer/todo.js
index 15b30520..4c95d8ed 100644
--- a/src/renderer/todo.js
+++ b/src/renderer/todo.js
@@ -137,7 +137,7 @@ function downloadChunk () {
         app.mk.api.library.songs("", {limit: 100}, {includeResponseMeta: !0}).then((response)=>{
             processChunk(response)
         })
-    } else{
+    } else {
         downloaded.next("", {limit: 100}, {includeResponseMeta: !0}).then((response)=>{
             processChunk(response)
         })
diff --git a/src/renderer/views/components/mediaitem-list-item.ejs b/src/renderer/views/components/mediaitem-list-item.ejs
index e4e4b0a9..caf6ef1a 100644
--- a/src/renderer/views/components/mediaitem-list-item.ejs
+++ b/src/renderer/views/components/mediaitem-list-item.ejs
@@ -185,7 +185,7 @@
                     } else {
                         return this.item.attributes.playParams.kind
                     }
-                } else{
+                } else {
                     return this.item.type
                 }
             },
diff --git a/src/renderer/views/components/mediaitem-square.ejs b/src/renderer/views/components/mediaitem-square.ejs
index 96f1407b..5f4a9aa0 100644
--- a/src/renderer/views/components/mediaitem-square.ejs
+++ b/src/renderer/views/components/mediaitem-square.ejs
@@ -97,7 +97,7 @@
                 if (this.item.attributes.playParams.kind.includes("radioStation") && (this.item.attributes.playParams.streamingKind == 1 || this.item.attributes.playParams.streamingKind == 2)) {
                     this.unavailable = true
                 }
-            } else{
+            } else {
                 if (this.item.type == "music-movies" || this.item.type == "tv-episodes") {
                     this.unavailable = true
                 }
@@ -234,7 +234,7 @@
                 }
                 if (!includeUrl) {
                     return artwork
-                } else{
+                } else {
                     return `url("${artwork}")`
                 }
             },
@@ -474,7 +474,7 @@
                         if (self.addedToLibrary) {
                             menus.normal.items.find(x => x.id == 'addToLibrary').hidden = true
                             menus.normal.items.find(x => x.id == 'removeFromLibrary').hidden = false
-                        } else{
+                        } else {
                             menus.normal.items.find(x => x.id == 'addToLibrary').disabled = false
                         }
                     })
diff --git a/src/renderer/views/pages/plugins-github.ejs b/src/renderer/views/pages/plugins-github.ejs
index 8a636d7e..a07d8aa1 100644
--- a/src/renderer/views/pages/plugins-github.ejs
+++ b/src/renderer/views/pages/plugins-github.ejs
@@ -134,7 +134,7 @@
                                 bootbox.confirm(app.getLz("settings.prompt.visual.plugin.github.success"), (ok)=>{
                                     if (ok) {
                                         ipcRenderer.invoke("relaunchApp")
-                                    } else{
+                                    } else {
                                         return
                                     }
                                 })
@@ -156,7 +156,7 @@
                                 bootbox.confirm(app.getLz("settings.prompt.visual.plugin.github.success"), (ok)=>{
                                     if (ok) {
                                         ipcRenderer.invoke("relaunchApp")
-                                    } else{
+                                    } else {
                                         return
                                     }
                                 })
diff --git a/src/renderer/views/pages/settings.ejs b/src/renderer/views/pages/settings.ejs
index 377aea79..40e7439e 100644
--- a/src/renderer/views/pages/settings.ejs
+++ b/src/renderer/views/pages/settings.ejs
@@ -1542,7 +1542,7 @@
                     this.tabIndex = parseInt(window.location.hash.split("/")[1])
                     console.debug("tabIndex", this.tabIndex)
                     this.canChangeHash = true
-                } else{
+                } else {
                     this.canChangeHash = true
                 }
             })
diff --git a/src/web-remote/views/components/mediaitem-square.ejs b/src/web-remote/views/components/mediaitem-square.ejs
index 5c907484..b58a5271 100644
--- a/src/web-remote/views/components/mediaitem-square.ejs
+++ b/src/web-remote/views/components/mediaitem-square.ejs
@@ -86,7 +86,7 @@
 
                 if (luma > 140) {
                     return "#aaaaaa"
-                } else{
+                } else {
                     return color
                 }
 
@@ -210,7 +210,7 @@
                 }
                 if (!includeUrl) {
                     return artwork
-                } else{
+                } else {
                     return `url("${artwork}")`
                 }
             },
@@ -426,7 +426,7 @@
                         if (self.addedToLibrary) {
                             menus.normal.items.find(x => x.id == 'addToLibrary').hidden = true
                             menus.normal.items.find(x => x.id == 'removeFromLibrary').hidden = false
-                        } else{
+                        } else {
                             menus.normal.items.find(x => x.id == 'addToLibrary').disabled = false
                         }
                     })

From f5ff731c3f0e6dd95a666190c7c33cc54fbc389f Mon Sep 17 00:00:00 2001
From: Amaru8 <52407090+Amaru8@users.noreply.github.com>
Date: Sat, 30 Apr 2022 21:55:54 +0200
Subject: [PATCH 47/51] Add Love indicator to albums too

---
 src/renderer/views/components/mediaitem-list-item.ejs | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/renderer/views/components/mediaitem-list-item.ejs b/src/renderer/views/components/mediaitem-list-item.ejs
index caf6ef1a..086e27a0 100644
--- a/src/renderer/views/components/mediaitem-list-item.ejs
+++ b/src/renderer/views/components/mediaitem-list-item.ejs
@@ -66,10 +66,10 @@
                 </div>
             </div>
             <div class="explicit-icon" v-if="item.attributes && item.attributes.contentRating == 'explicit'"></div>
+            <div class="heart-icon" v-if="isLoved">
+                <div class="svg-icon" :style="{'--url': 'url(./assets/feather/heart-fill.svg)'}"></div>
+            </div>
             <template v-if="showMetaData == true" @dblclick="route()">
-                <div class="heart-icon" v-if="isLoved">
-                    <div class="svg-icon" :style="{'--url': 'url(./assets/feather/heart-fill.svg)'}"></div>
-                </div>
                 <div class="metainfo">
                     {{ item.attributes.releaseDate ? new Date(item.attributes.releaseDate).toLocaleDateString()
                     : "" }}

From 42569ae9c5899fc8b02ef10d4ed6f737d82e7234 Mon Sep 17 00:00:00 2001
From: Amaru8 <52407090+Amaru8@users.noreply.github.com>
Date: Sat, 30 Apr 2022 22:23:08 +0200
Subject: [PATCH 48/51] Swap heart with explicit

---
 src/renderer/views/components/mediaitem-list-item.ejs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/renderer/views/components/mediaitem-list-item.ejs b/src/renderer/views/components/mediaitem-list-item.ejs
index 086e27a0..d2b318d6 100644
--- a/src/renderer/views/components/mediaitem-list-item.ejs
+++ b/src/renderer/views/components/mediaitem-list-item.ejs
@@ -65,10 +65,10 @@
                     </template>
                 </div>
             </div>
-            <div class="explicit-icon" v-if="item.attributes && item.attributes.contentRating == 'explicit'"></div>
             <div class="heart-icon" v-if="isLoved">
                 <div class="svg-icon" :style="{'--url': 'url(./assets/feather/heart-fill.svg)'}"></div>
             </div>
+            <div class="explicit-icon" v-if="item.attributes && item.attributes.contentRating == 'explicit'"></div>
             <template v-if="showMetaData == true" @dblclick="route()">
                 <div class="metainfo">
                     {{ item.attributes.releaseDate ? new Date(item.attributes.releaseDate).toLocaleDateString()

From 3896bd2e366e742d35049871b92fc0126843dfd2 Mon Sep 17 00:00:00 2001
From: Core <64542347+coredev-uk@users.noreply.github.com>
Date: Sun, 1 May 2022 01:57:21 +0100
Subject: [PATCH 49/51] Update config.yml

---
 .circleci/config.yml | 153 ++++++++-----------------------------------
 1 file changed, 28 insertions(+), 125 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 83d25acc..62dc1183 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -1,21 +1,18 @@
 version: 2.1
-
-executors:
-  cider-ci:
-    docker:
-      - image: circleci/node:16
-    working_directory: ~/Cider
-
 orbs: # adds orbs to your configuration
   jira: circleci/jira@1.0.5 # invokes the Jira orb, making its commands accessible
-
-# The jobs for this project
+branches:
+      only:
+        - main
+        - develop
 jobs:
-  prepare-build:
-    executor: cider-ci
+  build:
+    working_directory: ~/Cider
+    docker:
+      - image: circleci/node:16
+      
     steps:
       - checkout
-      - run: ls -la
       - run:
           name: Set App Version
           command: echo "export APP_VERSION=$(grep '"version":.*' package.json | cut -d '"' -f 4 | head -1)" >> $BASH_ENV
@@ -35,144 +32,50 @@ jobs:
           paths:
             - ~/.cache/yarn
       - run:
-          name: TypeScript Compile
-          command: yarn build
-      - persist_to_workspace:
-          # Must be an absolute path, or relative path from working_directory. This is a directory on the container which is
-          # taken to be the root directory of the workspace.
-          root: .
-          # Must be relative path from root
-          paths:
-            - node_modules
-            - build
-            - resources
-            - yarn.lock
-            - package.json
-            - winget.json # winget.json is a file that is generated by the winget package manager
-            - LICENSE
-            - license.txt
-
-  build-windows:
-    executor: cider-ci
-    steps:
-      - attach_workspace:
-          at: ~/Cider
-      - run:
-          name: Install Windows System Build Dependencies
+          name: Install system build dependencies
           command: |
             sudo apt-get update -y
+            curl -fsSL https://cli.github.com/packages/githubcli-archive-keyring.gpg | sudo dd of=/usr/share/keyrings/githubcli-archive-keyring.gpg
+            echo "deb [arch=$(dpkg --print-architecture) signed-by=/usr/share/keyrings/githubcli-archive-keyring.gpg] https://cli.github.com/packages stable main" | sudo tee /etc/apt/sources.list.d/github-cli.list > /dev/null
             sudo apt-get install -y dpkg fakeroot wine64
             sudo dpkg --add-architecture i386
             sudo apt-get update -y
             sudo apt-get install -y wine32
+            sudo apt install -y gh
       - run:
           name: Fix Versioning and Add Channel
           command: yarn circle:script
       - run:
-          name: Generate Builds (Windows)
-          command: yarn electron-builder -w --x64 -p never
-          post-steps:
-            - jira/notify
-      - persist_to_workspace:
-          root: .
-          paths:
-            - dist/*.exe
-            - dist/latest.yml
-
-  build-linux:
-    executor: cider-ci
-    steps:
-      - attach_workspace:
-          at: ~/Cider
-      - run:
-          name: Fix Versioning and Add Channel
-          command: yarn circle:script
+          name: TypeScript Compile
+          command: yarn build
       - run:
           name: Generate Builds (Linux)
           command: yarn electron-builder -l -p never
           post-steps:
             - jira/notify
-      - persist_to_workspace:
-          root: .
-          paths:
-            - dist/*.deb
-            - dist/*.AppImage
-            - dist/*.snap
-            - dist/latest-linux.yml
-
-  build-winget:
-    executor: cider-ci
-    steps:
-      - attach_workspace:
-          at: ~/Cider
       - run:
-          name: Install Windows System Build Dependencies
-          command: |
-            sudo apt-get update -y
-            sudo apt-get install -y dpkg fakeroot wine64
-            sudo dpkg --add-architecture i386
-            sudo apt-get update -y
-            sudo apt-get install -y wine32
-      - run:
-          name: Fix Versioning and Add Channel
-          command: yarn circle:script
+          name: Generate Builds (Windows)
+          command: yarn electron-builder -w --x64 -p never
+          post-steps:
+            - jira/notify
       - run:
           name: Generate Builds (Winget)
           command: yarn electron-builder --win -c winget.json -p never
           post-steps:
             - jira/notify
-      - persist_to_workspace:
-          root: .
-          paths:
-            - dist/*.exe
-            # - dist/*.yml
-
-  release:
-    executor: cider-ci
-    steps:
-      - attach_workspace:
-          at: ~/Cider/
-      - run:
-          name: Installing GitHub Command Line Interface
-          command: |
-            sudo apt-get update -y
-            curl -fsSL https://cli.github.com/packages/githubcli-archive-keyring.gpg | sudo dd of=/usr/share/keyrings/githubcli-archive-keyring.gpg
-            echo "deb [arch=$(dpkg --print-architecture) signed-by=/usr/share/keyrings/githubcli-archive-keyring.gpg] https://cli.github.com/packages stable main" | sudo tee /etc/apt/sources.list.d/github-cli.list > /dev/null
-            sudo apt-get update -y
-            sudo apt install -y gh
       - run:
           name: Move Build Files
           command: |
-            mkdir ~/Cider/dist/artifacts/
-            mv ~/Cider/dist/*.exe ~/Cider/dist/artifacts
-            mv ~/Cider/dist/*.deb ~/Cider/dist/artifacts
-            mv ~/Cider/dist/*.AppImage ~/Cider/dist/artifacts
-            mv ~/Cider/dist/*.snap ~/Cider/dist/artifacts
-            mv ~/Cider/dist/*.yml ~/Cider/dist/artifacts
-            mv ~/Cider/dist/*.blockmap ~/Cider/dist/artifacts
+              mkdir ~/Cider/dist/artifacts/
+              mv ~/Cider/dist/*.exe ~/Cider/dist/artifacts
+              mv ~/Cider/dist/*.deb ~/Cider/dist/artifacts
+              mv ~/Cider/dist/*.AppImage ~/Cider/dist/artifacts
+              mv ~/Cider/dist/*.snap ~/Cider/dist/artifacts
+              mv ~/Cider/dist/*.yml ~/Cider/dist/artifacts
+              mv ~/Cider/dist/*.blockmap ~/Cider/dist/artifacts
       - store_artifacts:
-          path: ~/Cider/dist/artifacts
+          path: ~/Cider/dist/artifacts 
       - run:
           name: Publish Release
           command: |
-            gh release create "v${APP_VERSION}.${CIRCLE_BUILD_NUM}" --title "Cider Version ${APP_VERSION} - Build ${CIRCLE_BUILD_NUM} (${CIRCLE_BRANCH})" --generate-notes -R ciderapp/cider-releases ~/Cider/dist/artifacts/*.deb ~/Cider/dist/artifacts/*.AppImage ~/Cider/dist/artifacts/*.snap ~/Cider/dist/artifacts/*.exe ~/Cider/dist/artifacts/*.yml ~/Cider/dist/artifacts/*.blockmap
-
-# Orchestrate our job run sequence
-workflows:
-  build_and_release:
-    jobs:
-      - prepare-build
-      - build-windows:
-          requires:
-            - prepare-build
-      - build-linux:
-          requires:
-            - prepare-build
-      - build-winget:
-          requires:
-            - prepare-build
-      - release:
-          requires:
-            - build-windows
-            - build-linux
-            - build-winget
+              gh release create "v${APP_VERSION}.${CIRCLE_BUILD_NUM}" --title "Cider Version ${APP_VERSION} - Build ${CIRCLE_BUILD_NUM} (${CIRCLE_BRANCH})" --generate-notes -R ciderapp/cider-releases ~/Cider/dist/artifacts/*.deb ~/Cider/dist/artifacts/*.AppImage ~/Cider/dist/artifacts/*.snap ~/Cider/dist/artifacts/*.exe ~/Cider/dist/artifacts/*.yml ~/Cider/dist/artifacts/*.blockmap

From ef05f20534fb4801b8b14976c5bb0558b9d7bbea Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AE=A5=E5=8F=A1?=
 <46503943+jay900604@users.noreply.github.com>
Date: Sun, 1 May 2022 14:09:09 +0800
Subject: [PATCH 50/51] Update zh_TW.json

Update TW language.
---
 src/i18n/zh_TW.json | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/src/i18n/zh_TW.json b/src/i18n/zh_TW.json
index ce9cf9a4..0062f872 100644
--- a/src/i18n/zh_TW.json
+++ b/src/i18n/zh_TW.json
@@ -151,6 +151,9 @@
   "podcast.episodes": "單集",
   "podcast.playEpisode": "播放單集",
   "podcast.website": "Podcast 網站",
+  "action.edit": "編輯",
+  "action.done": "完成",
+  "action.editTracklist": "編輯歌曲清單",
   "action.addToLibrary": "加入到資料庫",
   "action.addToLibrary.success": "成功加入資料庫",
   "action.addToLibrary.error": "加入資料庫時，發生錯誤",
@@ -215,10 +218,10 @@
   "settings.option.general.resumebehavior.locally.description": "Cider 將還原你在這台電腦上的最後一次操作。",
   "settings.option.general.resumebehavior.history": "歷史",
   "settings.option.general.resumebehavior.history.description": "Cider 將跨裝置將你的整個 Apple Music 歷史記錄中的最後一首歌曲排隊入列。",
-  "settings.option.general.resumetabs": "啟動時打開的選項",
-  "settings.option.general.resumetabs.description": "你可以選擇啟動 Cider 時要預設打開的左側選項欄。",
-  "settings.option.general.resumetabs.dynamic": "動態",
-  "settings.option.general.resumetabs.dynamic.description": "Cider 將打開你上次停留的左側選項欄。",
+  "settings.option.general.resumetabs": "啟動時打開的選項頁面",
+  "settings.option.general.resumetabs.description": "你可以選擇啟動 Cider 時要預設打開的頁面。",
+  "settings.option.general.resumetabs.dynamic": "自動",
+  "settings.option.general.resumetabs.dynamic.description": "Cider 將自動打開你上次停留的頁面。",
   "settings.option.general.language.main": "語言",
   "settings.option.general.language.fun": "特殊語言",
   "settings.option.general.language.unsorted": "未分類",

From 0e2c9a33b99ce80de51b70841a61ad87f1bf061d Mon Sep 17 00:00:00 2001
From: Amaru8 <52407090+Amaru8@users.noreply.github.com>
Date: Sun, 1 May 2022 11:04:16 +0200
Subject: [PATCH 51/51] Make heart icon independent from explicit

---
 src/renderer/less/elements.css  | 4 ++--
 src/renderer/less/elements.less | 4 ++--
 src/renderer/style.css          | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/renderer/less/elements.css b/src/renderer/less/elements.css
index 7aef758e..9eee757a 100644
--- a/src/renderer/less/elements.css
+++ b/src/renderer/less/elements.css
@@ -372,8 +372,8 @@
   background-repeat: no-repeat;
 }
 .heart-icon {
-  height: 18px;
-  width: 39px;
+  position: absolute;
+  right: 30em;
   filter: contrast(0);
   background-repeat: no-repeat;
 }
diff --git a/src/renderer/less/elements.less b/src/renderer/less/elements.less
index c5fae7a8..b08a8d60 100644
--- a/src/renderer/less/elements.less
+++ b/src/renderer/less/elements.less
@@ -457,8 +457,8 @@
   }
 
   .heart-icon {
-    height: 18px;
-    width: 39px;
+    position: absolute;
+    right: 30em;
     filter: contrast(0);
     background-repeat: no-repeat;
   }
diff --git a/src/renderer/style.css b/src/renderer/style.css
index 4ef47570..6e617f33 100644
--- a/src/renderer/style.css
+++ b/src/renderer/style.css
@@ -7937,8 +7937,8 @@ fieldset:disabled .btn {
   background-repeat: no-repeat;
 }
 .cd-mediaitem-list-item .heart-icon {
-  height: 18px;
-  width: 39px;
+  position: absolute;
+  right: 30em;
   filter: contrast(0);
   background-repeat: no-repeat;
 }