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

fix listitem-hr queuing fail after radio items

Browse source
This commit is contained in:
vapormusic 2022-02-13 23:23:58 +07:00
parent 1578e224c5
commit 28e75a52e4
2 changed files with 30 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

18
src/renderer/index.js
View file

@ -2804,7 +2804,7 @@ const app = new Vue({
}) })
}) })
} else { } else {
this.mk.clearQueue().then(function (_) { app.mk.queue.splice(0, app.mk.queue._itemIDs.length)
if (app.mk.shuffleMode == 1) { if (app.mk.shuffleMode == 1) {
shuffleArray(query) shuffleArray(query)
} }
@ -2814,7 +2814,7 @@ const app = new Vue({
} else { } else {
app.mk.play() app.mk.play()
} }
})
} }
}) })
} else if (parent.startsWith('listitem-hr')) { } else if (parent.startsWith('listitem-hr')) {
@ -2859,11 +2859,12 @@ const app = new Vue({
itemsToPlay[item.kind].push(item.id) itemsToPlay[item.kind].push(item.id)
}) })
// loop through itemsToPlay // loop through itemsToPlay
app.mk.queue.splice(0, app.mk.queue._itemIDs.length)
let ind = 0; let ind = 0;
for (let kind in itemsToPlay) { for (let kind in itemsToPlay) {
let ids = itemsToPlay[kind] let ids = itemsToPlay[kind]
app.mk.clearQueue().then(function () {
if (ids.length > 0) { if (ids.length > 0) {
if (app.mk.queue._itemIDs.length > 0) {
app.mk.playLater({ [kind + "s"]: itemsToPlay[kind] }).then(function () { app.mk.playLater({ [kind + "s"]: itemsToPlay[kind] }).then(function () {
ind += 1; ind += 1;
console.log(ind, Object.keys(itemsToPlay).length) console.log(ind, Object.keys(itemsToPlay).length)
@ -2871,8 +2872,17 @@ const app = new Vue({
app.mk.changeToMediaAtIndex(app.mk.queue._itemIDs.indexOf(item.attributes.playParams.id ?? item.id)) app.mk.changeToMediaAtIndex(app.mk.queue._itemIDs.indexOf(item.attributes.playParams.id ?? item.id))
} }
} }
)} else {
app.mk.setQueue({ [kind + "s"]: itemsToPlay[kind] }).then(function () {
ind += 1;
console.log(ind, Object.keys(itemsToPlay).length)
if (ind >= Object.keys(itemsToPlay).length) {
app.mk.changeToMediaAtIndex(app.mk.queue._itemIDs.indexOf(item.attributes.playParams.id ?? item.id))
}
}
)} )}
}) }
} }
} }
}) })

2
src/renderer/views/pages/remote-pair.ejs
View file

@ -1,6 +1,6 @@
<script type="text/x-template" id="remote-pair"> <script type="text/x-template" id="remote-pair">
<div style="display:flex;width:100%;height:100%;padding-top: var(--navigationBarHeight);position:absolute;top:0;left:0;"> <div style="display:flex;width:100%;height:100%;padding-top: var(--navigationBarHeight);position:absolute;top:0;left:0;">
<webview id="foo" src="https://music.apple.com/includes/commerce/account/settings?product=music&isFullscreen=true&isModal=false" style="display:inline-flex; width:100%;"></webview> <webview id="foo" src="https://cider.sh" style="display:inline-flex; width:100%;"></webview>
</div> </div>
</script> </script>
<script> <script>