From 11cf5158afbc81db3640defcc7ebb59b8d9d1bf5 Mon Sep 17 00:00:00 2001 From: vapormusic Date: Tue, 23 Aug 2022 14:17:08 +0700 Subject: [PATCH 01/11] trigger ci --- src/main/plugins/raop.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/plugins/raop.ts b/src/main/plugins/raop.ts index 95ddbf5f..55b552da 100644 --- a/src/main/plugins/raop.ts +++ b/src/main/plugins/raop.ts @@ -173,7 +173,7 @@ export default class RAOP { this.ondeviceup(service.name, service.host, service.port, service.addresses, service.txt); } }); - + const browser2 = this.mdns.createBrowser(this.mdns.tcp("airplay")); browser2.on("ready", browser2.discover); From b25bc8879037941254398c133a093c518c733963 Mon Sep 17 00:00:00 2001 From: vapormusic Date: Wed, 24 Aug 2022 00:53:38 +0000 Subject: [PATCH 02/11] chore: Prettified Code [ci skip] --- src/main/plugins/raop.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/plugins/raop.ts b/src/main/plugins/raop.ts index 55b552da..95ddbf5f 100644 --- a/src/main/plugins/raop.ts +++ b/src/main/plugins/raop.ts @@ -173,7 +173,7 @@ export default class RAOP { this.ondeviceup(service.name, service.host, service.port, service.addresses, service.txt); } }); - + const browser2 = this.mdns.createBrowser(this.mdns.tcp("airplay")); browser2.on("ready", browser2.discover); From 3a67ad3dcdb9c1a922e0f1d123fe346a2c0be537 Mon Sep 17 00:00:00 2001 From: vapormusic Date: Tue, 23 Aug 2022 13:56:29 +0700 Subject: [PATCH 03/11] fix casting after ctrl+f10 --- src/renderer/audio/audio.js | 2 +- src/renderer/main/events.js | 13 +++++++++++++ 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/src/renderer/audio/audio.js b/src/renderer/audio/audio.js index c276fd1d..62df318d 100644 --- a/src/renderer/audio/audio.js +++ b/src/renderer/audio/audio.js @@ -367,7 +367,7 @@ const CiderAudio = { if (!CiderAudio.ccON) { CiderAudio.ccON = true; let searchInt = setInterval(async function () { - if (CiderAudio.context != null && CiderAudio.audioNodes.gainNode != null) { + if (CiderAudio.context != null && CiderAudio.audioNodes.intelliGainComp != null) { // var options = { // mimeType: 'audio/webm; codecs=opus' // }; diff --git a/src/renderer/main/events.js b/src/renderer/main/events.js index 6da6906c..b003961f 100644 --- a/src/renderer/main/events.js +++ b/src/renderer/main/events.js @@ -50,6 +50,7 @@ const Events = { }); app.showCollection(hist.data, app.getLz("term.history")); } + // CTRL+F10 if (event.ctrlKey && event.keyCode == 121) { try { app.mk._services.mediaItemPlayback._currentPlayer.stop(); @@ -57,7 +58,19 @@ const Events = { try { app.mk._services.mediaItemPlayback._currentPlayer.destroy(); } catch (e) {} + try{ + let searchInt = setInterval(function () { + if (document.getElementById("apple-music-player")) { + //AudioOutputs.eqReady = true; + document.getElementById("apple-music-player").crossOrigin = "anonymous"; + CiderAudio.source = CiderAudio.context.createMediaElementSource(document.getElementById("apple-music-player")) + CiderAudio.source.connect(CiderAudio.audioNodes.intelliGainComp); + clearInterval(searchInt); + } + }, 1000); + } catch (e) {} } + // CTRL+F11 if (event.ctrlKey && event.keyCode == 122) { try { ipcRenderer.send("detachDT", ""); From 421917f5c17623b906323af68494315d410e198d Mon Sep 17 00:00:00 2001 From: booploops <49113086+booploops@users.noreply.github.com> Date: Tue, 23 Aug 2022 16:23:54 -0700 Subject: [PATCH 04/11] enabled oobe - enabled oobe - set twopanel as default window layout --- src/main/base/store.ts | 2 +- src/renderer/index.js | 1 - src/renderer/views/pages/oobe.ejs | 56 ++++++++++++++++++++++++++----- 3 files changed, 49 insertions(+), 10 deletions(-) diff --git a/src/main/base/store.ts b/src/main/base/store.ts index 424a22eb..ea0a1b31 100644 --- a/src/main/base/store.ts +++ b/src/main/base/store.ts @@ -189,7 +189,7 @@ export class Store { transparent: false, miniplayer_top_toggle: true, directives: { - windowLayout: "default", + windowLayout: "twopanel", }, windowControlPosition: 0, // 0 default right nativeTitleBar: false, diff --git a/src/renderer/index.js b/src/renderer/index.js index a66bf2bb..e10700c2 100644 --- a/src/renderer/index.js +++ b/src/renderer/index.js @@ -228,7 +228,6 @@ function isJson(item) { webGPU().then(); function showOobe() { - return false; if (localStorage.getItem("music.ampwebplay.media-user-token") && localStorage.getItem("seenOOBE")) { return false; } else { diff --git a/src/renderer/views/pages/oobe.ejs b/src/renderer/views/pages/oobe.ejs index ea0c1a24..e4486f35 100644 --- a/src/renderer/views/pages/oobe.ejs +++ b/src/renderer/views/pages/oobe.ejs @@ -6,10 +6,32 @@
{{ getLz("oobe.amupsell.title") }}
-
{{ getLz("oobe.amupsell.text") }}
+
{{ getLz("oobe.amupsell.text") }} + +
+
+ {{$root.getLz('term.language')}} +
+
+ +
+
+ +
-
{{ getLz("oobe.next") }}
+
{{ getLz("oobe.next") }}
@@ -25,7 +47,7 @@
{{ getLz("oobe.previous") }}
-
{{ getLz("oobe.next") }}
+
{{ getLz("oobe.next") }}
@@ -37,11 +59,11 @@
{{ getLz("oobe.general.title") }}
-
{{ getLz("oobe.general.text") }}
+
{{ getLz("oobe.previous") }}
-
{{ getLz("oobe.next") }}
+
{{ getLz("oobe.next") }}
@@ -84,8 +106,8 @@
-
{{ getLz("oobe.previous") }}
-
{{ getLz("oobe.next") }}
+
{{ getLz("oobe.previous") }}
+
{{ getLz("oobe.next") }}
@@ -118,7 +140,7 @@
{{ getLz("oobe.previous") }}
-
{{ getLz("oobe.next") }}
+
{{ getLz("oobe.next") }}
@@ -164,6 +186,24 @@ }, getLz() { return this.$root.getLz.apply(this.$root, arguments); + }, + getLanguages: function() { + let langs = this.$root.lzListing + let categories = { + "main": [], + "fun": [], + "unsorted": [] + } + // sort by category if category is undefined or empty put it in "unsorted" + for (let i = 0; i < langs.length; i++) { + if (langs[i].category === undefined || langs[i].category === "") { + categories.unsorted.push(langs[i]) + } else { + categories[langs[i].category].push(langs[i]) + } + } + // return + return categories } } }); From 34a1c5353f154c0777a208ddb325d644d8ec168c Mon Sep 17 00:00:00 2001 From: booploops <49113086+booploops@users.noreply.github.com> Date: Tue, 23 Aug 2022 16:46:55 -0700 Subject: [PATCH 05/11] removed unused strings --- src/i18n/en_US.json | 12 ------------ src/i18n/source/en_US.json | 16 +++------------- 2 files changed, 3 insertions(+), 25 deletions(-) diff --git a/src/i18n/en_US.json b/src/i18n/en_US.json index 95a2e860..f5f9ace8 100644 --- a/src/i18n/en_US.json +++ b/src/i18n/en_US.json @@ -632,17 +632,5 @@ "oobe.visual.subtitle": "", "oobe.visual.text": "", "oobe.visual.layout.text": "Cider features two window different layouts.\nMaverick is an iTunes like layout with the player at the top of the window.\nMojave is a new spin created by the Cider Collective.\n\nYou can change the layout any time in the settings.", - "oobe.visual.suggestingThemes": "Theming is a great way to personalize your experience. Here are a few we suggest: ", - "oobe.visual.suggestingThemes.subtext": "(These themes will be downloaded from GitHub)", - "oobe.visual.suggestingThemes.default": "Cider", - "oobe.visual.suggestingThemes.default.text": "The classic Cider theme.", - "oobe.visual.suggestingThemes.dark": "Dark", - "oobe.visual.suggestingThemes.dark.text": "Darkness.", - "oobe.visual.suggestingThemes.community1": "Groovy", - "oobe.visual.suggestingThemes.community1.text": "A WinUI influenced theme", - "oobe.visual.suggestingThemes.community2": "iTheme", - "oobe.visual.suggestingThemes.community2.text": "The classic big fruit layout.", - "oobe.visual.suggestingThemes.community3": "Dracula", - "oobe.visual.suggestingThemes.community3.text": "The iconic Dracula color scheme.", "oobe.amsignin.title": "" } diff --git a/src/i18n/source/en_US.json b/src/i18n/source/en_US.json index d25642e0..f5f9ace8 100644 --- a/src/i18n/source/en_US.json +++ b/src/i18n/source/en_US.json @@ -317,7 +317,7 @@ "menubar.options.toggledevtools": "Toggle Developer Tools", "menubar.options.window": "Window", "menubar.options.minimize": "Minimize", - "menubar.options.plugins": "Plu-gins Menu", + "menubar.options.plugins": "Plugins Menu", "menubar.options.controls": "Controls", "menubar.options.volumeup": "Volume Up", "menubar.options.volumedown": "Volume Down", @@ -361,6 +361,8 @@ "settings.prompt.general.keybindings.update.success": "Keybind updated successfully. Press OK to relaunch Cider", "settings.option.general.themeUpdateNotification": "Automatically check for theme updates", "settings.option.general.showLovedTracksInline": "Show loved tracks inline", + "settings.option.general.pagination": "Items to show per page", + "settings.options.general.pagination.description": "This determines how many songs/albums to show initially for infinite scrolling, or how many songs/albums to show for a single page", "settings.description.search": "Search", "settings.description.albums": "Library Albums", "settings.description.artists": "Library Artists", @@ -630,17 +632,5 @@ "oobe.visual.subtitle": "", "oobe.visual.text": "", "oobe.visual.layout.text": "Cider features two window different layouts.\nMaverick is an iTunes like layout with the player at the top of the window.\nMojave is a new spin created by the Cider Collective.\n\nYou can change the layout any time in the settings.", - "oobe.visual.suggestingThemes": "Theming is a great way to personalize your experience. Here are a few we suggest: ", - "oobe.visual.suggestingThemes.subtext": "(These themes will be downloaded from GitHub)", - "oobe.visual.suggestingThemes.default": "Cider", - "oobe.visual.suggestingThemes.default.text": "The classic Cider theme.", - "oobe.visual.suggestingThemes.dark": "Dark", - "oobe.visual.suggestingThemes.dark.text": "Darkness.", - "oobe.visual.suggestingThemes.community1": "Groovy", - "oobe.visual.suggestingThemes.community1.text": "A WinUI influenced theme", - "oobe.visual.suggestingThemes.community2": "iTheme", - "oobe.visual.suggestingThemes.community2.text": "The classic big fruit layout.", - "oobe.visual.suggestingThemes.community3": "Dracula", - "oobe.visual.suggestingThemes.community3.text": "The iconic Dracula color scheme.", "oobe.amsignin.title": "" } From b5074cfe6fbdd0f440ee375c009db2466c54a315 Mon Sep 17 00:00:00 2001 From: booploops <49113086+booploops@users.noreply.github.com> Date: Tue, 23 Aug 2022 17:31:09 -0700 Subject: [PATCH 06/11] wip i18n editor can be accessed with: app.appRoute("lzedit") --- src/main/base/browserwindow.ts | 5 ++ src/renderer/less/pages.less | 16 ++++ src/renderer/main/app.js | 1 + src/renderer/main/components/i18n-editor.js | 83 +++++++++++++++++++++ 4 files changed, 105 insertions(+) create mode 100644 src/renderer/main/components/i18n-editor.js diff --git a/src/main/base/browserwindow.ts b/src/main/base/browserwindow.ts index 42f48b1e..4bd5f5dd 100644 --- a/src/main/base/browserwindow.ts +++ b/src/main/base/browserwindow.ts @@ -120,6 +120,11 @@ export class BrowserWindow { "components/settings-plugins-github", ], appRoutes: [ + { + page: "lzedit", + component: ``, + condition: "$root.page == 'lzedit'", + }, { page: "library-recentlyadded", component: ``, diff --git a/src/renderer/less/pages.less b/src/renderer/less/pages.less index f3287bce..03428031 100644 --- a/src/renderer/less/pages.less +++ b/src/renderer/less/pages.less @@ -1480,6 +1480,22 @@ } } +.i18n-page { + textarea { + background: black; + color: #eee; + font-weight: bold; + font-size: 1em; + font-family: system-ui, 'Pretendard Variable'; + padding: 0.5em; + } + + .selectCol { + display: flex; + align-items: center; + } +} + // AudioLabs page .audiolabs-page { padding: 0px; diff --git a/src/renderer/main/app.js b/src/renderer/main/app.js index 1db74112..71d3b012 100644 --- a/src/renderer/main/app.js +++ b/src/renderer/main/app.js @@ -10,6 +10,7 @@ import { MusicKitTools } from "./musickittools.js"; import { spawnMica } from "./mica.js"; import { svgIcon } from "./components/svg-icon.js"; import { sidebarLibraryItem } from "./components/sidebar-library-item.js"; +import { i18nEditor } from "./components/i18n-editor.js"; // Define window objects window.app = app; diff --git a/src/renderer/main/components/i18n-editor.js b/src/renderer/main/components/i18n-editor.js new file mode 100644 index 00000000..c57d9bf3 --- /dev/null +++ b/src/renderer/main/components/i18n-editor.js @@ -0,0 +1,83 @@ +import { html } from "../html.js"; + +export const i18nEditor = Vue.component("i18n-editor", { + // language=HTML + template: html` +
+
+
+

i18n Editor

+
+
+ + +
+
+
+
+ +
+
+ `, + data() { + return { + listing: ipcRenderer.sendSync("get-i18n-listing"), + baseLz: ipcRenderer.sendSync("get-i18n", "en_US") + } + }, + methods: { + exportLz() { + bootbox.alert(``) + notyf.success("Copied to clipboard"); + navigator.clipboard.writeText(JSON.stringify(app.lz, true, ' ')).then((r) => console.debug("Copied to clipboard.")); + }, + getLanguages: function () { + let langs = this.$root.lzListing + let categories = { + "main": [], + "fun": [], + "unsorted": [] + } + // sort by category if category is undefined or empty put it in "unsorted" + for (let i = 0; i < langs.length; i++) { + if (langs[i].category === undefined || langs[i].category === "") { + categories.unsorted.push(langs[i]) + } else { + categories[langs[i].category].push(langs[i]) + } + } + // return + return categories + }, + } +}); From 4c0855165f8e5f192b012291623c5e8ce9c68f32 Mon Sep 17 00:00:00 2001 From: booploops Date: Wed, 24 Aug 2022 00:31:50 +0000 Subject: [PATCH 07/11] chore: Prettified Code [ci skip] --- src/renderer/less/pages.less | 2 +- src/renderer/main/components/i18n-editor.js | 39 +++++++++------------ 2 files changed, 18 insertions(+), 23 deletions(-) diff --git a/src/renderer/less/pages.less b/src/renderer/less/pages.less index 03428031..ca38276f 100644 --- a/src/renderer/less/pages.less +++ b/src/renderer/less/pages.less @@ -1486,7 +1486,7 @@ color: #eee; font-weight: bold; font-size: 1em; - font-family: system-ui, 'Pretendard Variable'; + font-family: system-ui, "Pretendard Variable"; padding: 0.5em; } diff --git a/src/renderer/main/components/i18n-editor.js b/src/renderer/main/components/i18n-editor.js index c57d9bf3..0482fac6 100644 --- a/src/renderer/main/components/i18n-editor.js +++ b/src/renderer/main/components/i18n-editor.js @@ -11,25 +11,20 @@ export const i18nEditor = Vue.component("i18n-editor", {
-
+