theater/qrun
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Clean up timeline builder: remove trackIDs field, unused error return, redundant map copy

Browse Source
This commit is contained in:
Ian Gulliver
2026-02-20 08:00:32 -07:00
parent 0893e5b8cb
commit b15fe35a47
1 changed files with 8 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
cmd/qrunproxy/timeline.go
View File

@@ -1,6 +1,5 @@
package main package main
const ( const (
cueTrackID = "_cue" cueTrackID = "_cue"
) )
@@ -80,9 +79,8 @@ type trackCell struct {
type timelineBuilder struct { type timelineBuilder struct {
blocks map[string]Block blocks map[string]Block
trackIDs []string tracks []Track
tracks []Track trackIdx map[string]int
trackIdx map[string]int
startSigs map[string][]TriggerTarget startSigs map[string][]TriggerTarget
trackCells [][]trackCell trackCells [][]trackCell
@@ -97,11 +95,9 @@ func BuildTimeline(show Show) (Timeline, error) {
startSigs: map[string][]TriggerTarget{}, startSigs: map[string][]TriggerTarget{},
} }
b.trackIDs = append(b.trackIDs, cueTrackID)
b.tracks = append(b.tracks, Track{ID: cueTrackID, Name: "Cue"}) b.tracks = append(b.tracks, Track{ID: cueTrackID, Name: "Cue"})
b.trackIdx[cueTrackID] = 0 b.trackIdx[cueTrackID] = 0
for i, track := range show.Tracks { for i, track := range show.Tracks {
b.trackIDs = append(b.trackIDs, track.ID)
b.tracks = append(b.tracks, track) b.tracks = append(b.tracks, track)
b.trackIdx[track.ID] = i + 1 b.trackIdx[track.ID] = i + 1
} }
@@ -114,25 +110,16 @@ func BuildTimeline(show Show) (Timeline, error) {
} }
} }
b.trackCells = make([][]trackCell, len(b.trackIDs)) b.trackCells = make([][]trackCell, len(b.tracks))
if err := b.buildCells(show); err != nil { b.buildCells(show)
return Timeline{}, err
}
b.assignRows() b.assignRows()
rows := b.renderRows()
blocks := map[string]Block{}
for id, block := range b.blocks {
blocks[id] = block
}
return Timeline{ return Timeline{
Tracks: b.tracks, Tracks: b.tracks,
Blocks: blocks, Blocks: b.blocks,
Rows: rows, Rows: b.renderRows(),
}, nil }, nil
} }
@@ -171,7 +158,7 @@ type blockCells struct {
end cellID end cellID
} }
func (b *timelineBuilder) buildCells(show Show) error { func (b *timelineBuilder) buildCells(show Show) {
cells := map[string]blockCells{} cells := map[string]blockCells{}
for _, block := range show.Blocks { for _, block := range show.Blocks {
@@ -246,7 +233,6 @@ func (b *timelineBuilder) buildCells(show Show) error {
b.exclusives = append(b.exclusives, group) b.exclusives = append(b.exclusives, group)
} }
return nil
} }
func (b *timelineBuilder) expandTargets(targets []TriggerTarget) []TriggerTarget { func (b *timelineBuilder) expandTargets(targets []TriggerTarget) []TriggerTarget {
@@ -389,7 +375,7 @@ func (b *timelineBuilder) renderRows() []TimelineRow {
rows := make([]TimelineRow, maxLen) rows := make([]TimelineRow, maxLen)
for r := range rows { for r := range rows {
rows[r].Cells = make([]TimelineCell, len(b.trackIDs)) rows[r].Cells = make([]TimelineCell, len(b.tracks))
} }
for trackIdx, cells := range b.trackCells { for trackIdx, cells := range b.trackCells {