Merge pull request #1315 from nrkno/fix/negative-resolvedDuration

Author: jstarpl

packages/job-worker/src/playout/resolvedPieces.ts

@@ -46,8 +46,11 @@ export function getResolvedPiecesForPartInstancesOnTimeline(
 	if (!partInstancesInfo.current) return []
 
 	const currentPartStarted = partInstancesInfo.current.partStarted ?? now
+
 	const nextPartStarted =
-		partInstancesInfo.current.partInstance.part.expectedDuration !== undefined
+		partInstancesInfo.current.partInstance.part.expectedDuration !== undefined &&
+		partInstancesInfo.current.partInstance.part.expectedDuration !== 0 &&
+		partInstancesInfo.current.partInstance.part.autoNext
 			? currentPartStarted + partInstancesInfo.current.partInstance.part.expectedDuration
 			: null
 

packages/job-worker/src/playout/timeline/generate.ts

@@ -1,4 +1,4 @@
-import { BlueprintId } from '@sofie-automation/corelib/dist/dataModel/Ids'
+import { BlueprintId, TimelineHash } from '@sofie-automation/corelib/dist/dataModel/Ids'
 import { JobContext } from '../../jobs'
 import { ReadonlyDeep } from 'type-fest'
 import {
@@ -131,13 +131,13 @@ export async function updateStudioTimeline(
 		logAnyRemainingNowTimes(context, baselineObjects)
 	}
 
-	saveTimeline(context, playoutModel, baselineObjects, versions)
+	const timelineHash = saveTimeline(context, playoutModel, baselineObjects, versions)
 
 	if (studioBaseline) {
 		updateBaselineExpectedPackagesOnStudio(context, playoutModel, studioBaseline)
 	}
 
-	logger.debug('updateStudioTimeline done!')
+	logger.verbose(`updateStudioTimeline done, hash: "${timelineHash}"`)
 	if (span) span.end()
 }
 
@@ -161,9 +161,8 @@ export async function updateTimeline(context: JobContext, playoutModel: PlayoutM
 		logAnyRemainingNowTimes(context, timelineObjs)
 	}
 
-	saveTimeline(context, playoutModel, timelineObjs, versions)
-
-	logger.debug('updateTimeline done!')
+	const timelineHash = saveTimeline(context, playoutModel, timelineObjs, versions)
+	logger.verbose(`updateTimeline done, hash: "${timelineHash}"`)
 
 	if (span) span.end()
 }
@@ -235,11 +234,13 @@ export function saveTimeline(
 	studioPlayoutModel: StudioPlayoutModelBase,
 	timelineObjs: TimelineObjGeneric[],
 	generationVersions: TimelineCompleteGenerationVersions
-): void {
+): TimelineHash {
 	const newTimeline = studioPlayoutModel.setTimeline(timelineObjs, generationVersions)
 
 	// Also do a fast-track for the timeline to be published faster:
 	context.hackPublishTimelineToFastTrack(newTimeline)
+
+	return newTimeline.timelineHash
 }
 
 export interface SelectedPartInstancesTimelineInfo {

packages/job-worker/src/playout/timings/partPlayback.ts

@@ -29,7 +29,7 @@ export async function onPartPlaybackStarted(
 	const playingPartInstance = playoutModel.getPartInstance(data.partInstanceId)
 	if (!playingPartInstance)
 		throw new Error(
-			`PartInstance "${data.partInstanceId}" in RundownPlayst "${playoutModel.playlistId}" not found!`
+			`PartInstance "${data.partInstanceId}" in RundownPlaylist "${playoutModel.playlistId}" not found!`
 		)
 
 	// make sure we don't run multiple times, even if TSR calls us multiple times
@@ -176,26 +176,26 @@ export function reportPartInstanceHasStarted(
 	partInstance: PlayoutPartInstanceModel,
 	timestamp: Time
 ): void {
-	if (partInstance) {
-		const timestampUpdated = partInstance.setReportedStartedPlayback(timestamp)
-		if (timestamp && !playoutModel.isMultiGatewayMode) {
+	const timestampUpdated = partInstance.setReportedStartedPlayback(timestamp)
+
+	if (!playoutModel.isMultiGatewayMode) {
+		if (timestamp) {
 			partInstance.setPlannedStartedPlayback(timestamp)
 		}
-
 		const previousPartInstance = playoutModel.previousPartInstance
-		if (timestampUpdated && !playoutModel.isMultiGatewayMode && previousPartInstance) {
+		if (timestampUpdated && previousPartInstance) {
 			// Ensure the plannedStoppedPlayback is set for the previous partinstance too
 			previousPartInstance.setPlannedStoppedPlayback(timestamp)
 		}
+	}
 
-		// Update the playlist:
-		if (!partInstance.partInstance.part.untimed) {
-			playoutModel.setRundownStartedPlayback(partInstance.partInstance.rundownId, timestamp)
-		}
+	// Update the playlist:
+	if (!partInstance.partInstance.part.untimed) {
+		playoutModel.setRundownStartedPlayback(partInstance.partInstance.rundownId, timestamp)
+	}
 
-		if (timestampUpdated) {
-			playoutModel.queuePartInstanceTimingEvent(partInstance.partInstance._id)
-		}
+	if (timestampUpdated) {
+		playoutModel.queuePartInstanceTimingEvent(partInstance.partInstance._id)
 	}
 }
 

packages/job-worker/src/playout/timings/timelineTriggerTime.ts

@@ -181,7 +181,9 @@ function timelineTriggerTimeInner(
 			}
 		}
 		if (tlChanged) {
-			saveTimeline(context, studioPlayoutModel, timelineObjs, timeline.generationVersions)
+			const timelineHash = saveTimeline(context, studioPlayoutModel, timelineObjs, timeline.generationVersions)
+
+			logger.verbose(`timelineTriggerTime: Updated Timeline, hash: "${timelineHash}"`)
 		}
 	}