From ab76c3c82dc6c4297f658824e400add9744f583e Mon Sep 17 00:00:00 2001 From: Gabriel Davila <56521591+mefsaal@users.noreply.github.com> Date: Sun, 24 Jul 2022 17:28:13 -0300 Subject: [PATCH 01/13] i hate my life (#1307) --- src/i18n/es_ES.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/i18n/es_ES.json b/src/i18n/es_ES.json index 1351ad46..c2bfe0b9 100644 --- a/src/i18n/es_ES.json +++ b/src/i18n/es_ES.json @@ -188,7 +188,7 @@ "term.plugin": "Plugin", "term.pluginMenu": "Plugins Menú", "term.pluginMenu.none": "Sin Plugins Interactivos", - "term.replay": "Repetir", + "term.replay": "Replay", "term.uniqueAlbums": "Álbumes Únicos", "term.uniqueArtists": "Artistas Únicos", "term.uniqueSongs": "Canciones Únicas", From 4a38da057420820779be45d9362a19872751650a Mon Sep 17 00:00:00 2001 From: Maikiwi Date: Sun, 24 Jul 2022 21:05:09 -0700 Subject: [PATCH 02/13] world is now a better place --- package.json | 4 ++-- src/renderer/audio/audio.js | 2 +- winget.json | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package.json b/package.json index 9926ed56..83f5fa9f 100644 --- a/package.json +++ b/package.json @@ -122,9 +122,9 @@ } ], "build": { - "electronVersion": "18.3.5", + "electronVersion": "20.0.0-beta.11", "electronDownload": { - "version": "18.3.5+wvcus", + "version": "20.0.0-beta.11+wvcus", "mirror": "https://github.com/castlabs/electron-releases/releases/download/v" }, "appId": "cider", diff --git a/src/renderer/audio/audio.js b/src/renderer/audio/audio.js index d40a261c..de6b8d82 100644 --- a/src/renderer/audio/audio.js +++ b/src/renderer/audio/audio.js @@ -50,7 +50,7 @@ const CiderAudio = { connectContext: function (mediaElem) { if (!CiderAudio.context) { CiderAudio.context = new window.AudioContext({ sampleRate: 96000, latencyHint: "playback"}); // Don't ever remove the sample rate arg. Ask Maikiwi. - app.lyricOffset = CiderAudio.context.baseLatency + app.lyricOffset = CiderAudio.context.baseLatency + CiderAudio.context.outputLatency } if (!CiderAudio.source) { CiderAudio.source = CiderAudio.context.createMediaElementSource(mediaElem); diff --git a/winget.json b/winget.json index 686e4ca7..43c5e82d 100644 --- a/winget.json +++ b/winget.json @@ -1,7 +1,7 @@ { - "electronVersion": "19.0.3", + "electronVersion": "20.0.0-beta.11", "electronDownload": { - "version": "19.0.3+wvcus", + "version": "20.0.0-beta.11+wvcus", "mirror": "https://github.com/castlabs/electron-releases/releases/download/v" }, "appId": "cider", From 4a8214cbf0e82461b61c442db928f1e42f82d7be Mon Sep 17 00:00:00 2001 From: Maikiwi Date: Sun, 24 Jul 2022 21:06:44 -0700 Subject: [PATCH 03/13] meltdown avoided --- package.json | 2 +- winget.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index 83f5fa9f..679e6a32 100644 --- a/package.json +++ b/package.json @@ -122,7 +122,7 @@ } ], "build": { - "electronVersion": "20.0.0-beta.11", + "electronVersion": "20.0.0", "electronDownload": { "version": "20.0.0-beta.11+wvcus", "mirror": "https://github.com/castlabs/electron-releases/releases/download/v" diff --git a/winget.json b/winget.json index 43c5e82d..f252bc22 100644 --- a/winget.json +++ b/winget.json @@ -1,5 +1,5 @@ { - "electronVersion": "20.0.0-beta.11", + "electronVersion": "20.0.0", "electronDownload": { "version": "20.0.0-beta.11+wvcus", "mirror": "https://github.com/castlabs/electron-releases/releases/download/v" From 85fc887f865039f07811245b17480ea231d783b6 Mon Sep 17 00:00:00 2001 From: Maikiwi Date: Sun, 24 Jul 2022 21:07:48 -0700 Subject: [PATCH 04/13] meltdown avoided --- package.json | 2 +- winget.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index 679e6a32..4890dae6 100644 --- a/package.json +++ b/package.json @@ -122,7 +122,7 @@ } ], "build": { - "electronVersion": "20.0.0", + "electronVersion": "19.0.8", "electronDownload": { "version": "20.0.0-beta.11+wvcus", "mirror": "https://github.com/castlabs/electron-releases/releases/download/v" diff --git a/winget.json b/winget.json index f252bc22..1460f595 100644 --- a/winget.json +++ b/winget.json @@ -1,5 +1,5 @@ { - "electronVersion": "20.0.0", + "electronVersion": "19.0.8", "electronDownload": { "version": "20.0.0-beta.11+wvcus", "mirror": "https://github.com/castlabs/electron-releases/releases/download/v" From f9cb47083f55988b6836ee518390e51703d37814 Mon Sep 17 00:00:00 2001 From: yazninja Date: Mon, 25 Jul 2022 16:51:31 +0800 Subject: [PATCH 05/13] stylize new listen now childs --- src/renderer/views/components/listennow-child.ejs | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/src/renderer/views/components/listennow-child.ejs b/src/renderer/views/components/listennow-child.ejs index d885ebb2..8f7bcf6c 100644 --- a/src/renderer/views/components/listennow-child.ejs +++ b/src/renderer/views/components/listennow-child.ejs @@ -2,15 +2,18 @@
-
+
@@ -131,6 +131,8 @@

{{categoriesView[0].attributes.title.stringForDisplay ?? ""}}

+
+
Date: Mon, 25 Jul 2022 18:40:54 +0800 Subject: [PATCH 08/13] hd all album work --- src/renderer/main/vueapp.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/renderer/main/vueapp.js b/src/renderer/main/vueapp.js index e014694e..92729f7d 100644 --- a/src/renderer/main/vueapp.js +++ b/src/renderer/main/vueapp.js @@ -3945,7 +3945,7 @@ const app = new Vue({ if (width) { width = parseInt(width * window.devicePixelRatio) } - let newurl = `${url.replace('{w}', width ?? height).replace('{h}', height).replace('{f}', "webp").replace('{c}', ((width === 900) ? "sr" : "bb"))}`; + let newurl = `${url.replace('{w}', width ?? height).replace('{h}', height).replace('{f}', "webp").replace('{c}', ((width === 900 || width === 380 || width === 600 ) ? "sr" : "bb"))}`; if (newurl.includes("900x516")) { newurl = newurl.replace("900x516cc", "900x516sr").replace("900x516bb", "900x516sr"); From f59290e3d04baedef4e71d610b66769193aa868d Mon Sep 17 00:00:00 2001 From: vapormusic Date: Mon, 25 Jul 2022 17:49:57 +0700 Subject: [PATCH 09/13] Update afterPack.js --- resources/afterPack.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/afterPack.js b/resources/afterPack.js index 8e3ff50f..16bdbee8 100644 --- a/resources/afterPack.js +++ b/resources/afterPack.js @@ -14,7 +14,7 @@ exports.default = function(context) { // console.log('Castlabs-evs update complete') // xcode 13 - if (fs.existsSync('dist/mac-universal--x64') && fs.existsSync('dist/mac-universal--arm64')) + if (fs.existsSync('dist/mac-universal--x64') && fs.existsSync('dist/mac-universal--arm64') && fs.existsSync('dist/mac-universal--x64/Cider.app/Contents/Frameworks/Electron Framework.framework/Versions/A/Resources/MainMenu.nib/keyedobjects-101300.nib')) execSync("cp 'dist/mac-universal--x64/Cider.app/Contents/Frameworks/Electron Framework.framework/Versions/A/Resources/MainMenu.nib/keyedobjects-101300.nib' 'dist/mac-universal--arm64/Cider.app/Contents/Frameworks/Electron Framework.framework/Versions/A/Resources/MainMenu.nib/keyedobjects-101300.nib'",{stdio: 'inherit'}) // console.log('VMP signing start') From 283741ae1c4b1d8931d5e0f4da7ab88df4cb89d2 Mon Sep 17 00:00:00 2001 From: yazninja Date: Mon, 25 Jul 2022 20:25:23 +0800 Subject: [PATCH 10/13] force hq quality --- src/renderer/views/components/mediaitem-square.ejs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/renderer/views/components/mediaitem-square.ejs b/src/renderer/views/components/mediaitem-square.ejs index aa54e162..be00b113 100644 --- a/src/renderer/views/components/mediaitem-square.ejs +++ b/src/renderer/views/components/mediaitem-square.ejs @@ -242,7 +242,7 @@ getArtworkUrl(size = -1, includeUrl = false) { let artwork = this.item?.attributes?.artwork ? this.item?.attributes?.artwork?.url : (this.item?.attributes?.editorialArtwork?.subscriptionCover?.url ?? '') if (size != -1) { - artwork = artwork.replace('{w}', size).replace('{h}', size).replace('{f}', "webp").replace('{c}', ((size === 900) ? "sr" : "bb")) + artwork = artwork.replace('{w}', size).replace('{h}', size).replace('{f}', "webp").replace('{c}', ((width === 900 || width === 380 || width === 600 ) ? "sr" : "bb")); } switch (this.kind) { case "385": From dd9473b5d1496a63467e2bda12ad599e099bdaac Mon Sep 17 00:00:00 2001 From: yazninja Date: Mon, 25 Jul 2022 20:40:16 +0800 Subject: [PATCH 11/13] oops --- src/renderer/views/components/mediaitem-square.ejs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/renderer/views/components/mediaitem-square.ejs b/src/renderer/views/components/mediaitem-square.ejs index be00b113..c18024c9 100644 --- a/src/renderer/views/components/mediaitem-square.ejs +++ b/src/renderer/views/components/mediaitem-square.ejs @@ -242,7 +242,7 @@ getArtworkUrl(size = -1, includeUrl = false) { let artwork = this.item?.attributes?.artwork ? this.item?.attributes?.artwork?.url : (this.item?.attributes?.editorialArtwork?.subscriptionCover?.url ?? '') if (size != -1) { - artwork = artwork.replace('{w}', size).replace('{h}', size).replace('{f}', "webp").replace('{c}', ((width === 900 || width === 380 || width === 600 ) ? "sr" : "bb")); + artwork = artwork.replace('{w}', size).replace('{h}', size).replace('{f}', "webp").replace('{c}', (size === 900 || size === 380 || size === 600 ) ? "sr" : "bb"); } switch (this.kind) { case "385": From e77d87ca4b3f956d2dc3af9205659d6e7add0efe Mon Sep 17 00:00:00 2001 From: vapormusic Date: Mon, 25 Jul 2022 21:23:23 +0700 Subject: [PATCH 12/13] attempt to fix --- src/renderer/main/vueapp.js | 2 +- src/renderer/views/components/mediaitem-square.ejs | 9 +++++++-- src/renderer/views/pages/search.ejs | 2 +- 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/src/renderer/main/vueapp.js b/src/renderer/main/vueapp.js index 92729f7d..668dac3a 100644 --- a/src/renderer/main/vueapp.js +++ b/src/renderer/main/vueapp.js @@ -3945,7 +3945,7 @@ const app = new Vue({ if (width) { width = parseInt(width * window.devicePixelRatio) } - let newurl = `${url.replace('{w}', width ?? height).replace('{h}', height).replace('{f}', "webp").replace('{c}', ((width === 900 || width === 380 || width === 600 ) ? "sr" : "bb"))}`; + let newurl = `${url.replace('{w}', width ?? height).replace('{h}', height).replace('{f}', "webp").replace('{c}', ((width === 900 || width === 380 || width === 600 ) ? "sr" : "cc"))}`; if (newurl.includes("900x516")) { newurl = newurl.replace("900x516cc", "900x516sr").replace("900x516bb", "900x516sr"); diff --git a/src/renderer/views/components/mediaitem-square.ejs b/src/renderer/views/components/mediaitem-square.ejs index c18024c9..fa5e9a32 100644 --- a/src/renderer/views/components/mediaitem-square.ejs +++ b/src/renderer/views/components/mediaitem-square.ejs @@ -92,6 +92,11 @@ type: Boolean, default: false, required: false + }, + imageformat: { + type: String, + default: 'cc', + required: false }, 'contextExt': { type: Object, required: false }, }, @@ -242,11 +247,11 @@ getArtworkUrl(size = -1, includeUrl = false) { let artwork = this.item?.attributes?.artwork ? this.item?.attributes?.artwork?.url : (this.item?.attributes?.editorialArtwork?.subscriptionCover?.url ?? '') if (size != -1) { - artwork = artwork.replace('{w}', size).replace('{h}', size).replace('{f}', "webp").replace('{c}', (size === 900 || size === 380 || size === 600 ) ? "sr" : "bb"); + artwork = artwork.replace('{w}', size).replace('{h}', size).replace('{f}', "webp").replace('{c}', (size === 900 || size === 380 || size === 600 ) ? "sr" : this.imageformat); } switch (this.kind) { case "385": - artwork = this.item.attributes.editorialArtwork?.subscriptionHero?.url ?? (this.item.attributes.artwork?.url ?? (this.item.relationships?.contents?.data[0]?.attributes?.editorialArtwork?.subscriptionHero?.url ?? '')) + artwork = (this.item.attributes.editorialArtwork?.subscriptionHero?.url ?? (this.item.attributes.artwork?.url ?? (this.item.relationships?.contents?.data[0]?.attributes?.editorialArtwork?.subscriptionHero?.url ?? ''))).replace('{c}', (size === 900 || size === 380 || size === 600 ) ? "sr" : this.imageformat); break; } if (!includeUrl) { diff --git a/src/renderer/views/pages/search.ejs b/src/renderer/views/pages/search.ejs index e0da1993..f490a7cf 100644 --- a/src/renderer/views/pages/search.ejs +++ b/src/renderer/views/pages/search.ejs @@ -133,7 +133,7 @@
- From 28a1fdd11219e00196c37f996ba975afae823f7f Mon Sep 17 00:00:00 2001 From: booploops <49113086+booploops@users.noreply.github.com> Date: Mon, 25 Jul 2022 12:54:38 -0700 Subject: [PATCH 13/13] misc cleanup --- src/renderer/main/vueapp.js | 10 ---------- src/renderer/style.less | 2 +- src/renderer/views/main.ejs | 2 +- 3 files changed, 2 insertions(+), 12 deletions(-) diff --git a/src/renderer/main/vueapp.js b/src/renderer/main/vueapp.js index 668dac3a..22a2dd4a 100644 --- a/src/renderer/main/vueapp.js +++ b/src/renderer/main/vueapp.js @@ -16,7 +16,6 @@ const app = new Vue({ drawertest: false, platform: "", mk: {}, - quickPlayQuery: "", pluginInstalled: false, pluginMenuEntries: [], lz: ipcRenderer.sendSync("get-i18n", "en_US"), @@ -131,16 +130,13 @@ const app = new Vue({ webremoteqr: "", mxmtoken: "", mkIsReady: false, - playerReady: false, animateBackground: false, currentArtUrl: '', currentArtUrlRaw: '', lyricon: false, currentTrackID: '', - currentTrackIDBG: '', lyrics: [], currentLyricsLine: 0, - lyriccurrenttime: 0, richlyrics: [], lyricsMediaItem: {}, lyricsDebug: { @@ -280,12 +276,6 @@ const app = new Vue({ }, false) }, methods: { - hotReload() { - this.appVisible = false - setTimeout(() => { - this.appVisible = true - }, 1000) - }, setWindowHash(route = "") { window.location.hash = `#${route}`; }, diff --git a/src/renderer/style.less b/src/renderer/style.less index d4345a6c..b974dca2 100644 --- a/src/renderer/style.less +++ b/src/renderer/style.less @@ -3,7 +3,7 @@ @import url("https://fonts.googleapis.com/css2?family=Noto+Sans+KR:wght@100;300;400;500;700;900&display=swap"); @import url("https://fonts.googleapis.com/css2?family=Noto+Sans+TC:wght@100;300;400;500;700;900&display=swap"); @import url("https://fonts.googleapis.com/css2?family=Noto+Sans+SC:wght@100;300;400;500;700;900&display=swap"); -@import url("lib/quasar/quasar.min.css"); +// @import url("lib/quasar/quasar.min.css"); @import url("less/appvars.less"); @import url("less/bootstrap-vue.min.less"); @import url("less/ameframework.less"); diff --git a/src/renderer/views/main.ejs b/src/renderer/views/main.ejs index fa72d902..5ae9e88f 100644 --- a/src/renderer/views/main.ejs +++ b/src/renderer/views/main.ejs @@ -81,7 +81,7 @@ loadingBar: { skipHijack: true } } - +