Merge branch 'release51' into release52

Author: jstarpl

.github/workflows/node.yaml

@@ -247,6 +247,8 @@ jobs:
       - name: Trivy scanning
         if: steps.check-build-and-push.outputs.enable == 'true' && steps.check-ghcr.outputs.enable == 'true' && steps.ghcr-tag.outputs.tags != 0
         uses: aquasecurity/[email protected]
+        env:
+          TRIVY_DB_REPOSITORY: public.ecr.aws/aquasecurity/trivy-db
         with:
           image-ref: "${{ steps.trivy-image.outputs.image }}"
           format: "table"
@@ -396,6 +398,8 @@ jobs:
       - name: Trivy scanning
         if: steps.check-build-and-push.outputs.enable == 'true' && steps.check-ghcr.outputs.enable == 'true' && steps.ghcr-tag.outputs.tags != 0
         uses: aquasecurity/[email protected]
+        env:
+          TRIVY_DB_REPOSITORY: public.ecr.aws/aquasecurity/trivy-db
         with:
           image-ref: "${{ steps.trivy-image.outputs.image }}"
           format: "table"

.github/workflows/prune-container-images.yml

@@ -7,6 +7,8 @@ on:
 
 jobs:
   prune-container-images:
+    if: ${{ github.repository_owner == 'nrkno' }}
+    
     uses: nrkno/sofie-github-workflows/.github/workflows/prune-container-images.yml@main
     strategy:
       max-parallel: 1

.github/workflows/prune-tags.yml

@@ -16,6 +16,8 @@ on:
 
 jobs:
   prune-tags:
+    if: ${{ github.repository_owner == 'nrkno' }}
+    
     name: Prune tags
     runs-on: ubuntu-latest
     timeout-minutes: 15

.github/workflows/trivy.yml

@@ -6,6 +6,8 @@ on:
 
 jobs:
   trivy:
+    if: ${{ github.repository_owner == 'nrkno' }}
+
     name: Trivy scan
     runs-on: ubuntu-latest
     strategy:
@@ -16,13 +18,17 @@ jobs:
     steps:
       - name: Run Trivy vulnerability scanner (json)
         uses: aquasecurity/[email protected]
+        env:
+          TRIVY_DB_REPOSITORY: public.ecr.aws/aquasecurity/trivy-db
         with:
           image-ref: ghcr.io/nrkno/sofie-core-${{ matrix.image }}:latest
           format: json
           output: '${{ matrix.image }}-trivy-scan-results.json'
 
       - name: Run Trivy vulnerability scanner (table)
         uses: aquasecurity/[email protected]
+        env:
+          TRIVY_DB_REPOSITORY: public.ecr.aws/aquasecurity/trivy-db
         with:
           image-ref: ghcr.io/nrkno/sofie-core-${{ matrix.image }}:latest
           output: '${{ matrix.image }}-trivy-scan-results.txt'
@@ -39,6 +45,8 @@ jobs:
 
       - name: Run Trivy in GitHub SBOM mode and submit results to Dependency Graph
         uses: aquasecurity/[email protected]
+        env:
+          TRIVY_DB_REPOSITORY: public.ecr.aws/aquasecurity/trivy-db
         with:
           format: 'github'
           output: 'dependency-results-${{ matrix.image }}.sbom.json'

CONTRIBUTING.md

@@ -9,4 +9,5 @@ This repository uses the following branches:
 * **_master_** is our main branch. We consider it stable and it is used in production.
 * The **_releaseXX_** branches are our in-development branches. When a release is ready, we decide to “freeze” that branch and create a new **_releaseXX+1_** branch.
 
