yonlu/yellowjacket
1
1
Fork 0
Code Issues 55 Pull Requests 6 Actions Packages Projects Releases 12 Wiki Activity

fix: virtual list and cover grid (#63)

Browse Source 
* very basic slow buggy queue

* cover grid can now add albums to queue

* added virtualized lists to track list and cover grid components
This commit is contained in:
yonlu
2026-02-14 14:07:25 -06:00
committed by GitHub
parent e32b217912
commit 7579a768be
11 changed files with 508 additions and 548 deletions
Download Patch File Download Diff File Expand all files Collapse all files
backend/queue/queue.go
+29 -42
View File
@@ -38,8 +38,8 @@ type TrackLoader interface {
CurrentPositionSeconds() (int, error)
}
// Track represents a track in the queue with its metadata.
type Track struct {
// QueueTrack represents a track in the queue with its metadata.
type QueueTrack struct {
ID int64 `json:"id"`
AudioFileID int64 `json:"audioFileId"`
FilePath string `json:"filePath"`
@@ -48,13 +48,13 @@ type Track struct {
Artist string `json:"artist"`
}
// State is the full state emitted to the frontend.
type State struct {
Tracks []Track `json:"tracks"`
CurrentIndex int `json:"currentIndex"`
ShuffleMode bool `json:"shuffleMode"`
RepeatMode RepeatMode `json:"repeatMode"`
SourcePlaylistID int64 `json:"sourcePlaylistId"`
// QueueState is the full state emitted to the frontend.
type QueueState struct {
Tracks []QueueTrack `json:"tracks"`
CurrentIndex int `json:"currentIndex"`
ShuffleMode bool `json:"shuffleMode"`
RepeatMode RepeatMode `json:"repeatMode"`
SourcePlaylistID int64 `json:"sourcePlaylistId"`
}
// Queue manages an ordered list of tracks for playback.
@@ -65,7 +65,7 @@ type Queue struct {
player TrackLoader
mu sync.Mutex
tracks []Track
tracks []QueueTrack
currentIndex int
shuffleMode bool
repeatMode RepeatMode
@@ -331,7 +331,7 @@ func (q *Queue) SetQueue(filePaths []string, startIndex int) {
defer q.mu.Unlock()
// Look up audio file IDs and metadata for all paths.
tracks := make([]Track, 0, len(filePaths))
tracks := make([]QueueTrack, 0, len(filePaths))
for i, fp := range filePaths {
af, err := q.db.Queries.GetAudioFileByPath(q.db.Ctx, fp)
@@ -341,7 +341,7 @@ func (q *Queue) SetQueue(filePaths []string, startIndex int) {
continue
}
track := Track{
track := QueueTrack{
AudioFileID: af.ID,
FilePath: fp,
Position: int64(i),
@@ -395,7 +395,7 @@ func (q *Queue) AddTrack(filePath string) {
wasEmpty := len(q.tracks) == 0
track := Track{
track := QueueTrack{
AudioFileID: af.ID,
FilePath: filePath,
Position: int64(len(q.tracks)),
@@ -449,7 +449,7 @@ func (q *Queue) AddTracks(filePaths []string) {
continue
}
track := Track{
track := QueueTrack{
AudioFileID: af.ID,
FilePath: fp,
Position: int64(len(q.tracks)),
@@ -490,8 +490,7 @@ func (q *Queue) InsertNextTracks(filePaths []string) {
}
wasEmpty := len(q.tracks) == 0
var newTracks []Track
var newTracks []QueueTrack
for _, fp := range filePaths {
af, err := q.db.Queries.GetAudioFileByPath(q.db.Ctx, fp)
@@ -501,7 +500,7 @@ func (q *Queue) InsertNextTracks(filePaths []string) {
continue
}
track := Track{
track := QueueTrack{
AudioFileID: af.ID,
FilePath: fp,
}
@@ -520,7 +519,7 @@ func (q *Queue) InsertNextTracks(filePaths []string) {
}
// Insert the block into the slice at insertPos.
tail := make([]Track, len(q.tracks[insertPos:]))
tail := make([]QueueTrack, len(q.tracks[insertPos:]))
copy(tail, q.tracks[insertPos:])
q.tracks = append(q.tracks[:insertPos], newTracks...)
q.tracks = append(q.tracks, tail...)
@@ -559,7 +558,7 @@ func (q *Queue) InsertNext(filePath string) {
insertPos = len(q.tracks)
}
track := Track{
track := QueueTrack{
AudioFileID: af.ID,
FilePath: filePath,
Position: int64(insertPos),
@@ -573,7 +572,7 @@ func (q *Queue) InsertNext(filePath string) {
}
// Insert into slice.
q.tracks = append(q.tracks, Track{})
q.tracks = append(q.tracks, QueueTrack{})
copy(q.tracks[insertPos+1:], q.tracks[insertPos:])
q.tracks[insertPos] = track
@@ -711,14 +710,14 @@ func (q *Queue) CycleRepeat() {
}
// GetState returns the current queue state for the frontend.
func (q *Queue) GetState() State {
func (q *Queue) GetState() QueueState {
q.mu.Lock()
defer q.mu.Unlock()
tracks := make([]Track, len(q.tracks))
tracks := make([]QueueTrack, len(q.tracks))
copy(tracks, q.tracks)
return State{
return QueueState{
Tracks: tracks,
CurrentIndex: q.currentIndex,
ShuffleMode: q.shuffleMode,
@@ -791,10 +790,10 @@ func (q *Queue) RestoreState() {
return
}
q.tracks = make([]Track, 0, len(rows))
q.tracks = make([]QueueTrack, 0, len(rows))
for _, row := range rows {
q.tracks = append(q.tracks, Track{
q.tracks = append(q.tracks, QueueTrack{
ID: row.ID,
AudioFileID: row.AudioFileID,
FilePath: row.FilePath,
@@ -955,25 +954,13 @@ func (q *Queue) playCurrentTrack() {
}
if q.currentIndex < 0 || q.currentIndex >= len(q.tracks) {
q.logger.Warn(
"Current index out of range",
"index",
q.currentIndex,
"trackCount",
len(q.tracks),
)
q.logger.Warn("Current index out of range", "index", q.currentIndex, "trackCount", len(q.tracks))
return
}
track := q.tracks[q.currentIndex]
q.logger.Info(
"Playing track from queue",
"filePath",
track.FilePath,
"position",
q.currentIndex,
)
q.logger.Info("Playing track from queue", "filePath", track.FilePath, "position", q.currentIndex)
err := q.player.LoadFile(track.FilePath)
if err != nil {
@@ -993,8 +980,8 @@ func (q *Queue) playCurrentTrack() {
// onQueueExhausted is called when there are no more tracks to play.
// This is the extension point for a future fallback playlist feature.
func (q *Queue) onQueueExhausted() {
// Future: load fallback playlist here.
q.logger.Info("Queue exhausted, stopping playback")
// Future: load fallback playlist here.
}
// reindexPositions updates the Position field of all tracks to match slice index.
@@ -1060,7 +1047,7 @@ func (q *Queue) emitQueueChanged() {
return
}
state := State{
state := QueueState{
Tracks: q.tracks,
CurrentIndex: q.currentIndex,
ShuffleMode: q.shuffleMode,
@@ -1070,7 +1057,7 @@ func (q *Queue) emitQueueChanged() {
// Ensure tracks is never nil in JSON.
if state.Tracks == nil {
state.Tracks = []Track{}
state.Tracks = []QueueTrack{}
}
runtime.EventsEmit(q.ctx, events.QueueChanged, state)