[bugfix]<play>: fix file fd leaks (#17)

Signed-off-by: o98k-ok <hggend@gmail.com>
o98k-ok · Mar 13, 2024 · a6a53b5 · a6a53b5
1 parent 2218314
commit a6a53b5
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 0 deletions.
diff --git a/internal/music/music.go b/internal/music/music.go
@@ -22,6 +22,7 @@ type Music struct {
 	PauseTrigger     func()
 	SeekTrigger      func(int) error
 	DurationCallback func() int
+	Close            func() error
 	PositionCallback func() int
 }
 

diff --git a/internal/player/play.go b/internal/player/play.go
@@ -133,6 +133,13 @@ func (vp *VoicePlayer) Run() error {
 			if vp.PlayingQueue.Size() == 0 && vp.CurrentElem != nil {
 				// avoid stream conflict
 				// time.Sleep(time.Millisecond * 100)
+				// clear last song file
+				if vp.CurrentElem != nil {
+					fn := vp.CurrentElem.Value.(*music.Music).Close
+					if fn != nil {
+						fn()
+					}
+				}
 				vp.CurrentElem = pkg.NextForward(vp.PlayList, vp.CurrentElem)
 				if vp.CurrentElem != nil {
 					vp.PlayingQueue.Add(vp.CurrentElem)

diff --git a/internal/player/queue.go b/internal/player/queue.go
@@ -47,6 +47,7 @@ func (q *StreamerQueue) Add(elem *list.Element) {
 	data.DurationCallback = streamer.Len
 	data.PositionCallback = streamer.Position
 	data.SampleRate = format.SampleRate
+	data.Close = streamer.Close
 
 	q.streamers = append(q.streamers, NewTask(elem, c2))
 }