-We encourage you to base your contributions on the latest **_releaseXX_** branch, alternatively the **_master_** branch or a recently frozen **_releaseXX_** branch. The [_Sofie Releases_](https://nrkno.github.io/sofie-core/releases) page collects the status and timeline of the releases.
+We require contributions to be based based on the latest **_release\*_** branch.
+The [_Sofie Releases_](https://nrkno.github.io/sofie-core/releases) page collects the status and timeline of the releases.

packages/blueprints-integration/CHANGELOG.md

@@ -3,6 +3,22 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [1.51.0](https://github.com/nrkno/sofie-core/compare/v1.51.0-in-testing.3...v1.51.0) (2024-10-07)
+
+**Note:** Version bump only for package @sofie-automation/blueprints-integration
+
+
+
+
+
+# [1.51.0](https://github.com/nrkno/sofie-core/compare/v1.51.0-in-testing.3...v1.51.0) (2024-10-07)
+
+**Note:** Version bump only for package @sofie-automation/blueprints-integration
+
+
+
+
+
 # [1.51.0-in-testing.3](https://github.com/nrkno/sofie-core/compare/v1.51.0-in-testing.2...v1.51.0-in-testing.3) (2024-09-25)
 
 **Note:** Version bump only for package @sofie-automation/blueprints-integration

packages/corelib/src/playout/playlist.ts

@@ -1,3 +1,4 @@
+import { DBRundown } from '../dataModel/Rundown'
 import { DBSegment } from '../dataModel/Segment'
 import { DBPart } from '../dataModel/Part'
 import { DBPartInstance } from '../dataModel/PartInstance'
@@ -105,3 +106,22 @@ export function compareMarkerPositions(a: MarkerPosition, b: MarkerPosition): nu
 	if (a.partRank < b.partRank) return 1
 	return 0
 }
+
+export function sortRundownsWithinPlaylist(
+	sortedPossibleIds: ReadonlyDeep<RundownId[]>,
+	unsortedRundowns: DBRundown[]
+): DBRundown[] {
+	return unsortedRundowns.slice().sort((a, b) => {
+		const indexA = sortedPossibleIds.indexOf(a._id)
+		const indexB = sortedPossibleIds.indexOf(b._id)
+		if (indexA === -1 && indexB === -1) {
+			return a._id.toString().localeCompare(b._id.toString())
+		} else if (indexA === -1) {
+			return 1
+		} else if (indexB === -1) {
+			return -1
+		}
+
+		return indexA - indexB
+	})
+}

packages/corelib/src/playout/timings.ts

@@ -158,8 +158,8 @@ export function getPartTimingsOrDefaults(
 }
 
 function calculateExpectedDurationWithTransition(rawDuration: number, timings: PartCalculatedTimings): number {
-	// toPartDelay needs to be subtracted, because it is added to `fromPartRemaining` when the `fromPartRemaining` value is calculated.
-	return Math.max(0, rawDuration - (timings.fromPartRemaining - timings.toPartDelay))
+	// toPartDelay and fromPartPostroll needs to be subtracted, because it is added to `fromPartRemaining` when the `fromPartRemaining` value is calculated.
+	return Math.max(0, rawDuration - (timings.fromPartRemaining - timings.toPartDelay - timings.fromPartPostroll))
 }
 
 export type CalculateExpectedDurationPart = Pick<DBPart, 'inTransition' | 'expectedDuration'>

packages/documentation/docs/for-developers/contribution-guidelines.md

@@ -7,6 +7,8 @@ sidebar_position: 2
 
 # Contribution Guidelines
 
+_Last updated september 2024_
+
 ## About the Sofie TV Studio Automation Project
 
 The Sofie project includes a number of open source applications and libraries developed and maintained by the Norwegian public service broadcaster, [NRK](https://www.nrk.no/about/). Sofie has been used to produce live shows at NRK since September 2018.
@@ -35,8 +37,8 @@ However, Sofie is a big project with many differing users and use cases. **Large
 3. (If needed) NRK establishes contact with the RFC author, who will be invited to a workshop where the RFC is discussed. Meeting notes are published publicly on the RFC thread.
 4. The contributor references the RFC when a pull request is ready.
 
-### Base contributions on the in-development branch (or the master branch)
-In order to facilitate merging, we ask that contributions are based on the latest (at the time of the pull request) _in-development_ branch (often named `release*`), alternatively the stable (eg. `master`) branch. NRK will take responsibility for rebasing stable contributions to the latest in-development branch if needed.
+### Base contributions on the in-development branch
+In order to facilitate merging, we ask that contributions are based on the latest (at the time of the pull request) _in-development_ branch (often named `release*`).
 See **CONTRIBUTING.md** in each official repository for details on which branch to use as a base for contributions.
 
 ## Developer Guidelines

packages/job-worker/src/blueprints/postProcess.ts

@@ -397,6 +397,7 @@ export function postProcessBucketAdLib(
 	blueprintId: BlueprintId,
 	bucketId: BucketId,
 	rank: number | undefined,
+	name: string | undefined,
 	importVersions: RundownImportVersions
 ): BucketAdLib {
 	const id: PieceId = protectString(
@@ -416,6 +417,7 @@ export function postProcessBucketAdLib(
 		importVersions,
 		ingestInfo,
 		_rank: rank || itemOrig._rank,
+		name: name || itemOrig.name,
 		timelineObjectsString: EmptyPieceTimelineObjectsBlob,
 	}
 	// Fill in ids of unnamed expectedPackages
@@ -446,6 +448,7 @@ export function postProcessBucketAction(
 	blueprintId: BlueprintId,
 	bucketId: BucketId,
 	rank: number | undefined,
+	label: string | undefined,
 	importVersions: RundownImportVersions
 ): BucketAdLibAction {
 	const id: AdLibActionId = protectString(
@@ -463,7 +466,7 @@ export function postProcessBucketAction(
 		bucketId,
 		importVersions,
 		ingestInfo,
-		...processAdLibActionITranslatableMessages(itemOrig, blueprintId, rank),
+		...processAdLibActionITranslatableMessages(itemOrig, blueprintId, rank, label),
 	}
 
 	// Fill in ids of unnamed expectedPackages
@@ -498,12 +501,12 @@ function processAdLibActionITranslatableMessages<
 		})[]
 	},
 	T extends IBlueprintActionManifest
->(itemOrig: T, blueprintId: BlueprintId, rank?: number): Pick<K, 'display' | 'triggerModes'> {
+>(itemOrig: T, blueprintId: BlueprintId, rank?: number, label?: string): Pick<K, 'display' | 'triggerModes'> {
 	return {
 		display: {
 			...itemOrig.display,
 			_rank: rank ?? itemOrig.display._rank,
-			label: wrapTranslatableMessageFromBlueprints(itemOrig.display.label, [blueprintId]),
+			label: (label as any) ?? wrapTranslatableMessageFromBlueprints(itemOrig.display.label, [blueprintId]),
 			triggerLabel:
 				itemOrig.display.triggerLabel &&
 				wrapTranslatableMessageFromBlueprints(itemOrig.display.triggerLabel, [blueprintId]),