fix playlist index not reset to 0 when switch from random

core/events/playlist.go

@@ -22,6 +22,14 @@ type PlaylistMoveCmdEvent struct {
 	To   int
 }
 
+func PlaylistSetIndexCmd(id model.PlaylistID) event.EventId {
+	return event.EventId("cmd.playlist.setindex." + id)
+}
+
+type PlaylistSetIndexCmdEvent struct {
+	Index int
+}
+
 func PlaylistDeleteCmd(id model.PlaylistID) event.EventId {
 	return event.EventId("cmd.playlist.delete." + id)
 }

internal/playlist/model.go

@@ -40,12 +40,22 @@ func newPlaylist(id model.PlaylistID) *playlist {
 		pl.Next(event.Data.(events.PlaylistNextCmdEvent).Remove)
 	})
 	global.EventManager.RegisterA(events.PlaylistModeChangeCmd(id), "internal.playlist.mode", func(event *event.Event) {
+		if pl.mode == model.PlaylistModeRandom {
+			pl.Index = 0
+		}
 		pl.mode = event.Data.(events.PlaylistModeChangeCmdEvent).Mode
 		log.Infof("Playlist %s mode changed to %d", id, pl.mode)
 		global.EventManager.CallA(events.PlaylistModeChangeUpdate(id), events.PlaylistModeChangeUpdateEvent{
 			Mode: pl.mode,
 		})
 	})
+	global.EventManager.RegisterA(events.PlaylistSetIndexCmd(id), "internal.playlist.setindex", func(event *event.Event) {
+		index := event.Data.(events.PlaylistSetIndexCmdEvent).Index
+		if index >= pl.Size() || index < 0 {
+			index = 0
+		}
+		pl.Index = index
+	})
 	return pl
 }
 
@@ -144,6 +154,10 @@ func (p *playlist) Next(delete bool) {
 	}
 	var index int
 	index = p.Index
+	// add guard
+	if index >= p.Size() {
+		index = 0
+	}
 	if p.mode == model.PlaylistModeRandom {
 		p.Index = rand.Intn(p.Size())
 	} else if p.mode == model.PlaylistModeNormal {

todo.txt

@@ -14,7 +14,7 @@
 ----
 
 Finished
-- 2024.04.22      : 文本输出, 歌曲最长时长控制，bug修复, 网易云登录(歌曲来源统一登录)
+- 2024.04.22@1.0.2: 文本输出, 歌曲最长时长控制，bug修复, 网易云登录(歌曲来源统一登录)
 - 2024.04.17      : 1. 弹幕拿不到的问题，尽量使用身份码，网页协议随时可能爆炸
                     2. 酷我音乐复活
                     3. 黑名单