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

Add cellTypeAt helper to simplify repeated type checks in timeline solver

Browse Source
This commit is contained in:
Ian Gulliver
2026-02-21 16:56:55 -07:00
parent a504b3e34f
commit a847c17596
1 changed files with 18 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
cmd/qrunproxy/timeline.go
View File

@@ -39,6 +39,18 @@ type TimelineCell struct {
track *TimelineTrack `json:"-"`
}
func (t *TimelineTrack) cellTypeAt(index int, types ...CellType) bool {
if index < 0 || index >= len(t.Cells) {
return false
}
for _, typ := range types {
if t.Cells[index].Type == typ {
return true
}
}
return false
}
func (c *TimelineCell) String() string {
return fmt.Sprintf("%s/%s@%s:r%d", c.BlockID, c.Event, c.track.ID, c.row)
}
@@ -86,15 +98,10 @@ func (g exclusiveGroup) satisfied(tracks []*TimelineTrack) bool {
if memberTracks[t] {
continue
}
if row >= len(t.Cells) {
continue
}
c := t.Cells[row]
if c.Type != CellEvent && c.Type != CellTitle && c.Type != CellSignal {
continue
}
if t.cellTypeAt(row, CellEvent, CellTitle, CellSignal) {
return false
}
}
return true
}
@@ -302,11 +309,7 @@ func (tl *Timeline) enforceExclusives() bool {
if memberTracks[t] {
continue
}
if row >= len(t.Cells) {
continue
}
c := t.Cells[row]
if c.Type != CellEvent && c.Type != CellTitle && c.Type != CellSignal {
if !t.cellTypeAt(row, CellEvent, CellTitle, CellSignal) {
continue
}
tl.insertGap(t, row)
@@ -324,12 +327,11 @@ func (tl *Timeline) isAllRemovableGapRow(row int, except *TimelineTrack) bool {
if row >= len(t.Cells) {
continue
}
c := t.Cells[row]
if c.Type != CellGap && c.Type != CellChain && c.Type != CellContinuation {
if !t.cellTypeAt(row, CellGap, CellChain, CellContinuation) {
return false
}
hasBefore := row > 0 && (t.Cells[row-1].Type == CellEvent || t.Cells[row-1].Type == CellTitle || t.Cells[row-1].Type == CellSignal)
hasAfter := row+1 < len(t.Cells) && (t.Cells[row+1].Type == CellEvent || t.Cells[row+1].Type == CellTitle || t.Cells[row+1].Type == CellSignal)
hasBefore := t.cellTypeAt(row-1, CellEvent, CellTitle, CellSignal)
hasAfter := t.cellTypeAt(row+1, CellEvent, CellTitle, CellSignal)
if hasBefore && hasAfter {
return false
}