github
/
lx-music-desktop
mirror of https://github.com/lyswhut/lx-music-desktop
1
0
Fork 0
Code Issues Releases Wiki Activity

优化切歌逻辑

pull/389/head
lyswhut 2020-11-10 08:33:07 +08:00
parent 1cee2febf4
commit b820adf0bf
1 changed files with 20 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/renderer/components/core/Player.vue
View File

@ -517,15 +517,18 @@ export default {
if (this.setting.player.togglePlayMethod == 'random' && this.playedList.length) { if (this.setting.player.togglePlayMethod == 'random' && this.playedList.length) {
let index = this.playedList.indexOf(this.targetSong) let index = this.playedList.indexOf(this.targetSong)
index -= 1 index -= 1
while (true) {
if (index > -1) { if (index > -1) {
let listIndex = this.list.indexOf(this.playedList[index]) let listIndex = this.list.indexOf(this.playedList[index])
if (listIndex < 0) { if (listIndex < 0) {
this.removePlayedList(index) this.removePlayedList(index)
return this.handlePrev() continue
} }
this.setPlayIndex(listIndex) this.setPlayIndex(listIndex)
return return
} }
break
}
} }
let list = await this.filterList() let list = await this.filterList()
if (!list.length) return this.setPlayIndex(-1) if (!list.length) return this.setPlayIndex(-1)
@ -552,15 +555,18 @@ export default {
if (this.setting.player.togglePlayMethod == 'random' && this.playedList.length) { if (this.setting.player.togglePlayMethod == 'random' && this.playedList.length) {
let index = this.playedList.indexOf(this.targetSong) let index = this.playedList.indexOf(this.targetSong)
index += 1 index += 1
while (true) {
if (index < this.playedList.length) { if (index < this.playedList.length) {
let listIndex = this.list.indexOf(this.playedList[index]) let listIndex = this.list.indexOf(this.playedList[index])
if (listIndex < 0) { if (listIndex < 0) {
this.removePlayedList(index) this.removePlayedList(index)
return this.handleNext() continue
} }
this.setPlayIndex(listIndex) this.setPlayIndex(listIndex)
return return
} }
break
}
} }
let list = await this.filterList() let list = await this.filterList()
if (!list.length) return this.setPlayIndex(-1) if (!list.length) return this.setPlayIndex(-1)