Merge branch 'develop' of https://github.com/Apple-Music-Electron/Cider into develop

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",

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`)
@@ -695,15 +695,15 @@ 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',
                 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;

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')

src/renderer/index.js

@@ -895,8 +895,11 @@ const app = new Vue({
             less.refresh()
         },
         unauthorize() {
-            this.mk.unauthorize()
+            bootbox.confirm(app.getLz('term.confirmLogout'), function(result){ 
-            document.location.reload()
+                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"
         },
@@ -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 */
@@ -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')
+        },
     }
 })
 

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")) {

src/renderer/views/pages/audiolabs.ejs

@@ -48,7 +48,7 @@
                     <input type="checkbox" v-model="app.cfg.audio.maikiwiAudio.analogWarmth"  v-on:change="CiderAudio.hierarchical_loading();" switch/>
                 </div>
             </div>
-            <div class="md-option-line" v-show="app.cfg.advanced.AudioContext && app.cfg.audio.maikiwiAudio.analogWarmth === true">
+            <div class="md-option-line" v-show="app.cfg.advanced.AudioContext === true && app.cfg.audio.maikiwiAudio.analogWarmth === true">
                 <div class="md-option-segment">
                     {{$root.getLz('settings.option.audio.enableAdvancedFunctionality.analogWarmthIntensity')}}
                     <br>
@@ -63,7 +63,7 @@
                     </button>
                 </div>
             </div>
-            <div class="md-option-line" v-show="app.cfg.advanced.AudioContext">
+            <div class="md-option-line" v-show="app.cfg.advanced.AudioContext === true">
                 <div class="md-option-segment">
                     {{$root.getLz('settings.option.audio.enableAdvancedFunctionality.audioSpatialization')}}
                     <br>
@@ -73,7 +73,7 @@
                     <input type="checkbox" v-model="app.cfg.audio.spatial" v-on:change="toggleSpatial" switch/>
                 </div>
             </div>
-            <div class="md-option-line" v-show="app.cfg.advanced.AudioContext">
+            <div class="md-option-line" v-show="app.cfg.advanced.AudioContext === true">
                 <div class="md-option-segment">
                     {{$root.getLz('settings.option.audio.enableAdvancedFunctionality.tunedAudioSpatialization')}}
                     <br>
@@ -83,7 +83,7 @@
                     <input type="checkbox" v-model="app.cfg.audio.maikiwiAudio.spatial" :disabled="app.cfg.audio.spatial === false" v-on:change="toggleSpatial" switch/>
                 </div>
             </div>
-            <div class="md-option-line" v-show="app.cfg.audio.maikiwiAudio.spatial">
+            <div class="md-option-line" v-show="app.cfg.audio.maikiwiAudio.spatial === true && app.cfg.audio.spatial === true">
             <div class="md-option-segment">
                 {{$root.getLz('settings.option.audio.enableAdvancedFunctionality.tunedAudioSpatialization.profile')}}
                 <br>
@@ -120,6 +120,7 @@
                         CiderAudio.hierarchical_loading();
                     }
                 else {
+                    app.cfg.audio.maikiwiAudio.spatial = false;
                     CiderAudio.spatialOff()             
                 }
 

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")) {