Skip to content

fix(EAV-640): make current segment timing consider partInstances #55

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ianshade merged 1 commit into from
Jul 2, 2025
Merged

fix(EAV-640): make current segment timing consider partInstances #55

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 10 additions & 1 deletion packages/live-status-gateway/src/topics/helpers/segmentTiming.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
import { SegmentTimingInfo } from '@sofie-automation/blueprints-integration'
import { DBPart } from '@sofie-automation/corelib/dist/dataModel/Part'
import { DBPartInstance } from '@sofie-automation/corelib/dist/dataModel/PartInstance'
import { unprotectString } from '@sofie-automation/server-core-integration'
import _ = require('underscore')

export interface SegmentTiming {
budgetDurationMs?: number
Expand All @@ -19,7 +21,7 @@ export function calculateCurrentSegmentTiming(
segmentPartInstances: DBPartInstance[],
segmentParts: DBPart[]
): CurrentSegmentTiming {
const segmentTiming = calculateSegmentTiming(segmentTimingInfo, segmentParts)
const segmentTiming = calculateSegmentTiming(segmentTimingInfo, segmentPartInstances, segmentParts)
const playedDurations = segmentPartInstances.reduce((sum, partInstance) => {
return (partInstance.timings?.duration ?? 0) + sum
}, 0)
Expand All @@ -41,11 +43,18 @@ export function calculateCurrentSegmentTiming(

export function calculateSegmentTiming(
segmentTimingInfo: SegmentTimingInfo | undefined,
segmentPartInstances: DBPartInstance[],
segmentParts: DBPart[]
): SegmentTiming {
// This might be a premature optimization, at least when the number of partInstances is reasonable.
// Should we consider a separate path dependent on the length of the array?
const partInstancesByPartId: Record<string, DBPartInstance> = _.indexBy(segmentPartInstances, (partInstance) =>
unprotectString(partInstance.part._id)
)
return {
budgetDurationMs: segmentTimingInfo?.budgetDuration,
expectedDurationMs: segmentParts.reduce<number>((sum, part): number => {
part = partInstancesByPartId[unprotectString(part._id)]?.part ?? part
return part.expectedDurationWithTransition != null && !part.untimed
? sum + part.expectedDurationWithTransition
: sum
Expand Down
2 changes: 1 addition & 1 deletion packages/live-status-gateway/src/topics/segmentsTopic.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ export class SegmentsTopic extends WebSocketTopicBase implements WebSocketTopic
id: segmentId,
rundownId: unprotectString(segment.rundownId),
name: segment.name,
timing: calculateSegmentTiming(segment.segmentTiming, this._partsBySegment[segmentId] ?? []),
timing: calculateSegmentTiming(segment.segmentTiming, [], this._partsBySegment[segmentId] ?? []), // TODO: this might be inaccurate for the current/next segment, where partInstances might have some changes from adlib actions etc.
identifier: segment.identifier,
publicData: segment.publicData,
}
Expand Down
Loading