wip

Author: Julusian

packages/job-worker/src/blueprints/context/SyncIngestUpdateToPartInstanceContext.ts

@@ -40,6 +40,10 @@ export class SyncIngestUpdateToPartInstanceContext
 
 	private partInstance: PlayoutPartInstanceModel | null
 
+	public get hasRemovedPartInstance(): boolean {
+		return !this.partInstance
+	}
+
 	constructor(
 		private readonly _context: JobContext,
 		contextInfo: ContextInfo,

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

@@ -33,6 +33,8 @@ import { convertIngestModelToPlayoutRundownWithSegments } from './commit'
 import { convertNoteToNotification } from '../notifications/util'
 import { PlayoutRundownModel } from '../playout/model/PlayoutRundownModel'
 import { PieceInstance } from '@sofie-automation/corelib/dist/dataModel/PieceInstance'
+import { setNextPart, setNextPartFromPart } from '../playout/setNext'
+import { ensureNextPartIsValid } from './updateNext'
 
 type PlayStatus = 'previous' | 'current' | 'next'
 type SyncedInstance = {
@@ -217,6 +219,30 @@ export async function syncChangesToPartInstances(
 					existingPartInstance.snapshotRestore(partInstanceSnapshot)
 				}
 
+				if (playStatus === 'next' && syncContext.hasRemovedPartInstance) {
+					// PartInstance was removed, so we need to remove it and re-select the next part
+
+					if (playoutModel.playlist.nextPartInfo?.manuallySelected && newPart) {
+						await setNextPart(
+							context,
+							playoutModel,
+							{
+								part: newPart,
+								consumesQueuedSegmentId: playoutModel.playlist.nextPartInfo.consumesQueuedSegmentId,
+							},
+							true,
+							playoutModel.playlist.nextTimeOffset || 0
+						)
+					} else {
+						// Clear the next part
+						await setNextPart(context, playoutModel, null, false, 0)
+						await ensureNextPartIsValid(context, playoutModel)
+					}
+
+					// We don't need to continue syncing this partInstance, as it's been replaced
+					continue
+				}
+
 				if (playStatus === 'next') {
 					existingPartInstance.recalculateExpectedDurationWithTransition()
 				}