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

fix: add current day when ticking over midnight

Browse Source
This commit is contained in:
Carlos Valente
2026-03-07 00:10:19 +01:00
committed by Carlos Valente
parent 27b179276d
commit a29a493678
2 changed files with 123 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
apps/server/src/stores/runtimeState.ts
+21 -10
View File
@@ -40,7 +40,11 @@ import { RundownMetadata } from '../api-data/rundown/rundown.types.js';
import { getPlayableIndexFromTimedIndex } from '../api-data/rundown/rundown.utils.js';
import * as timeCore from '../lib/time-core/timeCore.js';
type ExpectedMetadata = { event: OntimeEvent; accumulatedGap: number; isLinkedToLoaded: boolean } | null;
type ExpectedMetadata = {
event: OntimeEvent;
accumulatedGap: number;
isLinkedToLoaded: boolean;
} | null;
export type RuntimeState = {
clock: TimeOfDay;
@@ -541,15 +545,10 @@ export function update(): UpdateResult {
return updateIfIdle();
}
// if we are playing and playback changes. we tick the current runtime day
if (runtimeState._startDayOffset !== null && runtimeState._startEpoch) {
runtimeState.rundown.currentDay =
runtimeState._startDayOffset + Math.floor((epoch - runtimeState._startEpoch) / dayInMs);
}
const hasCrossedMidnight = previousClock > now;
// 2. are we waiting to roll?
if (runtimeState.timer.playback === Playback.Roll && runtimeState.timer.secondaryTimer !== null) {
const hasCrossedMidnight = previousClock > runtimeState.clock;
return updateIfWaitingToRoll(hasCrossedMidnight);
}
@@ -557,6 +556,11 @@ export function update(): UpdateResult {
// reset data
runtimeState.timer.secondaryTimer = null;
// increment day if we crossed midnight
if (hasCrossedMidnight && runtimeState.rundown.currentDay !== null) {
runtimeState.rundown.currentDay++;
}
// eslint-disable-next-line no-unused-labels -- dev code path
DEV: {
if (runtimeState.timer.duration === null) {
@@ -616,7 +620,10 @@ export function update(): UpdateResult {
}
runtimeState.timer.secondaryTimer = runtimeState._timer.secondaryTarget! - offsetClock;
return { hasTimerFinished: false, hasSecondaryTimerFinished: runtimeState.timer.secondaryTimer <= 0 };
return {
hasTimerFinished: false,
hasSecondaryTimerFinished: runtimeState.timer.secondaryTimer <= 0,
};
}
}
@@ -683,7 +690,9 @@ export function roll(
if (runtimeState.rundown.actualStart === null) {
runtimeState.rundown.actualStart = plannedStart;
runtimeState._startDayOffset = 0;
runtimeState._startDayOffset =
findDayOffset(runtimeState.eventNow.timeStart, runtimeState.clock) + runtimeState.eventNow.dayOffset;
runtimeState.rundown.currentDay = runtimeState._startDayOffset;
runtimeState._startEpoch = epoch;
}
} else {
@@ -773,7 +782,9 @@ export function roll(
}
// update metadata
runtimeState._startDayOffset = 0;
runtimeState._startDayOffset =
findDayOffset(runtimeState.eventNow.timeStart, runtimeState.clock) + runtimeState.eventNow.dayOffset;
runtimeState.rundown.currentDay = runtimeState._startDayOffset;
runtimeState._startEpoch = epoch;
return { eventId: runtimeState.eventNow.id, didStart: true };