From 1d2a072358f1667675e9dfb199cf0a27f85d5a1e Mon Sep 17 00:00:00 2001 From: vapormusic Date: Fri, 24 Dec 2021 01:57:48 -0800 Subject: [PATCH 1/4] added app.isDev variable, privacy is now disabled by default unless dev is enabled --- index.js | 3 +++ src/main/cider-base.js | 4 ++++ src/renderer/index.js | 7 +++++-- 3 files changed, 12 insertions(+), 2 deletions(-) diff --git a/index.js b/index.js index d8991683..df8a4246 100644 --- a/index.js +++ b/index.js @@ -36,6 +36,9 @@ app.commandLine.appendSwitch('js-flags', '--max-old-space-size=1024') app.on('ready', () => { if (app.isQuiting) { app.quit(); return; } console.log('[Cider] Application is Ready. Creating Window.') + if(!app.isPackaged) { + console.info('[Cider] Running in development mode.') + } CreateWindow() }); diff --git a/src/main/cider-base.js b/src/main/cider-base.js index e20635c4..d530c6d3 100644 --- a/src/main/cider-base.js +++ b/src/main/cider-base.js @@ -183,6 +183,10 @@ const CiderBase = { event.returnValue = process.platform }) + ipcMain.on("is-dev", (event) => { + event.returnValue = !app.isPackaged + }) + // IPC stuff (listeners) ipcMain.on('close', () => { // listen for close event win.close(); diff --git a/src/renderer/index.js b/src/renderer/index.js index fdea85dd..df2b904d 100644 --- a/src/renderer/index.js +++ b/src/renderer/index.js @@ -109,6 +109,7 @@ class NavigationEvent { const app = new Vue({ el: "#app", data: { + isDev: ipcRenderer.sendSync("is-dev"), drawertest: false, platform: "", mk: {}, @@ -210,7 +211,7 @@ const app = new Vue({ tmpVar: [], notification: false, chrome: { - hideUserInfo: false, + hideUserInfo: ipcRenderer.sendSync("is-dev"), artworkReady: false, userinfo: { "id": "", @@ -300,7 +301,9 @@ const app = new Vue({ this.mk = MusicKit.getInstance() this.mk.authorize() this.$forceUpdate() - this.mk.privateEnabled = true + if(this.isDev) { + this.mk.privateEnabled = true + } this.mk._services.timing.mode = 0 this.platform = ipcRenderer.sendSync('cider-platform'); // Set profile name From a17f125d6b90e24120d626670462f035fc159b80 Mon Sep 17 00:00:00 2001 From: BrandonPlank Date: Fri, 24 Dec 2021 21:02:41 -0500 Subject: [PATCH 2/4] sorry --- src/renderer/index.js | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/src/renderer/index.js b/src/renderer/index.js index df2b904d..2e7bff06 100644 --- a/src/renderer/index.js +++ b/src/renderer/index.js @@ -343,9 +343,15 @@ const app = new Vue({ // load last played track try { +<<<<<<< HEAD let lastItem = window.localStorage.getItem("currentTrack") let time = window.localStorage.getItem("currentTime") let queue = window.localStorage.getItem("currentQueue") +======= + lastItem = window.localStorage.getItem("currentTrack") + time = window.localStorage.getItem("currentTime") + queue = window.localStorage.getItem("currentQueue") +>>>>>>> 7322c71... save last played track, time and queue if (lastItem != null) { lastItem = JSON.parse(lastItem) var kind = lastItem.attributes.playParams.kind; @@ -365,9 +371,15 @@ const app = new Vue({ let ids = queue.map ( e => (e.playParams ? e.playParams.id : (e.attributes.playParams ? e.attributes.playParams.id : '') )) if (ids.length > 0) { for (id of ids){ +<<<<<<< HEAD try{ app.mk.playLater({songs: [id] }) } catch (err){} +======= + try{ + app.mk.playLater({songs: [id] }) + } catch (err){} +>>>>>>> 7322c71... save last played track, time and queue } } } @@ -375,7 +387,11 @@ const app = new Vue({ }) +<<<<<<< HEAD })},1500) +======= + })},1000) +>>>>>>> 7322c71... save last played track, time and queue } From 7f73fc1ff2e50a4e76f4d3c13c3f3e75e32fb899 Mon Sep 17 00:00:00 2001 From: BrandonPlank Date: Fri, 24 Dec 2021 21:05:00 -0500 Subject: [PATCH 3/4] Revert "moved some objects in backend" This reverts commit 2fca495a5d1b7cd1eb4efa743b317f76a92ca5b2. aaa --- index.js | 75 ------------------ src/main/cider-base.js | 76 +++++++++++++++++++ .../views/components/animatedartwork-view.ejs | 3 +- 3 files changed, 77 insertions(+), 77 deletions(-) diff --git a/index.js b/index.js index 28be17fc..df8a4246 100644 --- a/index.js +++ b/index.js @@ -9,81 +9,6 @@ ElectronSentry.init({dsn: "https://68c422bfaaf44dea880b86aad5a820d2@o954055.inge app.commandLine.appendSwitch('enable-unsafe-webgpu'); -const configSchema = { - "general": { - "close_behavior": { - type: "number", - default: 0 - }, - "startup_behavior": { - type: "number", - default: 0 - }, - "discord_rpc": { - type: "number", - default: 1 - }, - }, - "behavior": { - "hw_acceleration": { - type: "number", - default: 0 // 0 = default, 1 = webgpu, 2 = gpu disabled - } - }, - "audio": { - "quality": { - type: "string", - default: "extreme", - }, - "seamless_audio": { - type: "boolean", - default: true, - } - }, - "visual": { - "theme": { - type: "string", - default: "" - }, - "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": { - type: "boolean", - default: false - }, - "mxm_language": { - type: "string", - default: "en" - } - }, - "lastfm": { - "enabled": { - type: "boolean", - default: false - }, - "scrobble_after": { - type: "number", - default: 30 - }, - "auth_token": { - type: "string", - default: "" - } - } -} - // Creating the Application Window and Calling all the Functions function CreateWindow() { if (app.isQuiting) { app.quit(); return; } diff --git a/src/main/cider-base.js b/src/main/cider-base.js index b347941a..d530c6d3 100644 --- a/src/main/cider-base.js +++ b/src/main/cider-base.js @@ -6,8 +6,84 @@ const path = require("path"); const windowStateKeeper = require("electron-window-state"); const os = require('os'); const Store = require("electron-store"); +const store = new Store(); const yt = require('youtube-search-without-api-key'); +const schema = { + "general": { + "close_behavior": { + type: "number", + default: 0 + }, + "startup_behavior": { + type: "number", + default: 0 + }, + "discord_rpc": { + type: "number", + default: 1 + }, + }, + "behavior": { + "hw_acceleration": { + type: "number", + default: 0 // 0 = default, 1 = webgpu, 2 = gpu disabled + } + }, + "audio": { + "quality": { + type: "string", + default: "extreme", + }, + "seamless_audio": { + type: "boolean", + default: true, + } + }, + "visual": { + "theme": { + type: "string", + default: "" + }, + "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": { + type: "boolean", + default: false + }, + "mxm_language": { + type: "string", + default: "en" + } + }, + "lastfm": { + "enabled": { + type: "boolean", + default: false + }, + "scrobble_after": { + type: "number", + default: 30 + }, + "auth_token": { + type: "string", + default: "" + } + } +} + // Analytics for debugging. const ElectronSentry = require("@sentry/electron"); ElectronSentry.init({dsn: "https://68c422bfaaf44dea880b86aad5a820d2@o954055.ingest.sentry.io/6112214"}); diff --git a/src/renderer/views/components/animatedartwork-view.ejs b/src/renderer/views/components/animatedartwork-view.ejs index 63fe656f..a99b0c8c 100644 --- a/src/renderer/views/components/animatedartwork-view.ejs +++ b/src/renderer/views/components/animatedartwork-view.ejs @@ -20,8 +20,7 @@ enableCEA708Captions: false, emeEnabled: false, abrEwmaDefaultEstimate: 10000, - testBandwidth: false, - capLevelToPlayerSize: true + testBandwidth: false }; if (this.hls) { console.log('detached'); From f23e66440b378693cf8a22185bb956962e32d4a5 Mon Sep 17 00:00:00 2001 From: Brandon <52553007+brandonplank@users.noreply.github.com> Date: Fri, 24 Dec 2021 21:11:24 -0500 Subject: [PATCH 4/4] please forgive my sins --- index.js | 75 +++++++++++++++++++ .../views/components/animatedartwork-view.ejs | 3 +- 2 files changed, 77 insertions(+), 1 deletion(-) diff --git a/index.js b/index.js index df8a4246..b3511336 100644 --- a/index.js +++ b/index.js @@ -8,6 +8,81 @@ ElectronSentry.init({dsn: "https://68c422bfaaf44dea880b86aad5a820d2@o954055.inge // Enable WebGPU and list adapters (EXPERIMENTAL.) app.commandLine.appendSwitch('enable-unsafe-webgpu'); +const configSchema = { + "general": { + "close_behavior": { + type: "number", + default: 0 + }, + "startup_behavior": { + type: "number", + default: 0 + }, + "discord_rpc": { + type: "number", + default: 1 + }, + }, + "behavior": { + "hw_acceleration": { + type: "number", + default: 0 // 0 = default, 1 = webgpu, 2 = gpu disabled + } + }, + "audio": { + "quality": { + type: "string", + default: "extreme", + }, + "seamless_audio": { + type: "boolean", + default: true, + } + }, + "visual": { + "theme": { + type: "string", + default: "" + }, + "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": { + type: "boolean", + default: false + }, + "mxm_language": { + type: "string", + default: "en" + } + }, + "lastfm": { + "enabled": { + type: "boolean", + default: false + }, + "scrobble_after": { + type: "number", + default: 30 + }, + "auth_token": { + type: "string", + default: "" + } + } +} + // Creating the Application Window and Calling all the Functions function CreateWindow() { diff --git a/src/renderer/views/components/animatedartwork-view.ejs b/src/renderer/views/components/animatedartwork-view.ejs index a99b0c8c..63fe656f 100644 --- a/src/renderer/views/components/animatedartwork-view.ejs +++ b/src/renderer/views/components/animatedartwork-view.ejs @@ -20,7 +20,8 @@ enableCEA708Captions: false, emeEnabled: false, abrEwmaDefaultEstimate: 10000, - testBandwidth: false + testBandwidth: false, + capLevelToPlayerSize: true }; if (this.hls) { console.log('detached');