From bed6548fc1d7367e6699f5eb3981ffa838785e13 Mon Sep 17 00:00:00 2001 From: vapormusic Date: Thu, 10 Feb 2022 22:16:15 +0700 Subject: [PATCH] fix locale in now playing --- src/main/base/browserwindow.ts | 2 +- src/renderer/index.js | 19 ++++++++++++------- src/renderer/js/WSAPI_Interop.js | 4 ++-- .../views/components/mediaitem-list-item.ejs | 2 +- src/renderer/views/pages/cider-playlist.ejs | 2 +- src/renderer/views/pages/playlist-inline.ejs | 2 +- src/renderer/views/pages/podcasts.ejs | 2 +- 7 files changed, 19 insertions(+), 14 deletions(-) diff --git a/src/main/base/browserwindow.ts b/src/main/base/browserwindow.ts index d761be78..8518c359 100644 --- a/src/main/base/browserwindow.ts +++ b/src/main/base/browserwindow.ts @@ -527,7 +527,7 @@ export class BrowserWindow { ipcMain.on('play', (_event, type, id) => { BrowserWindow.win.webContents.executeJavaScript(` - MusicKit.getInstance().setQueue({ ${type}: '${id}'}).then(function(queue) { + MusicKit.getInstance().setQueue({ ${type}: '${id}', parameters : {l : app.mklang}}).then(function(queue) { MusicKit.getInstance().play(); }); `) diff --git a/src/renderer/index.js b/src/renderer/index.js index fe6af045..17372d48 100644 --- a/src/renderer/index.js +++ b/src/renderer/index.js @@ -643,7 +643,8 @@ const app = new Vue({ let kind = lastItem.attributes.playParams.kind; let truekind = (!kind.endsWith("s")) ? (kind + "s") : kind; app.mk.setQueue({ - [truekind]: [lastItem.attributes.playParams.id] + [truekind]: [lastItem.attributes.playParams.id], + parameters : {l : app.mklang} }) app.mk.mute() setTimeout(() => { @@ -696,7 +697,7 @@ const app = new Vue({ ipcRenderer.on('play', function(_event, mode, id) { if (mode !== 'url'){ - self.mk.setQueue({[mode]: id}).then(() => { + self.mk.setQueue({[mode]: id , parameters : {l : self.mklang}}).then(() => { app.mk.play() }) @@ -2722,7 +2723,8 @@ const app = new Vue({ }); } else { this.mk.setQueue({ - [truekind]: [id] + [truekind]: [id], + parameters : {l : this.mklang} }).then(function (queue) { MusicKit.getInstance().play() }) @@ -2762,7 +2764,8 @@ const app = new Vue({ app.mk.stop().then(() => { if (item) { app.mk.setQueue({ - [item.attributes.playParams.kind ?? item.type]: item.attributes.playParams.id ?? item.id + [item.attributes.playParams.kind ?? item.type]: item.attributes.playParams.id ?? item.id, + parameters : {l : app.mklang} }).then(function () { app.mk.play().then(() => { if (app.mk.shuffleMode == 1) { @@ -2796,7 +2799,8 @@ const app = new Vue({ app.mk.stop().then(() => { if (truekind == "playlists" && (id.startsWith("p.") || id.startsWith("pl.u"))) { app.mk.setQueue({ - [item.attributes.playParams.kind ?? item.type]: item.attributes.playParams.id ?? item.id + [item.attributes.playParams.kind ?? item.type]: item.attributes.playParams.id ?? item.id, + parameters : {l : app.mklang} }).then(function () { app.mk.changeToMediaAtIndex(app.mk.queue._itemIDs.indexOf(item.id) ?? 1).then(function () { if ((app.showingPlaylist && app.showingPlaylist.id == id)) { @@ -2835,7 +2839,8 @@ const app = new Vue({ }) } else { this.mk.setQueue({ - [truekind]: [id] + [truekind]: [id], + parameters : {l : this.mklang} }).then(function (queue) { if (item && ((queue._itemIDs[childIndex] != item.id))) { childIndex = queue._itemIDs.indexOf(item.id) @@ -3151,7 +3156,7 @@ const app = new Vue({ quickPlay(query) { let self = this MusicKit.getInstance().api.search(query, {limit: 2, types: 'songs'}).then(function (data) { - MusicKit.getInstance().setQueue({song: data["songs"]['data'][0]["id"]}).then(function (queue) { + MusicKit.getInstance().setQueue({song: data["songs"]['data'][0]["id"], parameters : {l : app.mklang}}).then(function (queue) { MusicKit.getInstance().play() setTimeout(() => { self.$forceUpdate() diff --git a/src/renderer/js/WSAPI_Interop.js b/src/renderer/js/WSAPI_Interop.js index 422c96b3..16002fae 100644 --- a/src/renderer/js/WSAPI_Interop.js +++ b/src/renderer/js/WSAPI_Interop.js @@ -81,14 +81,14 @@ const wsapi = { }, playTrackById(id, kind = "song") { - MusicKit.getInstance().setQueue({ [kind]: id }).then(function (queue) { + MusicKit.getInstance().setQueue({ [kind]: id , parameters : {l : app.mklang}}).then(function (queue) { MusicKit.getInstance().play() }) }, quickPlay(term) { // Quick play by song name MusicKit.getInstance().api.search(term, { limit: 2, types: 'songs' }).then(function (data) { - MusicKit.getInstance().setQueue({ song: data["songs"][0]["id"] }).then(function (queue) { + MusicKit.getInstance().setQueue({ song: data["songs"][0]["id"],parameters : {l : app.mklang} }).then(function (queue) { MusicKit.getInstance().play() }) }) diff --git a/src/renderer/views/components/mediaitem-list-item.ejs b/src/renderer/views/components/mediaitem-list-item.ejs index 76487b1e..bbef29d6 100644 --- a/src/renderer/views/components/mediaitem-list-item.ejs +++ b/src/renderer/views/components/mediaitem-list-item.ejs @@ -531,7 +531,7 @@ array[j] = temp; } } - app.mk.setQueue({ [truekind]: [item.attributes.playParams.id ?? item.id] }).then(function () { + app.mk.setQueue({ [truekind]: [item.attributes.playParams.id ?? item.id] , parameters : {l : this.app.mklang} }).then(function () { app.mk.play().then(function () { var playlistId = id function getPlaylist(id, isLibrary) { diff --git a/src/renderer/views/pages/cider-playlist.ejs b/src/renderer/views/pages/cider-playlist.ejs index 11dcac7a..902fcadb 100644 --- a/src/renderer/views/pages/cider-playlist.ejs +++ b/src/renderer/views/pages/cider-playlist.ejs @@ -480,7 +480,7 @@ let query = (this.data ?? app.showingPlaylist).relationships.tracks.data.map(item => new MusicKit.MediaItem(item)); app.mk.stop().then(function () { - app.mk.setQueue({[truekind]: [id]}).then(function () { + app.mk.setQueue({[truekind]: [id] , parameters : {l : app.mklang}}).then(function () { app.mk.play().then(function () { if (query.length > 100) { let u = query.slice(100); diff --git a/src/renderer/views/pages/playlist-inline.ejs b/src/renderer/views/pages/playlist-inline.ejs index e62cd01d..21030dcd 100644 --- a/src/renderer/views/pages/playlist-inline.ejs +++ b/src/renderer/views/pages/playlist-inline.ejs @@ -534,7 +534,7 @@ let query = (this.data ?? app.showingPlaylist).relationships.tracks.data.map(item => new MusicKit.MediaItem(item)); app.mk.stop().then(function () { - app.mk.setQueue({[truekind]: [id]}).then(function () { + app.mk.setQueue({[truekind]: [id] , parameters : {l : app.mklang}}).then(function () { app.mk.play().then(function () { if (query.length > 100) { let u = query.slice(100); diff --git a/src/renderer/views/pages/podcasts.ejs b/src/renderer/views/pages/podcasts.ejs index 54923b37..b13821ff 100644 --- a/src/renderer/views/pages/podcasts.ejs +++ b/src/renderer/views/pages/podcasts.ejs @@ -204,7 +204,7 @@ return minutes + ":" + (seconds < 10 ? '0' : '') + seconds; }, playEpisode(episode) { - app.mk.setQueue({'episode': episode.id}).then(() => {app.mk.play()}) + app.mk.setQueue({'episode': episode.id, parameters : {l : app.mklang}}).then(() => {app.mk.play()}) }, selectPodcast(podcast) { this.podcastSelected = podcast