Fix a bug for rename. Update queue to avoid panic

This commit is contained in:
tramhao 2021-02-01 16:41:49 +08:00
parent fc9b3c55a2
commit 7c6ad10714
4 changed files with 30 additions and 19 deletions

View File

@ -55,7 +55,12 @@ func newPlayer() *Player {
}
func (p *Player) run(currSong *AudioFile) error {
if s != nil {
speaker.Lock()
s.Close()
speaker.Unlock()
}
p.isSkipped = make(chan bool, 1)
f, err := os.Open(currSong.path)

View File

@ -505,6 +505,23 @@ func (p *Playlist) rename(newName string) error {
if err != nil {
return tracerr.Wrap(err)
}
audio.path = newPath
// fmt.Println(newPath)
// fmt.Println(audio.path)
// // p.refresh()
if err:= gomu.queue.saveQueue(); err !=nil {
logError(err)
}
gomu.queue.clearQueue()
if err:= gomu.queue.loadQueue(); err !=nil {
logError(err)
}
// if audio.isAudioFile {
// gomu.queue.enqueue(audio)
// }
return nil
}

View File

@ -510,6 +510,13 @@ func renamePopup(node *AudioFile) {
gomu.pages.RemovePage(popupId)
gomu.popups.pop()
gomu.playlist.refresh()
if err:= gomu.queue.saveQueue(); err !=nil {
logError(err)
}
gomu.queue.clearQueue()
if err:= gomu.queue.loadQueue(); err !=nil {
logError(err)
}
gomu.setFocusPanel(gomu.playlist)
gomu.prevPanel = gomu.playlist

View File

@ -264,24 +264,6 @@ func (q *Queue) loadQueue() error {
q.enqueue(audioFile)
}
// if (gomu.queue.GetItemCount() != 0 && gomu.queue.GetCurrentItem()!= -1) {
// a, err := gomu.queue.deleteItem(gomu.queue.GetCurrentItem())
// if err != nil {
// logError(err)
// }
// gomu.queue.pushFront(a)
// gomu.player.skip()
// }
// go func() {
// audioFile,_ := q.dequeue()
// if err := gomu.player.run(audioFile); err != nil {
// logError(err)
// }
// }()
return nil
}