wip

Author: Julusian

packages/corelib/src/dataModel/PieceInstance.ts

@@ -51,8 +51,6 @@ export interface PieceInstance {
 
 	piece: PieceInstancePiece
 
-	// owner: 'part' | 'rundown'
-
 	/** A flag to signal a given Piece has been deactivated manually */
 	disabled?: boolean
 

packages/job-worker/src/blueprints/context/services/PartAndPieceInstanceActionService.ts

@@ -528,6 +528,7 @@ export async function applyActionSideEffects(
 		await syncPlayheadInfinitesForNextPartInstance(
 			context,
 			playoutModel,
+			undefined,
 			playoutModel.currentPartInstance,
 			playoutModel.nextPartInstance
 		)

packages/job-worker/src/ingest/syncChangesToPartInstance.ts

@@ -48,7 +48,7 @@ type SyncedInstance = {
  * This defers out to the Blueprints to do the syncing
  * @param context Context of the job ebeing run
  * @param playoutModel Playout model containing containing the Rundown being ingested
- * @param ingestModel Ingest model for the Rundown
+ * @param ingestModel Ingest model for the Rundown. This is being written to mongodb while this method runs
  */
 export async function syncChangesToPartInstances(
 	context: JobContext,
@@ -243,6 +243,7 @@ export async function syncChangesToPartInstances(
 					await syncPlayheadInfinitesForNextPartInstance(
 						context,
 						playoutModel,
+						ingestModel,
 						playoutModel.currentPartInstance,
 						playoutModel.nextPartInstance
 					)

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

@@ -194,6 +194,7 @@ async function pieceTakeNowAsAdlib(
 	await syncPlayheadInfinitesForNextPartInstance(
 		context,
 		playoutModel,
+		undefined,
 		playoutModel.currentPartInstance,
 		playoutModel.nextPartInstance
 	)
@@ -373,6 +374,7 @@ export async function handleStopPiecesOnSourceLayers(
 				await syncPlayheadInfinitesForNextPartInstance(
 					context,
 					playoutModel,
+					undefined,
 					playoutModel.currentPartInstance,
 					playoutModel.nextPartInstance
 				)

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

@@ -69,6 +69,7 @@ export async function innerStartOrQueueAdLibPiece(
 		await syncPlayheadInfinitesForNextPartInstance(
 			context,
 			playoutModel,
+			undefined,
 			currentPartInstance,
 			playoutModel.nextPartInstance
 		)

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

@@ -25,6 +25,7 @@ export async function handleDebugSyncPlayheadInfinitesForNextPartInstance(
 		await syncPlayheadInfinitesForNextPartInstance(
 			context,
 			playoutModel,
+			undefined,
 			playoutModel.currentPartInstance,
 			playoutModel.nextPartInstance
 		)

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

@@ -220,6 +220,7 @@ export async function fetchPiecesThatMayBeActiveForPart(
 export async function syncPlayheadInfinitesForNextPartInstance(
 	context: JobContext,
 	playoutModel: PlayoutModel,
+	unsavedIngestModel: Pick<IngestModelReadonly, 'rundownId' | 'getAllPieces'> | undefined,
 	fromPartInstance: PlayoutPartInstanceModel | null,
 	toPartInstance: PlayoutPartInstanceModel | null
 ): Promise<void> {
@@ -293,6 +294,7 @@ export async function syncPlayheadInfinitesForNextPartInstance(
 		const baselineInfinites = await getBaselineInfinitesForPart(
 			context,
 			playoutModel,
+			unsavedIngestModel,
 			toPartInstance.partInstance.part,
 			toPartInstance.partInstance._id
 		)
@@ -403,17 +405,18 @@ export function getPieceInstancesForPart(
 export async function getBaselineInfinitesForPart(
 	context: JobContext,
 	playoutModel: PlayoutModel,
-	// unsavedIngestModel: Pick<IngestModelReadonly, 'rundownId' | 'getAllPieces'> | undefined,
+	unsavedIngestModel: Pick<IngestModelReadonly, 'rundownId' | 'getAllPieces'> | undefined,
 	part: ReadonlyDeep<DBPart>,
 	partInstanceId: PartInstanceId
 ): Promise<PieceInstance[]> {
-	// nocommit - will this ever need to consider an unsaved ingest model?
-
-	// Find the pieces
-	const pieces = await context.directCollections.Pieces.findFetch({
-		startRundownId: part.rundownId,
-		startPartId: null,
-	})
+	// Find the pieces. If an ingest model is provided, use that instead of the database
+	const pieces =
+		unsavedIngestModel && unsavedIngestModel.rundownId === part.rundownId
+			? unsavedIngestModel.getAllPieces().filter((p) => p.startPartId === null)
+			: await context.directCollections.Pieces.findFetch({
+					startRundownId: part.rundownId,
+					startPartId: null,
+			  })
 
 	const playlistActivationId = playoutModel.playlist.activationId
 	if (!playlistActivationId) throw new Error(`RundownPlaylist "${playoutModel.playlistId}" is not active`)

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

@@ -275,7 +275,13 @@ async function prepareExistingPartInstanceForBeingNexted(
 	playoutModel: PlayoutModel,
 	instance: PlayoutPartInstanceModel
 ): Promise<PlayoutPartInstanceModel> {
-	await syncPlayheadInfinitesForNextPartInstance(context, playoutModel, playoutModel.currentPartInstance, instance)
+	await syncPlayheadInfinitesForNextPartInstance(
+		context,
+		playoutModel,
+		undefined, // Any ingest model must have been fully written before we get here
+		playoutModel.currentPartInstance,
+		instance
+	)
 
 	return instance
 }
@@ -304,7 +310,13 @@ async function preparePartInstanceForPartBeingNexted(
 
 	if (currentPartInstance === null) {
 		// This is the first take of the rundown, ensure the baseline infinites are loaded
-		const baselineInfinites = await getBaselineInfinitesForPart(context, playoutModel, nextPart, partInstanceId)
+		const baselineInfinites = await getBaselineInfinitesForPart(
+			context,
+			playoutModel,
+			undefined, // Any ingest model must have been fully written before we get here
+			nextPart,
+			partInstanceId
+		)
 		newPieceInstances.push(...baselineInfinites)
 	}
 

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

@@ -364,18 +364,7 @@ function calculateInfinitePieceEnable(
 		infiniteGroupEnable = { start: infiniteGroupStart }
 		pieceEnable.start = 0
 
-		// nocommit prerollDuration?
-
-		// // If an end time has been set by a hotkey, then update the duration to be correct
-		// if (pieceInstance.userDuration && pieceInstance.piece.enable.start !== 'now') {
-		// 	if ('endRelativeToNow' in pieceInstance.userDuration) {
-		// 		infiniteGroupEnable.duration =
-		// 			pieceInstance.userDuration.endRelativeToNow - pieceInstance.piece.enable.start
-		// 	} else {
-		// 		// This should never be hit
-		// 		infiniteGroupEnable.end = 'now'
-		// 	}
-		// }
+		// Future: should this consider the prerollDuration?
 	} else if (pieceInstance.plannedStartedPlayback !== undefined) {
 		// We have a absolute start time, so we should use that.
 		let infiniteGroupStart = pieceInstance.plannedStartedPlayback