From 8a755b73192efa84876c9b0733fcabf674d00ee6 Mon Sep 17 00:00:00 2001 From: Amaru8 <52407090+Amaru8@users.noreply.github.com> Date: Wed, 18 May 2022 21:43:38 +0200 Subject: [PATCH 01/35] Update store.ts --- src/main/base/store.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/base/store.ts b/src/main/base/store.ts index d076924b..3bab1142 100644 --- a/src/main/base/store.ts +++ b/src/main/base/store.ts @@ -133,7 +133,7 @@ export class Store { "maxVolume": 1, "lastVolume": 1, "muted": false, - "playbackRate": '1', + "playbackRate": 100, "quality": "HIGH", "seamless_audio": true, "normalization": false, From b3ce29159cdbd1912b19e3610853f93e2a1b926a Mon Sep 17 00:00:00 2001 From: Amaru8 <52407090+Amaru8@users.noreply.github.com> Date: Wed, 18 May 2022 21:45:00 +0200 Subject: [PATCH 02/35] Implement wheel support --- .../views/components/audio-playbackrate.ejs | 40 ++++++++++++++++--- 1 file changed, 34 insertions(+), 6 deletions(-) diff --git a/src/renderer/views/components/audio-playbackrate.ejs b/src/renderer/views/components/audio-playbackrate.ejs index 814d57a5..9b40a00d 100644 --- a/src/renderer/views/components/audio-playbackrate.ejs +++ b/src/renderer/views/components/audio-playbackrate.ejs @@ -15,7 +15,7 @@ {{playbackRate}} ×
- +
@@ -29,15 +29,43 @@ data: function () { return { app: this.$root, - playbackRate: this.$root.cfg.audio.playbackRate + playbackRate: this.$root.cfg.audio.playbackRate / 100 } }, watch: { playbackRate: function (newValue, _oldValue) { - this.$root.mk.playbackRate = newValue - this.$root.cfg.audio.playbackRate = newValue - this.playbackRate = newValue + this.saveValue(newValue); } - } + }, + methods: { + playbackRateWheel(event) { + if (app.checkScrollDirectionIsUp(event)) { + this.saveValue(this.$root.cfg.audio.playbackRate + 5); + } else { + this.saveValue(this.$root.cfg.audio.playbackRate - 5); + } + }, + saveValue(newValue) { + newValue = Number(newValue); + if (this.isAllowedRate(newValue)) { + if (newValue > 2) { + newValue = String(newValue).length > 4 ? newValue.toFixed(2) : newValue; + this.$root.mk.playbackRate = newValue / 100; + this.$root.cfg.audio.playbackRate = newValue; + this.playbackRate = newValue / 100; + } else { + newValue = String(newValue).length > 6 ? newValue.toFixed(2) : newValue; + this.$root.mk.playbackRate = newValue; + this.$root.cfg.audio.playbackRate = newValue * 100; + this.playbackRate = newValue; + } + } + }, + isAllowedRate(input) { + if (input >= 25 && input <= 200) { return true } + if (input >= 0.25 && input <= 2) { return true } + return false; + } + } }); \ No newline at end of file From 2a1d132293e5094fa646dd52ef93985aae928e98 Mon Sep 17 00:00:00 2001 From: Amaru8 <52407090+Amaru8@users.noreply.github.com> Date: Wed, 18 May 2022 21:46:04 +0200 Subject: [PATCH 03/35] Remove whitespace --- src/renderer/views/components/audio-playbackrate.ejs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/renderer/views/components/audio-playbackrate.ejs b/src/renderer/views/components/audio-playbackrate.ejs index 9b40a00d..cd7e417e 100644 --- a/src/renderer/views/components/audio-playbackrate.ejs +++ b/src/renderer/views/components/audio-playbackrate.ejs @@ -45,7 +45,7 @@ this.saveValue(this.$root.cfg.audio.playbackRate - 5); } }, - saveValue(newValue) { + saveValue(newValue) { newValue = Number(newValue); if (this.isAllowedRate(newValue)) { if (newValue > 2) { From 1f627827148694bc2922a0f5ac8696fa64c02799 Mon Sep 17 00:00:00 2001 From: Amaru8 <52407090+Amaru8@users.noreply.github.com> Date: Wed, 18 May 2022 21:47:04 +0200 Subject: [PATCH 04/35] Change rate auto-updating --- src/preload/cider-preload.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/preload/cider-preload.js b/src/preload/cider-preload.js index f5cc6dd2..00da3b8a 100644 --- a/src/preload/cider-preload.js +++ b/src/preload/cider-preload.js @@ -40,8 +40,8 @@ const MusicKitInterop = { if (MusicKit.getInstance().nowPlayingItem) { await this.sleep(1000); - console.log("Auto-updating Playback Rate from " + MusicKit.getInstance().playbackRate + " x to " + app.cfg.audio.playbackRate + " x"); - MusicKit.getInstance().playbackRate = app.cfg.audio.playbackRate; + console.log("Auto-updating Playback Rate from " + MusicKit.getInstance().playbackRate + " x to " + app.cfg.audio.playbackRate / 100 + " x"); + MusicKit.getInstance().playbackRate = app.cfg.audio.playbackRate / 100; } }); From b242614d95c04d231433fd5f6f2f82809d6d6cfd Mon Sep 17 00:00:00 2001 From: Amaru8 <52407090+Amaru8@users.noreply.github.com> Date: Wed, 18 May 2022 21:47:28 +0200 Subject: [PATCH 05/35] Remove console log --- src/preload/cider-preload.js | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/preload/cider-preload.js b/src/preload/cider-preload.js index 00da3b8a..2c9b137e 100644 --- a/src/preload/cider-preload.js +++ b/src/preload/cider-preload.js @@ -39,8 +39,7 @@ const MusicKitInterop = { } if (MusicKit.getInstance().nowPlayingItem) { - await this.sleep(1000); - console.log("Auto-updating Playback Rate from " + MusicKit.getInstance().playbackRate + " x to " + app.cfg.audio.playbackRate / 100 + " x"); + await this.sleep(750); MusicKit.getInstance().playbackRate = app.cfg.audio.playbackRate / 100; } }); From 9874d1c62dcc678c76941c66e1356aa36824b860 Mon Sep 17 00:00:00 2001 From: Amaru8 <52407090+Amaru8@users.noreply.github.com> Date: Wed, 18 May 2022 21:52:50 +0200 Subject: [PATCH 06/35] hmm --- src/renderer/views/components/audio-playbackrate.ejs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/renderer/views/components/audio-playbackrate.ejs b/src/renderer/views/components/audio-playbackrate.ejs index cd7e417e..2b39b681 100644 --- a/src/renderer/views/components/audio-playbackrate.ejs +++ b/src/renderer/views/components/audio-playbackrate.ejs @@ -68,4 +68,4 @@ } } }); - \ No newline at end of file + From a35d0d26f8975518b0d0445d7c79388ee66c6a65 Mon Sep 17 00:00:00 2001 From: Amaru8 <52407090+Amaru8@users.noreply.github.com> Date: Wed, 18 May 2022 22:01:02 +0200 Subject: [PATCH 07/35] marin showed me the way im okay help --- src/main/base/store.ts | 2 +- src/preload/cider-preload.js | 2 +- .../views/components/audio-playbackrate.ejs | 25 ++++++------------- 3 files changed, 10 insertions(+), 19 deletions(-) diff --git a/src/main/base/store.ts b/src/main/base/store.ts index 3bab1142..69208a4e 100644 --- a/src/main/base/store.ts +++ b/src/main/base/store.ts @@ -133,7 +133,7 @@ export class Store { "maxVolume": 1, "lastVolume": 1, "muted": false, - "playbackRate": 100, + "playbackRate": 1, "quality": "HIGH", "seamless_audio": true, "normalization": false, diff --git a/src/preload/cider-preload.js b/src/preload/cider-preload.js index 2c9b137e..75a4af44 100644 --- a/src/preload/cider-preload.js +++ b/src/preload/cider-preload.js @@ -40,7 +40,7 @@ const MusicKitInterop = { if (MusicKit.getInstance().nowPlayingItem) { await this.sleep(750); - MusicKit.getInstance().playbackRate = app.cfg.audio.playbackRate / 100; + MusicKit.getInstance().playbackRate = app.cfg.audio.playbackRate; } }); diff --git a/src/renderer/views/components/audio-playbackrate.ejs b/src/renderer/views/components/audio-playbackrate.ejs index 2b39b681..9e1f1242 100644 --- a/src/renderer/views/components/audio-playbackrate.ejs +++ b/src/renderer/views/components/audio-playbackrate.ejs @@ -29,7 +29,7 @@ data: function () { return { app: this.$root, - playbackRate: this.$root.cfg.audio.playbackRate / 100 + playbackRate: this.$root.cfg.audio.playbackRate } }, watch: { @@ -40,31 +40,22 @@ methods: { playbackRateWheel(event) { if (app.checkScrollDirectionIsUp(event)) { - this.saveValue(this.$root.cfg.audio.playbackRate + 5); + this.saveValue(this.$root.cfg.audio.playbackRate + 0.05); } else { - this.saveValue(this.$root.cfg.audio.playbackRate - 5); + this.saveValue(this.$root.cfg.audio.playbackRate - 0.05); } }, saveValue(newValue) { newValue = Number(newValue); if (this.isAllowedRate(newValue)) { - if (newValue > 2) { - newValue = String(newValue).length > 4 ? newValue.toFixed(2) : newValue; - this.$root.mk.playbackRate = newValue / 100; - this.$root.cfg.audio.playbackRate = newValue; - this.playbackRate = newValue / 100; - } else { - newValue = String(newValue).length > 6 ? newValue.toFixed(2) : newValue; - this.$root.mk.playbackRate = newValue; - this.$root.cfg.audio.playbackRate = newValue * 100; - this.playbackRate = newValue; - } + newValue = String(newValue).length > 6 ? newValue.toFixed(2) : newValue; + this.$root.mk.playbackRate = newValue; + this.$root.cfg.audio.playbackRate = newValue; + this.playbackRate = newValue; } }, isAllowedRate(input) { - if (input >= 25 && input <= 200) { return true } - if (input >= 0.25 && input <= 2) { return true } - return false; + return input >= 0.25 && input <= 2 ? true : false; } } }); From fa8b08edde4ac4aa223f9fd3b329c13d174dd026 Mon Sep 17 00:00:00 2001 From: yazninja Date: Sat, 21 May 2022 21:03:06 +0800 Subject: [PATCH 08/35] correct tag --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index a3625a1a..0745517f 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -161,7 +161,7 @@ jobs: command: yarn circle:script - run: name: Set App Version - command: echo "export APP_VERSION=$(grep '"version":.*' package.json | cut -d '"' -f 4 | head -1)" >> $BASH_ENV + command: echo "export APP_VERSION=$(grep '"version":.*' package.json | cut -d '"' -f 16 | head -1)" >> $BASH_ENV - run: name: Publish Release command: | From bc854ce0692d2f55ab02241941f5ba1f79eed94a Mon Sep 17 00:00:00 2001 From: yazninja Date: Sat, 21 May 2022 21:34:18 +0800 Subject: [PATCH 09/35] semanting versioning, support release branch --- resources/circle.js | 22 ++++++++++------------ 1 file changed, 10 insertions(+), 12 deletions(-) diff --git a/resources/circle.js b/resources/circle.js index 199b32c6..b327abd9 100644 --- a/resources/circle.js +++ b/resources/circle.js @@ -3,24 +3,22 @@ if (!process.env['CIRCLECI']) { return } -const {readFileSync, writeFile} = require('fs') +const { readFileSync, writeFile } = require('fs') const pkg = JSON.parse(readFileSync('package.json').toString()); let channel = process.env['CIRCLE_BRANCH']; -if (process.env['CIRCLE_BRANCH'] === 'lts') { - channel = 'latest' -} else if (process.env['CIRCLE_BRANCH'] === 'main') { - channel = 'beta' -} else if (process.env['CIRCLE_BRANCH'] === 'develop') { - channel = 'alpha' -} - channel = channel.split('/').join('-') // https://circleci.com/docs/2.0/env-vars/#built-in-environment-variables const version = pkg.version.split('.'); const patch = version[2].split('-'); -pkg.version = `${version[0]}.${version[1]}.${patch[0]}-${channel}.${patch[1]}` +if (process.env['CIRCLE_BRANCH'] === 'release') { + pkg.version = `${version[0]}.${version[1]}.${patch[0]}` +} else if (process.env['CIRCLE_BRANCH'] === 'main') { + pkg.version = `${version[0]}.${version[1]}.${patch[0]}-beta.${patch[1]}` +} else { + pkg.version = `${version[0]}.${version[1]}.${patch[0]}-${channel}.${process.env['CIRCLE_BUILD_NUM']}` +} // package.build.channel = channel pkg.publish = { "provider": "github", @@ -32,9 +30,9 @@ pkg.publish = { "releaseType": "release" } -const {exec} = require('child_process') +const { exec } = require('child_process') -exec(`echo $APP_VERSION`, {env: {'APP_VERSION': pkg.version}}, function (error, stdout, stderr) { +exec(`echo $APP_VERSION`, { env: { 'APP_VERSION': pkg.version } }, function (error, stdout, stderr) { console.log(stdout, stderr, error); }); From ef22e8d4326f3926450ae34b76f3d3e902453d6e Mon Sep 17 00:00:00 2001 From: cryptofyre Date: Sat, 21 May 2022 12:20:40 -0500 Subject: [PATCH 10/35] Fix fullscreen exit. --- src/renderer/main/vueapp.js | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) diff --git a/src/renderer/main/vueapp.js b/src/renderer/main/vueapp.js index f0c9ebf1..e131594a 100644 --- a/src/renderer/main/vueapp.js +++ b/src/renderer/main/vueapp.js @@ -4200,11 +4200,8 @@ const app = new Vue({ this.fullscreenState = flag; if (flag) { ipcRenderer.send('setFullScreen', true); - if (app.mk.nowPlayingItem.type && app.mk.nowPlayingItem.type.toLowerCase().includes("video")) { - // document.querySelector('video#apple-music-video-player').requestFullscreen() - } else { - app.appMode = 'fullscreen'; - } + app.appMode = 'fullscreen'; + document.addEventListener('keydown', event => { if (event.key === 'Escape' && app.appMode === 'fullscreen') { this.fullscreen(false); @@ -4212,11 +4209,7 @@ const app = new Vue({ }); } else { ipcRenderer.send('setFullScreen', false); - if (app.mk.nowPlayingItem.type && app.mk.nowPlayingItem.type.toLowerCase().includes("video")) { - - } else { - app.appMode = 'player'; - } + app.appMode = 'player'; } }, pip(){ From 50061f29f94030833b0f40313de1ee6e9c89a42b Mon Sep 17 00:00:00 2001 From: Pedro Galhardo Date: Sat, 21 May 2022 18:48:47 +0100 Subject: [PATCH 11/35] Add search bar to cider-playlist --- src/renderer/views/pages/cider-playlist.ejs | 107 ++++++++++++++++---- 1 file changed, 87 insertions(+), 20 deletions(-) diff --git a/src/renderer/views/pages/cider-playlist.ejs b/src/renderer/views/pages/cider-playlist.ejs index b60bd519..cb16b173 100644 --- a/src/renderer/views/pages/cider-playlist.ejs +++ b/src/renderer/views/pages/cider-playlist.ejs @@ -94,9 +94,21 @@ {{app.getLz('term.confirm')}} - +
+
+
+ +
+ +
@@ -160,12 +172,12 @@ -