From 94752b55c10153375096aa561cc49784388b48c5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Onur=20G=C3=BCm=C3=BC=C5=9F?= <10urgumus@gmail.com> Date: Sat, 29 Jan 2022 22:33:37 +0300 Subject: [PATCH 01/12] update hodor --- src/i18n/en_HODOR.jsonc | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/i18n/en_HODOR.jsonc b/src/i18n/en_HODOR.jsonc index 5075fa0f..5d45c6dc 100644 --- a/src/i18n/en_HODOR.jsonc +++ b/src/i18n/en_HODOR.jsonc @@ -214,6 +214,7 @@ "settings.option.visual.windowBackgroundStyle": "HODOR HODOR HODOR", // Toggle "settings.header.visual.windowBackgroundStyle.none": "HODOR", "settings.header.visual.windowBackgroundStyle.artwork": "HODOR", + "settings.header.visual.windowBackgroundStyle.image": "HODOR", "settings.option.visual.animatedArtwork": "HODOR HODOR", // Dropdown "settings.header.visual.animatedArtwork.always": "HODOR", "settings.header.visual.animatedArtwork.limited": "HODOR HODOR HODOR HODOR HODOR HODOR", @@ -244,6 +245,7 @@ "settings.header.connectivity": "HODOR", "settings.header.connectivity.description": "HODOR HODOR HODOR HODOR HODOR HODOR.", "settings.option.connectivity.discordRPC": "HODOR HODOR HODOR", // Dropdown + "settings.option.connectivity.playbackNotifications": "HODOR HODOR HODOR HODOR", // Toggle // Refer to term.disabled for the disabled option "settings.header.connectivity.discordRPC.cider": "HODOR HODOR 'HODOR'", "settings.header.connectivity.discordRPC.appleMusic": "HODOR HODOR 'HODOR HODOR'", @@ -283,6 +285,7 @@ "spatial.down" : "HODOR", "spatial.listener" : "HODOR", "spatial.audioSource" : "HODOR HODOR", + "spatial.gain" : "HODOR", // Settings - Unfinished "settings.header.unfinished": "HODOR", From e4147dbb7900f836b69629d5be0dfc499f089e34 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Onur=20G=C3=BCm=C3=BC=C5=9F?= <10urgumus@gmail.com> Date: Sat, 29 Jan 2022 22:33:44 +0300 Subject: [PATCH 02/12] update turkish --- src/i18n/tr_TR.jsonc | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/i18n/tr_TR.jsonc b/src/i18n/tr_TR.jsonc index afcf3d97..302f80ed 100644 --- a/src/i18n/tr_TR.jsonc +++ b/src/i18n/tr_TR.jsonc @@ -214,6 +214,7 @@ "settings.header.visual": "Görünüm", "settings.header.visual.description": "Cider'in nasıl gözükmesini istediğinizi ayarlayın", "settings.option.visual.windowBackgroundStyle": "Uygulama Arka Plan Stili", // Toggle + "settings.header.visual.windowBackgroundStyle.image": "Görsel", "settings.header.visual.windowBackgroundStyle.none": "Karanlık", "settings.header.visual.windowBackgroundStyle.artwork": "Albüm Kapağı", "settings.option.visual.animatedArtwork": "Hareketli Albüm Kapakları", // Dropdown @@ -246,6 +247,7 @@ "settings.header.connectivity": "Diğer Servisler", "settings.header.connectivity.description": "Cider'i diğer servislere bağlayarak deneyiminizi zenginleştirin.", "settings.option.connectivity.discordRPC": "Ne Dinlediğimi Discord'da Göster", // Dropdown + "settings.option.connectivity.playbackNotifications": "Oynatılan değiştiğinde bildirim göster", // Toggle // Refer to term.disabled for the disabled option "settings.header.connectivity.discordRPC.cider": "'Cider' Olarak", "settings.header.connectivity.discordRPC.appleMusic": "'Apple Music' Olarak", @@ -285,6 +287,7 @@ "spatial.down" : "Aşağı", "spatial.listener" : "Dinleyici", "spatial.audioSource" : "Ses Kaynağı", + "spatial.gain" : "Kazanç", // Settings - Unfinished "settings.header.unfinished": "Geliştirme Aşamasında", @@ -295,5 +298,4 @@ //About "about.thanks": "Cider Collective Ekibine ve tüm katkıda bulunanlara çok teşekkür ederiz." - } \ No newline at end of file From 1218de9511045846a5201c7a1bf645c766c0df38 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Onur=20G=C3=BCm=C3=BC=C5=9F?= <10urgumus@gmail.com> Date: Sun, 30 Jan 2022 14:30:49 +0300 Subject: [PATCH 03/12] Re arranged miss arranged term/action entry --- src/i18n/de_DE.jsonc | 2 +- src/i18n/el_GR.jsonc | 2 +- src/i18n/en_HODOR.jsonc | 2 +- src/i18n/en_US.jsonc | 14 ++++++++++++-- src/i18n/fr_CA.jsonc | 2 +- src/i18n/fr_FR.jsonc | 2 +- src/i18n/tr_TR.jsonc | 2 +- 7 files changed, 18 insertions(+), 8 deletions(-) diff --git a/src/i18n/de_DE.jsonc b/src/i18n/de_DE.jsonc index 0a7f9732..b5ef5017 100644 --- a/src/i18n/de_DE.jsonc +++ b/src/i18n/de_DE.jsonc @@ -117,7 +117,7 @@ "term.tracks": "Lieder", // Assume x amount of tracks. e.g. 50 tracks "term.videos": "Videos", "term.menu": "Menü", - "term.showAlbum": "Zeige ganzes Album", + "action.showAlbum": "Zeige ganzes Album", // Home "home.title": "Home", diff --git a/src/i18n/el_GR.jsonc b/src/i18n/el_GR.jsonc index 6dc5452a..ca100520 100644 --- a/src/i18n/el_GR.jsonc +++ b/src/i18n/el_GR.jsonc @@ -117,7 +117,7 @@ "term.tracks": "τραγούδια", // Assume x amount of tracks. e.g. 50 tracks "term.videos": "Βίντεο", "term.menu": "Μενού", - "term.showAlbum": "Εμφάνιση ολόκληρου άλμπουμ", + "action.showAlbum": "Εμφάνιση ολόκληρου άλμπουμ", // Home "home.title": "Αρχική", diff --git a/src/i18n/en_HODOR.jsonc b/src/i18n/en_HODOR.jsonc index 5d45c6dc..28e68ac1 100644 --- a/src/i18n/en_HODOR.jsonc +++ b/src/i18n/en_HODOR.jsonc @@ -117,7 +117,7 @@ "term.funLanguages": "HODOR", "term.videos": "HODOR", "term.menu": "HODOR", - "term.showAlbum": "HODOR HODOR HODOR", + "action.showAlbum": "HODOR HODOR HODOR", // Home "home.title": "HODOR", diff --git a/src/i18n/en_US.jsonc b/src/i18n/en_US.jsonc index 104087cf..9df559d8 100644 --- a/src/i18n/en_US.jsonc +++ b/src/i18n/en_US.jsonc @@ -45,6 +45,11 @@ "term.podcasts": "Podcasts", "term.playlists": "Playlists", "term.playlist": "Playlist", + "term.newPlaylist": "New Playlist", + "term.newPlaylistFolder": "New Playlist Folder", + "term.createNewPlaylist": "Create New Playlist", + "term.createNewPlaylistFolder": "Create New Playlist Folder", + "term.deletePlaylist": "Are you sure you want to delete this playlist?", "term.play": "Play", "term.pause": "Pause", "term.previous": "Previous", @@ -118,7 +123,6 @@ "term.tracks": "tracks", // Assume x amount of tracks. e.g. 50 tracks "term.videos": "Videos", "term.menu": "Menu", - "term.showAlbum": "Show Complete Album", // Home "home.title": "Home", @@ -157,7 +161,7 @@ "action.removeFromQueue": "Remove from Queue", "action.removeFromQueue.success": "Removed from Queue", "action.removeFromQueue.error": "Error Removing from Queue", - "action.createPlaylist": "Create Playlist", + "action.createPlaylist": "Create a New Playlist", "action.addToPlaylist": "Add to Playlist", "action.removeFromPlaylist": "Remove from Playlist", "action.addToFavorites": "Add to Favorites", @@ -185,6 +189,11 @@ "action.removeTracks": "Remove ${self.selectedItems.length} tracks from queue", "action.import": "Import", "action.export": "Export", + "action.showAlbum": "Show Complete Album", + // Waiting on Core for moving plugin to app.ts + "action.tray.minimize": "Minimize to Tray", + "action.tray.quit": "Quit", + "action.tray.show": "Show", // Settings - General "settings.header.general": "General", @@ -270,6 +279,7 @@ // Refer to term.disabled & term.enabled // Spatialization Menu + "spatial.notTurnedOn": "Audio Spatialization is disabled. To use, please enable it first.", "spatial.spatialProperties" : "Spatial Properties", "spatial.width" : "Width", "spatial.height" : "Height", diff --git a/src/i18n/fr_CA.jsonc b/src/i18n/fr_CA.jsonc index b3b2c14c..132cf845 100644 --- a/src/i18n/fr_CA.jsonc +++ b/src/i18n/fr_CA.jsonc @@ -117,7 +117,7 @@ "term.tracks": "chansons", // Assume x amount of tracks. e.g. 50 tracks "term.videos": "Vidéos", "term.menu": "Menu", - "term.showAlbum": "Afficher l'album complet", + "action.showAlbum": "Afficher l'album complet", // Home "home.title": "Maison", diff --git a/src/i18n/fr_FR.jsonc b/src/i18n/fr_FR.jsonc index d909879d..83ecc9e2 100644 --- a/src/i18n/fr_FR.jsonc +++ b/src/i18n/fr_FR.jsonc @@ -117,7 +117,7 @@ "term.tracks": "musiques", // Assume x amount of tracks. e.g. 50 tracks "term.videos": "Vidéos", "term.menu": "Menu", - "term.showAlbum": "Afficher l'album complet", + "action.showAlbum": "Afficher l'album complet", // Home "home.title": "Accueil", diff --git a/src/i18n/tr_TR.jsonc b/src/i18n/tr_TR.jsonc index 302f80ed..2e443cce 100644 --- a/src/i18n/tr_TR.jsonc +++ b/src/i18n/tr_TR.jsonc @@ -183,7 +183,7 @@ "action.removeTracks": "Sıradan ${self.selectedItems.length} adet şarkıyı kaldır", "action.import": "Import", "action.export": "Export", - "term.showAlbum": "Tüm Albümü Göster", + "action.showAlbum": "Tüm Albümü Göster", // Settings - General (Reserved) "settings.header.general": "Genel Ayarlar", From b600b5528aadf277a7d9d737c8b095f05c67b738 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Onur=20G=C3=BCm=C3=BC=C5=9F?= <10urgumus@gmail.com> Date: Sun, 30 Jan 2022 14:31:31 +0300 Subject: [PATCH 04/12] Added new playlist strings to the i18n --- src/i18n/tr_TR.jsonc | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/i18n/tr_TR.jsonc b/src/i18n/tr_TR.jsonc index 2e443cce..e15d65f1 100644 --- a/src/i18n/tr_TR.jsonc +++ b/src/i18n/tr_TR.jsonc @@ -45,6 +45,11 @@ "term.podcasts": "Podcastler", "term.playlists": "Listeler", "term.playlist": "Liste", + "term.createNewPlaylist": "Yeni Liste Oluştur", + "term.createNewPlaylistFolder": "Yeni Klasör Oluştur", + "term.newPlaylist": "Yeni Liste", + "term.newPlaylistFolder": "Yeni Klasör", + "term.deletePlaylist": "Bu listeyi silmek istediğinize emin misiniz?", "term.play": "Oynat", "term.pause": "Duraklat", "term.previous": "Önceki", From 5b273139c841b0f9404a55332675cb0f335e4e92 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Onur=20G=C3=BCm=C3=BC=C5=9F?= <10urgumus@gmail.com> Date: Sun, 30 Jan 2022 14:32:09 +0300 Subject: [PATCH 05/12] Enabled new i18n strings (playlist stuff) --- src/renderer/index.js | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/src/renderer/index.js b/src/renderer/index.js index 9e518400..d362349d 100644 --- a/src/renderer/index.js +++ b/src/renderer/index.js @@ -512,7 +512,7 @@ const app = new Vue({ } } this.modals.addToPlaylist = false - app.newPlaylist("New Playlist", pl_items) + app.newPlaylist(app.getLz('term.newPlaylist'), pl_items) }, async addSelectedToPlaylist(playlist_id) { let self = this @@ -910,13 +910,13 @@ const app = new Vue({ playlistHeaderContextMenu(event) { let menu = { items: [{ - name: "New Playlist", + name: app.getLz('term.createNewPlaylist'), action: () => { this.newPlaylist() } }, { - name: "New Playlist Folder", + name: app.getLz('term.createNewPlaylistFolder'), action: () => { this.newPlaylistFolder() } @@ -925,7 +925,7 @@ const app = new Vue({ } this.showMenuPanel(menu, event) }, - async editPlaylistFolder(id, name = "New Playlist") { + async editPlaylistFolder(id, name = app.getLz('term.newPlaylist')) { let self = this this.mk.api.v3.music( `/v1/me/library/playlist-folders/${id}`, {}, { @@ -940,7 +940,7 @@ const app = new Vue({ self.refreshPlaylists() }) }, - async editPlaylist(id, name = "New Playlist") { + async editPlaylist(id, name = app.getLz('term.newPlaylist')) { let self = this this.mk.api.v3.music( `/v1/me/library/playlists/${id}`, {}, { @@ -958,7 +958,7 @@ const app = new Vue({ copyToClipboard(str) { navigator.clipboard.writeText(str) }, - newPlaylist(name = "New Playlist", tracks = []) { + newPlaylist(name = app.getLz('term.newPlaylist'), tracks = []) { let self = this let request = { name: name @@ -2119,7 +2119,7 @@ const app = new Vue({ this.getMadeForYou(attempt + 1) } }, - newPlaylistFolder(name = "New Folder") { + newPlaylistFolder(name = app.getLz('term.newPlaylistFolder')) { let self = this this.mk.api.v3.music( "/v1/me/library/playlist-folders/", {}, { From 8d1663e4e427da6daa4bf2455b0328a5339325fa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Onur=20G=C3=BCm=C3=BC=C5=9F?= <10urgumus@gmail.com> Date: Sun, 30 Jan 2022 14:32:24 +0300 Subject: [PATCH 06/12] Localized are u sure promp --- src/renderer/index.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/renderer/index.js b/src/renderer/index.js index d362349d..903dbc63 100644 --- a/src/renderer/index.js +++ b/src/renderer/index.js @@ -997,7 +997,7 @@ const app = new Vue({ }, deletePlaylist(id) { let self = this - if (confirm(`Are you sure you want to delete this playlist?`)) { + if (confirm(app.getLz('term.deletePlaylist'))) { app.mk.api.v3.music(`/v1/me/library/playlists/${id}`, {}, { fetchOptions: { method: "DELETE" From 7bade02895f371912679b2684ee2cbecd6fce6d2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Onur=20G=C3=BCm=C3=BC=C5=9F?= <10urgumus@gmail.com> Date: Sun, 30 Jan 2022 14:33:05 +0300 Subject: [PATCH 07/12] updated the term/action confusion --- src/renderer/views/pages/cider-playlist.ejs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/renderer/views/pages/cider-playlist.ejs b/src/renderer/views/pages/cider-playlist.ejs index 2195c568..dcec0b3b 100644 --- a/src/renderer/views/pages/cider-playlist.ejs +++ b/src/renderer/views/pages/cider-playlist.ejs @@ -157,7 +157,7 @@
From 480c549bfc67bc8b5c2c94a3d9a5403d3d4aaaf7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Onur=20G=C3=BCm=C3=BC=C5=9F?= <10urgumus@gmail.com> Date: Sun, 30 Jan 2022 14:33:20 +0300 Subject: [PATCH 08/12] Updated TR language --- src/i18n/tr_TR.jsonc | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/src/i18n/tr_TR.jsonc b/src/i18n/tr_TR.jsonc index e15d65f1..ead8ddfd 100644 --- a/src/i18n/tr_TR.jsonc +++ b/src/i18n/tr_TR.jsonc @@ -99,6 +99,7 @@ "term.fullscreenView": "Tam Ekrana Geç", "term.defaultView": "Normal Görünüme Dön", "term.spacializedAudioSetting": "Uzamsal Ses Ayarları", + "term.audioSettings": "Ses Ayarları", "term.clearAll": "Tümünü Temizle", "term.recentStations": "Son İstasyonlar", "term.language": "Dil", @@ -110,6 +111,7 @@ "term.ciderTeam": "Cider Ekibi", "term.developer": "Geliştirici", "term.socialTeam": "Sosyal Ekip", + "term.socials": "Cider Topluluğu", "term.contributors": "Katkıda Bulunanlar", "term.equalizer": "Ekolayzer", "term.reset": "Sıfırla", @@ -120,8 +122,8 @@ "term.time.minute": "dakika", "term.time.seconds": "saniye", "term.time.second": "saniye", - "term.videos": "Video Klipler", - "term.menu": "Menü", + "term.videos": "Video Klipler", + "term.menu": "Menü", // Home "home.title": "Ana Sayfa", @@ -155,6 +157,7 @@ "action.addToLibrary.error": "Arşiv'e Eklenemedi", "action.removeFromLibrary": "Arşiv'den Sil", "action.removeFromLibrary.success": "Arşiv'den Silindi", + "action.createPlaylist": "Yeni Liste Oluştur", "action.addToPlaylist": "Liste'ye Ekle", "action.removeFromPlaylist": "Liste'den Sil", "action.addToFavorites": "Favorilere Ekle", @@ -189,8 +192,11 @@ "action.import": "Import", "action.export": "Export", "action.showAlbum": "Tüm Albümü Göster", + "action.tray.minimize": "Görev Çubuğuna Küçült", + "action.tray.quit": "'den Çık", + "action.tray.show": "'i Göster", - // Settings - General (Reserved) + // Settings - General "settings.header.general": "Genel Ayarlar", "settings.header.general.description": "Genel ayarları buradan düzenleyin.", "settings.option.general.language": "Dil Seçeneği", @@ -275,6 +281,7 @@ // Refer to term.disabled & term.enabled // Spatialization Menu + "spatial.notTurnedOn": "Uzamsal ses devre dışı. Kullanabilmek için lütfen önce etkinleştirin.", "spatial.spatialProperties" : "Uzamsal Özellikler", "spatial.width" : "Genişlik", "spatial.height" : "Yükseklik", @@ -303,4 +310,5 @@ //About "about.thanks": "Cider Collective Ekibine ve tüm katkıda bulunanlara çok teşekkür ederiz." + } \ No newline at end of file From 7715eaa4ea3a7c78917402dcc706b7df1cefa386 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Onur=20G=C3=BCm=C3=BC=C5=9F?= <10urgumus@gmail.com> Date: Sun, 30 Jan 2022 14:33:53 +0300 Subject: [PATCH 09/12] Fixed the hanging spatial audio settings and added a notyf --- src/renderer/views/components/audio-settings.ejs | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/renderer/views/components/audio-settings.ejs b/src/renderer/views/components/audio-settings.ejs index d2263ef8..379cf9ae 100644 --- a/src/renderer/views/components/audio-settings.ejs +++ b/src/renderer/views/components/audio-settings.ejs @@ -39,8 +39,12 @@ app.modals.audioSettings = false }, openSpacialAudio() { - app.modals.spatialProperties = true - app.modals.audioSettings = false + if(app.cfg.audio.spatial) { + app.modals.spatialProperties = true + app.modals.audioSettings = false + } else { + notyf.error(app.getLz('spatial.notTurnedOn')) + } }, } }); From 277e359aa94a060c000a1980a232f15bd47fe587 Mon Sep 17 00:00:00 2001 From: vapormusic Date: Sun, 30 Jan 2022 22:19:09 +0700 Subject: [PATCH 10/12] better library load safe loading and error handling --- src/renderer/index.js | 62 ++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 61 insertions(+), 1 deletion(-) diff --git a/src/renderer/index.js b/src/renderer/index.js index 903dbc63..9628d04e 100644 --- a/src/renderer/index.js +++ b/src/renderer/index.js @@ -1786,16 +1786,33 @@ const app = new Vue({ "fields[songs]": "artistName,artistUrl,artwork,contentRating,editorialArtwork,name,playParams,releaseDate,url", limit: 100, } + const safeparams = { + "platform": "web", + "limit": 80, + } self.library.songs.downloadState = 1 if (downloaded == null) { app.mk.api.v3.music(`/v1/me/library/songs/`, params).then((response) => { processChunk(response.data) + }).catch((error) => { + console.log('safe loading'); + app.mk.api.v3.music(`/v1/me/library/songs/`, safeparams).then((response) => { + processChunk(response.data) + }).catch((error) => {console.log('safe loading failed', error) + app.library.songs.downloadState = 2 + app.library.backgroundNotification.show = false}) }) } else { - if (downloaded.next != null) { app.mk.api.v3.music(downloaded.next, params).then((response) => { processChunk(response.data) + }).catch((error) => { + console.log('safe loading'); + app.mk.api.v3.music(downloaded.next, safeparams).then((response) => { + processChunk(response.data) + }).catch((error) => {console.log('safe loading failed', error) + app.library.songs.downloadState = 2 + app.library.backgroundNotification.show = false}) }) } else { console.log("Download next", downloaded.next) @@ -1868,14 +1885,38 @@ const app = new Vue({ "fields[albums]": "artistName,artistUrl,artwork,contentRating,editorialArtwork,name,playParams,releaseDate,url", limit: 100, } + const safeparams = { + platform: "web", + limit: "60", + "include[library-albums]": "artists", + "include[library-artists]": "catalog", + "include[albums]": "artists", + "fields[artists]": "name,url", + "fields[albums]": "artistName,artistUrl,artwork,contentRating,editorialArtwork,name,playParams,releaseDate,url", + "includeOnly": "catalog,artists" + } if (downloaded == null) { app.mk.api.v3.music(`/v1/me/library/albums/`, params).then((response) => { processChunk(response.data) + }).catch((error) => { + console.log('safe loading'); + app.mk.api.v3.music(`/v1/me/library/albums/`, safeparams).then((response) => { + processChunk(response.data) + }).catch((error) => {console.log('safe loading failed', error) + app.library.albums.downloadState = 2 + app.library.backgroundNotification.show = false}) }) } else { if (downloaded.next != null) { app.mk.api.v3.music(downloaded.next, params).then((response) => { processChunk(response.data) + }).catch((error) => { + console.log('safe loading'); + app.mk.api.v3.music(downloaded.next, safeparams).then((response) => { + processChunk(response.data) + }).catch((error) => {console.log('safe loading failed', error); + app.library.albums.downloadState = 2 + app.library.backgroundNotification.show = false}) }) } else { console.log("Download next", downloaded.next) @@ -1949,15 +1990,34 @@ const app = new Vue({ // "fields[artists]": "artistName,artistUrl,artwork,contentRating,editorialArtwork,name,playParams,releaseDate,url", limit: 100, } + const safeparams = { + include: "catalog", + platform: "web", + limit: 50, + } if (downloaded == null) { app.mk.api.v3.music(`/v1/me/library/artists/`, params).then((response) => { processChunk(response.data) + }).catch((error) => { + console.log('safe loading'); + app.mk.api.v3.music(`/v1/me/library/artists/`, safeparams).then((response) => { + processChunk(response.data) + }).catch((error) => {console.log('safe loading failed', error) + app.library.songs.downloadState = 2 + app.library.backgroundNotification.show = false}) }) } else { if (downloaded.next != null) { app.mk.api.v3.music(downloaded.next, params).then((response) => { processChunk(response.data) + }).catch((error) => { + console.log('safe loading'); + app.mk.api.v3.music(downloaded.next, safeparams).then((response) => { + processChunk(response.data) + }).catch((error) => {console.log('safe loading failed', error) + app.library.songs.downloadState = 2 + app.library.backgroundNotification.show = false}) }) } else { console.log("Download next", downloaded.next) From 9c83baa0a870a23cea3d4cf5690501ab7d2926eb Mon Sep 17 00:00:00 2001 From: vapormusic Date: Sun, 30 Jan 2022 22:34:24 +0700 Subject: [PATCH 11/12] some fixes to minimize to tray --- src/main/plugins/minimizeToTray.ts | 17 +++++++++++++---- src/renderer/index.js | 18 ++---------------- src/renderer/views/pages/settings.ejs | 4 +++- 3 files changed, 18 insertions(+), 21 deletions(-) diff --git a/src/main/plugins/minimizeToTray.ts b/src/main/plugins/minimizeToTray.ts index 67bbc301..0fe8df35 100644 --- a/src/main/plugins/minimizeToTray.ts +++ b/src/main/plugins/minimizeToTray.ts @@ -119,10 +119,19 @@ export default class MinimizeToTray { } } }) - electron.ipcMain.on("minimizeTray", (event, value) => { - // listen for close event - this._win.hide(); - this.SetContextMenu(false); + electron.ipcMain.handle("update-store-mtt", (event, value) => { + this._store.general["close_behavior"] = value; + }) + electron.ipcMain.on("win-close", (event, value) => { + console.log("tray", this._store.general["close_behavior"] ) + if (this._forceQuit || this._store.general["close_behavior"] == '0' ) { + this._app.quit(); + } else if (this._store.general["close_behavior"] == '1') { + this._win.minimize(); + } else { + this._win.hide(); + this.SetContextMenu(false); + } }); this._win.on("close", (e :any) => { if (this._forceQuit || this._store.general["close_behavior"] == '0' ) { diff --git a/src/renderer/index.js b/src/renderer/index.js index 9628d04e..a58cd372 100644 --- a/src/renderer/index.js +++ b/src/renderer/index.js @@ -3533,22 +3533,8 @@ const app = new Vue({ } }, closeWindow(){ - switch (app.cfg.general.close_behavior) { - case 0: - case '0': - // the minimizeToTray plugin will handle this - window.close(); - break; - case 1: - case '1': - ipcRenderer.send('minimize'); - break; - case 2: - case '2': - ipcRenderer.send('minimizeTray'); - break; - - } + // window.close doesnt call the win "close" event for some reason + ipcRenderer.send('win-close'); } } diff --git a/src/renderer/views/pages/settings.ejs b/src/renderer/views/pages/settings.ejs index cb2f1180..b09cec62 100644 --- a/src/renderer/views/pages/settings.ejs +++ b/src/renderer/views/pages/settings.ejs @@ -762,7 +762,9 @@ app.chrome.hideUserInfo = !app.cfg.visual.showuserinfo }, sendDataToMTT: function () { - ipcRenderer.invoke('setStoreValue', 'general.close_behavior', app.cfg.general.close_behavior); + 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); } } }) From de053592a904fcb450ddd9da56fe683b64990d53 Mon Sep 17 00:00:00 2001 From: vapormusic Date: Sun, 30 Jan 2022 22:43:18 +0700 Subject: [PATCH 12/12] oops --- src/renderer/index.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/renderer/index.js b/src/renderer/index.js index a58cd372..6d0aab5c 100644 --- a/src/renderer/index.js +++ b/src/renderer/index.js @@ -2003,7 +2003,7 @@ const app = new Vue({ app.mk.api.v3.music(`/v1/me/library/artists/`, safeparams).then((response) => { processChunk(response.data) }).catch((error) => {console.log('safe loading failed', error) - app.library.songs.downloadState = 2 + app.library.artists.downloadState = 2 app.library.backgroundNotification.show = false}) }) @@ -2016,7 +2016,7 @@ const app = new Vue({ app.mk.api.v3.music(downloaded.next, safeparams).then((response) => { processChunk(response.data) }).catch((error) => {console.log('safe loading failed', error) - app.library.songs.downloadState = 2 + app.library.artists.downloadState = 2 app.library.backgroundNotification.show = false}) }) } else {