electron-store applied

index.js

@@ -10,76 +10,32 @@ app.commandLine.appendSwitch('enable-unsafe-webgpu');
 
 const configSchema = {
     "general": {
-        "close_behavior": {
+        "close_behavior": 0, // 0 = close, 1 = minimize, 2 = minimize to tray
-            type: "number",
+        "startup_behavior": 0, // 0 = nothing, 1 = open on startup
-            default: 0
+        "discord_rpc": 1, // 0 = disabled, 1 = enabled as Cider, 2 = enabled as Apple Music
-        },
+        "volume": 1
-        "startup_behavior": {
-            type: "number",
-            default: 0
-        },
-        "discord_rpc": {
-            type: "number",
-            default: 1
-        },
     },
     "behavior": {
-        "hw_acceleration": {
+        "hw_acceleration": 0 // 0 = default, 1 = webgpu, 2 = gpu disabled
-            type: "number",
-            default: 0 // 0 = default, 1 = webgpu, 2 = gpu disabled
-        }
     },
     "audio": {
-        "quality": {
+        "quality": "extreme",
-            type: "string",
+        "seamless_audio": true
-            default: "extreme",
-        },
-        "seamless_audio": {
-            type: "boolean",
-            default: true,
-        }
     },
     "visual": {
-        "theme": {
+        "theme": "",
-            type: "string",
+        "scrollbars": 0, // 0 = show on hover, 2 = always hide, 3 = always show
-            default: ""
+        "refresh_rate": 0,
-        },
+        "animated_artwork": 0 // 0 = always, 1 = limited, 2 = never
-        "scrollbars": {
-            type: "number",
-            default: 0
-        },
-        "refresh_rate": {
-            type: "number",
-            default: 0
-        },
-        "animated_artwork": {
-            type: "number",
-            default: 0 // 0 = always, 1 = limited, 2 = never
-        }
     },
     "lyrics": {
-        "enable_mxm": {
+        "enable_mxm": false,
-            type: "boolean",
+        "mxm_language": "en"
-            default: false
-        },
-        "mxm_language": {
-            type: "string",
-            default: "en"
-        }
     },
     "lastfm": {
-        "enabled": {
+        "enabled": false,
-            type: "boolean",
+        "scrobble_after": 30,
-            default: false
+        "auth_token": ""
-        },
-        "scrobble_after": {
-            type: "number",
-            default: 30
-        },
-        "auth_token": {
-            type: "string",
-            default: ""
-        }
     }
 }
 
@@ -91,7 +47,7 @@ function CreateWindow() {
     // store
     const Store = require("electron-store");
     app.cfg = new Store({
-        defaults: {volume: 1},
+        defaults: configSchema,
     });
 
     /** CIDER **/

src/renderer/index.js

@@ -321,7 +321,7 @@ const app = new Vue({
             }
 
             // Set the volume
-            ipcRenderer.invoke('getStoreValue', 'volume').then((value) => {
+            ipcRenderer.invoke('getStoreValue', 'general.volume').then((value) => {
                 self.mk.volume = value
             })
 
@@ -431,7 +431,7 @@ const app = new Vue({
             })
 
             this.mk.addEventListener(MusicKit.Events.playbackVolumeDidChange, (_a) => {
-                ipcRenderer.invoke('setStoreValue', 'volume', this.mk.volume)
+                ipcRenderer.invoke('setStoreValue', 'general.volume', this.mk.volume)
             })
 
             this.refreshPlaylists()