From 102f60ba3b714d83adb26379d16914429a8a5e0a Mon Sep 17 00:00:00 2001 From: Maikiwi Date: Sat, 19 Feb 2022 19:12:44 -0800 Subject: [PATCH 1/6] This thing warrants another rewrite --- src/renderer/audio/audio.js | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/renderer/audio/audio.js b/src/renderer/audio/audio.js index af7f8514..34375abe 100644 --- a/src/renderer/audio/audio.js +++ b/src/renderer/audio/audio.js @@ -462,7 +462,7 @@ var CiderAudio = { // Analog Warmth else if (app.cfg.audio.maikiwiAudio.vibrantBass.multiplier === 0 && app.cfg.audio.maikiwiAudio.ciderPPE === false && - app.cfg.audio.maikiwiAudio.spatial === false && + app.cfg.audio.spatial === false && app.cfg.audio.maikiwiAudio.analogWarmth === true) { CiderAudio.analogWarmth_h2_3(true, 1); CiderAudio.audioNodes.gainNode.connect(CiderAudio.audioNodes.analogWarmth[0]); @@ -476,7 +476,6 @@ var CiderAudio = { if (app.cfg.audio.maikiwiAudio.spatial === true) { app.cfg.audio.normalization = true; - CiderAudio.audioNodes.gainNode.connect(CiderAudio.audioNodes.spatialNode); CiderAudio.audioNodes.spatialNode.connect(CiderAudio.audioNodes.audioBands[0]); console.log('[Cider][Audio] Maikiwi Spatial') From 656acaad0f8e7907ab52afa3506d34129dd980ba Mon Sep 17 00:00:00 2001 From: Maikiwi Date: Sat, 19 Feb 2022 19:42:15 -0800 Subject: [PATCH 2/6] big ocd --- src/renderer/views/pages/audiolabs.ejs | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/src/renderer/views/pages/audiolabs.ejs b/src/renderer/views/pages/audiolabs.ejs index a2a5d83d..09f1210c 100644 --- a/src/renderer/views/pages/audiolabs.ejs +++ b/src/renderer/views/pages/audiolabs.ejs @@ -48,7 +48,7 @@ -
+
{{$root.getLz('settings.option.audio.enableAdvancedFunctionality.analogWarmthIntensity')}}
@@ -63,7 +63,7 @@
-
+
{{$root.getLz('settings.option.audio.enableAdvancedFunctionality.audioSpatialization')}}
@@ -73,7 +73,7 @@
-
+
{{$root.getLz('settings.option.audio.enableAdvancedFunctionality.tunedAudioSpatialization')}}
@@ -83,7 +83,7 @@
-
+
{{$root.getLz('settings.option.audio.enableAdvancedFunctionality.tunedAudioSpatialization.profile')}}
@@ -120,7 +120,8 @@ CiderAudio.hierarchical_loading(); } else { - CiderAudio.spatialOff() + app.cfg.audio.maikiwiAudio.spatial = false; + CiderAudio.spatialOff() } }, From 462d77fc1eff16b1f3d856ea5a5e72c1748c3d34 Mon Sep 17 00:00:00 2001 From: Maikiwi Date: Sat, 19 Feb 2022 22:05:37 -0800 Subject: [PATCH 3/6] bring back auto upd --- src/main/base/browserwindow.ts | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/src/main/base/browserwindow.ts b/src/main/base/browserwindow.ts index fbd5ccbe..d6fc722d 100644 --- a/src/main/base/browserwindow.ts +++ b/src/main/base/browserwindow.ts @@ -684,7 +684,7 @@ export class BrowserWindow { console.log(err) }); }); -/* + ipcMain.on('check-for-update', async (_event) => { const branch = utils.getStoreValue('general.update_branch') let latestbranch = await fetch(`https://circleci.com/api/v1.1/project/gh/ciderapp/Cider/latest/artifacts?branch=${branch}&filter=successful`) @@ -700,10 +700,10 @@ export class BrowserWindow { const options: any = { provider: 'generic', url: `${base_url}` - }*/ - /* - * Have to handle the auto updaters seperatly until we can support macOS. electron-builder limitation -q - */ /* + } + + // Have to handle the auto updaters seperatly until we can support macOS. electron-builder limitation -q + const win_autoUpdater = new NsisUpdater(options) //Windows const linux_autoUpdater = new AppImageUpdater(options) //Linux await win_autoUpdater.checkForUpdatesAndNotify() @@ -717,7 +717,6 @@ export class BrowserWindow { event.returnValue = true } }) -*/ ipcMain.on('share-menu', async (_event, url) => { if (process.platform != 'darwin') return; From 2523498a3720c56da06d64a240aebda5eee8e593 Mon Sep 17 00:00:00 2001 From: vapormusic Date: Sun, 20 Feb 2022 20:15:49 +0700 Subject: [PATCH 4/6] add logout prompt? --- src/i18n/en_US.jsonc | 3 ++- src/renderer/index.js | 10 +++++----- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/src/i18n/en_US.jsonc b/src/i18n/en_US.jsonc index 59153b43..893cc07e 100644 --- a/src/i18n/en_US.jsonc +++ b/src/i18n/en_US.jsonc @@ -126,7 +126,7 @@ "term.equalizer": "Equalizer", "term.reset": "Reset", // Example for multiple plural forms : look up the key for your language in https://github.com/prantlf/fast-plural-rules/blob/master/docs/languages.md#supported-languages - // "term.track": { + // "term.tracks": { // "one" : "track", // "other" : "tracks" // }, @@ -168,6 +168,7 @@ "term.topAlbums": "Top Albums", "term.plays": "Plays", "term.topGenres": "Top Genres", + "term.confirmLogout" : "Are you sure you want to logout?", // Home "home.title": "Home", diff --git a/src/renderer/index.js b/src/renderer/index.js index 4e5e7e05..38a61ede 100644 --- a/src/renderer/index.js +++ b/src/renderer/index.js @@ -895,8 +895,11 @@ const app = new Vue({ less.refresh() }, unauthorize() { - this.mk.unauthorize() - document.location.reload() + bootbox.confirm(app.getLz('term.confirmLogout'), function(result){ + if (result){ + app.mk.unauthorize() + document.location.reload()} + }); }, getAppClasses() { let classes = {} @@ -2375,9 +2378,6 @@ const app = new Vue({ }, 13000) }) }, - unauthorize() { - this.mk.unauthorize() - }, showSearch() { this.page = "search" }, From 8edfddc409dd03aa2c7fd6a475de0a5ed15aa0ff Mon Sep 17 00:00:00 2001 From: Tobias Speicher Date: Sun, 20 Feb 2022 15:09:12 +0100 Subject: [PATCH 5/6] Replace deprecated String.prototype.substr() String.prototype.substr() is deprecated (see https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/String/substr) so we replace it with slice() or substring() which work similarily but aren't deprecated. Signed-off-by: Tobias Speicher --- src/main/base/browserwindow.ts | 2 +- src/renderer/index.js | 2 +- src/renderer/views/components/mediaitem-square.ejs | 2 +- src/web-remote/views/components/mediaitem-square.ejs | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/main/base/browserwindow.ts b/src/main/base/browserwindow.ts index d6fc722d..b015b24a 100644 --- a/src/main/base/browserwindow.ts +++ b/src/main/base/browserwindow.ts @@ -695,7 +695,7 @@ export class BrowserWindow { let latestbranchjson = await latestbranch.json() let base_url = latestbranchjson[0].url - base_url = base_url.substr(0, base_url.lastIndexOf('/')) + base_url = base_url.substring(0, base_url.lastIndexOf('/')) const options: any = { provider: 'generic', diff --git a/src/renderer/index.js b/src/renderer/index.js index 38a61ede..d318ec4f 100644 --- a/src/renderer/index.js +++ b/src/renderer/index.js @@ -2497,7 +2497,7 @@ const app = new Vue({ let richsync = []; const lang = app.cfg.lyrics.mxm_language // translation language function revisedRandId() { - return Math.random().toString(36).replace(/[^a-z]+/g, '').substr(2, 10); + return Math.random().toString(36).replace(/[^a-z]+/g, '').slice(2, 10); } /* get token */ diff --git a/src/renderer/views/components/mediaitem-square.ejs b/src/renderer/views/components/mediaitem-square.ejs index 6be015b1..ed3b5ad7 100644 --- a/src/renderer/views/components/mediaitem-square.ejs +++ b/src/renderer/views/components/mediaitem-square.ejs @@ -145,7 +145,7 @@ } }, revisedRandId() { - return Math.random().toString(36).replace(/[^a-z]+/g, '').substr(2, 10); + return Math.random().toString(36).replace(/[^a-z]+/g, '').slice(2, 10); }, async isInLibrary() { if (this.item.type && !this.item.type.includes("library")) { diff --git a/src/web-remote/views/components/mediaitem-square.ejs b/src/web-remote/views/components/mediaitem-square.ejs index 67fae157..90e9aa9b 100644 --- a/src/web-remote/views/components/mediaitem-square.ejs +++ b/src/web-remote/views/components/mediaitem-square.ejs @@ -153,7 +153,7 @@ } }, revisedRandId() { - return Math.random().toString(36).replace(/[^a-z]+/g, '').substr(2, 10); + return Math.random().toString(36).replace(/[^a-z]+/g, '').slice(2, 10); }, async isInLibrary() { if (this.item.type && !this.item.type.includes("library")) { From 3bf45a4e2ed690b93f27c1b5fc863436c9c4c41e Mon Sep 17 00:00:00 2001 From: vapormusic Date: Sun, 20 Feb 2022 15:09:09 +0700 Subject: [PATCH 6/6] git --- src/renderer/index.js | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/renderer/index.js b/src/renderer/index.js index d318ec4f..6f4ce1eb 100644 --- a/src/renderer/index.js +++ b/src/renderer/index.js @@ -3816,7 +3816,10 @@ const app = new Vue({ mediaKeyFixes() { navigator.mediaSession.setActionHandler('previoustrack', function () { app.prevButton() }); navigator.mediaSession.setActionHandler('nexttrack', function () { app.skipToNextItem() }); - } + }, + checkForUpdate() { + ipcRenderer.send('check-for-update') + }, } })