cpvalente/ontime
1
0
Fork 0
mirror of https://github.com/cpvalente/ontime.git synced 2026-08-21 15:09:10 +00:00
Code Issues Packages Projects Releases 10 Wiki Activity

refactor: set start metadata when starting from roll

Browse Source
This commit is contained in:
Carlos Valente
2025-09-17 21:09:35 +02:00
committed by Carlos Valente
parent d2638d64e4
commit 4bf74d86b3
1 changed files with 13 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
apps/server/src/stores/runtimeState.ts
+13 -3
View File
@@ -508,8 +508,8 @@ export type UpdateResult = {
export function update(): UpdateResult { export function update(): UpdateResult {
// 0. there are some things we always do // 0. there are some things we always do
const previousClock = runtimeState.clock; const previousClock = runtimeState.clock;
const [epoch, fromMidnight] = getTimeObject(); const [epoch, now] = getTimeObject();
runtimeState.clock = fromMidnight; // we update the clock on every update call runtimeState.clock = now; // we update the clock on every update call
// 1. is playback idle? // 1. is playback idle?
if (!isPlaybackActive(runtimeState.timer.playback)) { if (!isPlaybackActive(runtimeState.timer.playback)) {
@@ -603,6 +603,10 @@ export function roll(
return { eventId: runtimeState.eventNow?.id ?? null, didStart: false }; return { eventId: runtimeState.eventNow?.id ?? null, didStart: false };
} }
// we will need to do some calculations, update the time first
const [epoch, now] = getTimeObject();
runtimeState.clock = now;
// 2. if there is an event armed, we use it // 2. if there is an event armed, we use it
if (runtimeState.timer.playback === Playback.Armed || runtimeState.timer.phase === TimerPhase.Pending) { if (runtimeState.timer.playback === Playback.Armed || runtimeState.timer.phase === TimerPhase.Pending) {
// eslint-disable-next-line no-unused-labels -- dev code path // eslint-disable-next-line no-unused-labels -- dev code path
@@ -634,11 +638,13 @@ export function roll(
const isNow = checkIsNow(runtimeState.eventNow.timeStart, runtimeState.eventNow.timeEnd, offsetClock); const isNow = checkIsNow(runtimeState.eventNow.timeStart, runtimeState.eventNow.timeEnd, offsetClock);
if (isNow) { if (isNow) {
runtimeState.timer.startedAt = runtimeState.clock; runtimeState.timer.startedAt = runtimeState.clock;
runtimeState.timer.secondaryTimer = null;
if (runtimeState.rundown.actualStart === null) { if (runtimeState.rundown.actualStart === null) {
runtimeState.rundown.actualStart = runtimeState.clock; runtimeState.rundown.actualStart = runtimeState.clock;
runtimeState._startDayOffset = 0;
runtimeState._startEpoch = epoch;
} }
runtimeState.timer.secondaryTimer = null;
} else { } else {
runtimeState._timer.secondaryTarget = normaliseRollStart(runtimeState.eventNow.timeStart, offsetClock); runtimeState._timer.secondaryTarget = normaliseRollStart(runtimeState.eventNow.timeStart, offsetClock);
runtimeState.timer.secondaryTimer = runtimeState._timer.secondaryTarget - offsetClock; runtimeState.timer.secondaryTimer = runtimeState._timer.secondaryTarget - offsetClock;
@@ -713,6 +719,10 @@ export function roll(
// update runtime // update runtime
runtimeState.rundown.actualStart = runtimeState.clock; runtimeState.rundown.actualStart = runtimeState.clock;
// update metadata
runtimeState._startDayOffset = 0;
runtimeState._startEpoch = epoch;
return { eventId: runtimeState.eventNow.id, didStart: true }; return { eventId: runtimeState.eventNow.id, didStart: true };
} }