okseby/orchard
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'innolab' of https://github.com/ciderapp/Cider into innolab

Browse source
This commit is contained in:
Maikiwi 2022-02-17 19:20:45 -08:00
commit ecfdeece64
22 changed files with 566 additions and 128 deletions
Download patch file Download diff file Expand all files Collapse all files

13
src/renderer/index.js
View file

@ -1354,8 +1354,15 @@ const app = new Vue({
}
},
async getNowPlayingItemDetailed(target) {
let u = await app.mkapi(app.mk.nowPlayingItem.playParams.kind, (app.mk.nowPlayingItem.songId == -1), (app.mk.nowPlayingItem.songId != -1) ? app.mk.nowPlayingItem.songId : app.mk.nowPlayingItem["id"], {"include[songs]": "albums,artists", l : app.mklang});
app.searchAndNavigate(u.data.data[0], target)
try {
let u = await app.mkapi(app.mk.nowPlayingItem.playParams.kind,
(app.mk.nowPlayingItem.songId == -1),
(app.mk.nowPlayingItem.songId != -1) ? app.mk.nowPlayingItem.songId : app.mk.nowPlayingItem["id"],
{ "include[songs]": "albums,artists", l: app.mklang });
app.searchAndNavigate(u.data.data[0], target)
} catch (e) {
app.searchAndNavigate(app.mk.nowPlayingItem, target)
}
},
async searchAndNavigate(item, target) {
let self = this
@ -3037,7 +3044,7 @@ const app = new Vue({
type += "s"
}
type = type.replace("library-", "")
let id = item.attributes.playParams.catalogId ?? item.id
let id = item.attributes.playParams.catalogId ?? item.attributes.playParams.id ?? item.id
let index = types.findIndex(function (type) {
return type.type == this