wip

Author: Julusian

meteor/__mocks__/helpers/database.ts

@@ -468,6 +468,7 @@ export async function setupMockShowStyleBlueprint(
 						rundown,
 						globalAdLibPieces: [],
 						globalActions: [],
+						globalPieces: [],
 						baseline: { timelineObjects: [] },
 					}
 				},

packages/blueprints-integration/src/api/showStyle.ts

@@ -35,6 +35,7 @@ import type {
 	IBlueprintSegment,
 	IBlueprintPiece,
 	IBlueprintPart,
+	IBlueprintRundownPiece,
 } from '../documents'
 import type { IBlueprintShowStyleVariant, IOutputLayer, ISourceLayer } from '../showStyle'
 import type { TSR, OnGenerateTimelineObj, TimelineObjectCoreExt } from '../timeline'
@@ -254,6 +255,7 @@ export interface BlueprintResultRundown {
 	rundown: IBlueprintRundown
 	globalAdLibPieces: IBlueprintAdLibPiece[]
 	globalActions: IBlueprintActionManifest[]
+	globalPieces: IBlueprintRundownPiece[]
 	baseline: BlueprintResultBaseline
 }
 export interface BlueprintResultSegment {

packages/blueprints-integration/src/documents/index.ts

@@ -7,5 +7,6 @@ export * from './pieceInstance'
 export * from './pieceGeneric'
 export * from './playlistTiming'
 export * from './rundown'
+export * from './rundownPiece'
 export * from './rundownPlaylist'
 export * from './segment'

packages/blueprints-integration/src/documents/rundownPiece.ts

@@ -5,7 +5,7 @@ import { IBlueprintPieceGeneric } from './pieceGeneric'
  * This
  */
 export interface IBlueprintRundownPiece<TPrivateData = unknown, TPublicData = unknown>
-	extends IBlueprintPieceGeneric<TPrivateData, TPublicData> {
+	extends Omit<IBlueprintPieceGeneric<TPrivateData, TPublicData>, 'lifespan'> {
 	/** When the piece should be active on the timeline. */
 	enable: {
 		start: number
@@ -15,6 +15,9 @@ export interface IBlueprintRundownPiece<TPrivateData = unknown, TPublicData = un
 		isAbsolute: true
 	}
 
+	// /** Whether and how the piece is infinite */
+	// lifespan: PieceLifespan
+
 	/** Whether the piece is a real piece, or exists as a marker to stop an infinite piece. If virtual, it does not add any contents to the timeline */
 	virtual?: boolean
 

packages/corelib/src/dataModel/Piece.ts

@@ -62,12 +62,12 @@ export interface Piece
 	 * This is the id of the segment this piece starts playing in.
 	 * It is the only segment the piece could be playing in, unless the piece has a lifespan which spans beyond the segment
 	 */
-	startSegmentId: SegmentId
+	startSegmentId: SegmentId | null
 	/**
 	 * This is the id of the part this piece starts playing in.
 	 * If the lifespan is WithinPart, it is the only part the piece could be playing in.
 	 */
-	startPartId: PartId
+	startPartId: PartId | null
 
 	/** Whether this piece is a special piece */
 	pieceType: IBlueprintPieceType

packages/job-worker/src/__mocks__/context.ts

@@ -356,6 +356,7 @@ const MockShowStyleBlueprint: () => ShowStyleBlueprintManifest = () => ({
 			rundown,
 			globalAdLibPieces: [],
 			globalActions: [],
+			globalPieces: [],
 			baseline: { timelineObjects: [] },
 		}
 	},

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

@@ -237,6 +237,9 @@ export class PartAndPieceInstanceActionService {
 		})
 		if (!pieceDB) throw new Error(`Cannot find Piece ${piece._id}`)
 
+		if (!pieceDB.startPartId || !pieceDB.startSegmentId)
+			throw new Error(`Piece ${piece._id} does not belong to a part`)
+
 		const rundown = this._playoutModel.getRundown(pieceDB.startRundownId)
 		const segment = rundown?.getSegment(pieceDB.startSegmentId)
 		const part = segment?.getPart(pieceDB.startPartId)

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

@@ -89,7 +89,7 @@ function generateExpectedMediaItemsFull(
 			...generateExpectedMediaItems<ExpectedMediaItemRundown>(
 				doc._id,
 				{
-					partId: doc.startPartId,
+					partId: doc.startPartId ?? undefined,
 					rundownId: doc.startRundownId,
 				},
 				studioId,

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

@@ -93,7 +93,7 @@ export function updateExpectedPlayoutItemsForPartModel(context: JobContext, part
 	const expectedPlayoutItems: ExpectedPlayoutItemRundown[] = []
 	for (const piece of part.pieces) {
 		expectedPlayoutItems.push(
-			...extractExpectedPlayoutItems(studioId, part.part.rundownId, piece.startPartId, piece)
+			...extractExpectedPlayoutItems(studioId, part.part.rundownId, piece.startPartId ?? undefined, piece)
 		)
 	}
 	for (const piece of part.adLibPieces) {

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

@@ -293,6 +293,7 @@ export async function regenerateRundownAndBaselineFromIngestData(
 	logger.info(`... got ${rundownRes.baseline.timelineObjects.length} objects from baseline.`)
 	logger.info(`... got ${rundownRes.globalAdLibPieces.length} adLib objects from baseline.`)
 	logger.info(`... got ${(rundownRes.globalActions || []).length} adLib actions from baseline.`)
+	logger.info(`... got ${(rundownRes.globalPieces || []).length} global pieces from baseline.`)
 
 	const timelineObjectsBlob = serializePieceTimelineObjectsBlob(
 		postProcessRundownBaselineItems(showStyle.base.blueprintId, rundownRes.baseline.timelineObjects)
@@ -310,8 +311,15 @@ export async function regenerateRundownAndBaselineFromIngestData(
 		dbRundown._id,
 		rundownRes.globalActions || []
 	)
+	const globalPieces = postProcessGlobalPieces(
+		context,
+		showStyle.base.blueprintId,
+		dbRundown._id,
+		undefined,
+		rundownRes.globalPieces || []
+	)
 
-	await ingestModel.setRundownBaseline(timelineObjectsBlob, adlibPieces, adlibActions)
+	await ingestModel.setRundownBaseline(timelineObjectsBlob, adlibPieces, adlibActions, globalPieces)
 
 	await updateExpectedPackagesForRundownBaseline(context, ingestModel, rundownRes.baseline)