Merge branch 'test/20221205' into master

nrkno · Jan 4, 2023 · 830ee7a · 830ee7a
2 parents 8e06bbf + d594338
commit 830ee7a
Show file tree

Hide file tree

Showing 23 changed files with 161 additions and 61 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -3,6 +3,19 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [1.39.4-alpha.0](https://github.com/nrkno/tv-automation-package-manager/compare/v1.39.3...v1.39.4-alpha.0) (2022-12-05)
+
+
+### Bug Fixes
+
+* blackDetectRegex expects  black_duration to be a number with a decimal point ([eb4aaa3](https://github.com/nrkno/tv-automation-package-manager/commit/eb4aaa36ae0a93697f38d263a6f526f82ca2077d))
+* blackDetectRegex expects black_duration to be a number with a decimal point ([#19](https://github.com/nrkno/tv-automation-package-manager/issues/19)) ([bb23fba](https://github.com/nrkno/tv-automation-package-manager/commit/bb23fba5dd9ffb97ee8791bd3342bbf0e482aa73))
+* support for multiple smartbulls ([bc9db81](https://github.com/nrkno/tv-automation-package-manager/commit/bc9db819a3436774686a19d212c1fe77f89ae3bf))
+
+
+
+
+
 ## [1.39.3](https://github.com/nrkno/tv-automation-package-manager/compare/v1.39.2...v1.39.3) (2022-11-30)
 
 

diff --git a/apps/appcontainer-node/app/CHANGELOG.md b/apps/appcontainer-node/app/CHANGELOG.md
@@ -3,6 +3,14 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [1.39.4-alpha.0](https://github.com/nrkno/tv-automation-package-manager/compare/v1.39.3...v1.39.4-alpha.0) (2022-12-05)
+
+**Note:** Version bump only for package @appcontainer-node/app
+
+
+
+
+
 ## [1.39.3](https://github.com/nrkno/tv-automation-package-manager/compare/v1.39.2...v1.39.3) (2022-11-30)
 
 **Note:** Version bump only for package @appcontainer-node/app

diff --git a/apps/appcontainer-node/app/package.json b/apps/appcontainer-node/app/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@appcontainer-node/app",
-    "version": "1.39.3",
+    "version": "1.39.4-alpha.0",
     "description": "AppContainer-Node.js",
     "private": true,
     "scripts": {
@@ -16,7 +16,7 @@
         "nexe": "^3.3.7"
     },
     "dependencies": {
-        "@appcontainer-node/generic": "1.39.3"
+        "@appcontainer-node/generic": "1.39.4-alpha.0"
     },
     "peerDependencies": {
         "@sofie-automation/blueprints-integration": "*"

diff --git a/apps/appcontainer-node/packages/generic/CHANGELOG.md b/apps/appcontainer-node/packages/generic/CHANGELOG.md
@@ -3,6 +3,14 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [1.39.4-alpha.0](https://github.com/nrkno/tv-automation-package-manager/compare/v1.39.3...v1.39.4-alpha.0) (2022-12-05)
+
+**Note:** Version bump only for package @appcontainer-node/generic
+
+
+
+
+
 ## [1.39.3](https://github.com/nrkno/tv-automation-package-manager/compare/v1.39.2...v1.39.3) (2022-11-30)
 
 **Note:** Version bump only for package @appcontainer-node/generic

diff --git a/apps/appcontainer-node/packages/generic/package.json b/apps/appcontainer-node/packages/generic/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@appcontainer-node/generic",
-    "version": "1.39.3",
+    "version": "1.39.4-alpha.0",
     "private": true,
     "main": "dist/index.js",
     "types": "dist/index.d.ts",
@@ -15,7 +15,7 @@
     },
     "dependencies": {
         "@sofie-package-manager/api": "1.39.2",
-        "@sofie-package-manager/worker": "1.39.3",
+        "@sofie-package-manager/worker": "1.39.4-alpha.0",
         "underscore": "^1.12.0"
     },
     "devDependencies": {

diff --git a/apps/package-manager/app/CHANGELOG.md b/apps/package-manager/app/CHANGELOG.md
@@ -3,6 +3,14 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [1.39.4-alpha.0](https://github.com/nrkno/tv-automation-package-manager/compare/v1.39.3...v1.39.4-alpha.0) (2022-12-05)
+
+**Note:** Version bump only for package @package-manager/app
+
+
+
+
+
 ## [1.39.3](https://github.com/nrkno/tv-automation-package-manager/compare/v1.39.2...v1.39.3) (2022-11-30)
 
 **Note:** Version bump only for package @package-manager/app

diff --git a/apps/package-manager/app/package.json b/apps/package-manager/app/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@package-manager/app",
-    "version": "1.39.3",
+    "version": "1.39.4-alpha.0",
     "private": true,
     "scripts": {
         "build": "rimraf dist && yarn build:main",
@@ -15,7 +15,7 @@
         "nexe": "^3.3.7"
     },
     "dependencies": {
-        "@package-manager/generic": "1.39.3"
+        "@package-manager/generic": "1.39.4-alpha.0"
     },
     "peerDependencies": {
         "@sofie-automation/blueprints-integration": "*"

diff --git a/apps/package-manager/packages/generic/CHANGELOG.md b/apps/package-manager/packages/generic/CHANGELOG.md
@@ -3,6 +3,17 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [1.39.4-alpha.0](https://github.com/nrkno/tv-automation-package-manager/compare/v1.39.3...v1.39.4-alpha.0) (2022-12-05)
+
+
+### Bug Fixes
+
+* support for multiple smartbulls ([bc9db81](https://github.com/nrkno/tv-automation-package-manager/commit/bc9db819a3436774686a19d212c1fe77f89ae3bf))
+
+
+
+
+
 ## [1.39.3](https://github.com/nrkno/tv-automation-package-manager/compare/v1.39.2...v1.39.3) (2022-11-30)
 
 **Note:** Version bump only for package @package-manager/generic

diff --git a/apps/package-manager/packages/generic/package.json b/apps/package-manager/packages/generic/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@package-manager/generic",
-    "version": "1.39.3",
+    "version": "1.39.4-alpha.0",
     "private": true,
     "main": "dist/index.js",
     "types": "dist/index.d.ts",
@@ -16,8 +16,8 @@
     },
     "dependencies": {
         "@sofie-package-manager/api": "1.39.2",
-        "@sofie-package-manager/expectation-manager": "1.39.3",
-        "@sofie-package-manager/worker": "1.39.3",
+        "@sofie-package-manager/expectation-manager": "1.39.4-alpha.0",
+        "@sofie-package-manager/worker": "1.39.4-alpha.0",
         "chokidar": "^3.5.1",
         "deep-extend": "^0.6.0",
         "fast-clone": "^1.5.13",

diff --git a/apps/package-manager/packages/generic/src/generateExpectations/nrk/smartbull.ts b/apps/package-manager/packages/generic/src/generateExpectations/nrk/smartbull.ts
@@ -32,61 +32,62 @@ export function getSmartbullExpectedPackages(
 	logger: LoggerInstance,
 	expectedPackages: ExpectedPackageWrap[]
 ): ExpectedPackageWrapMediaFile[] {
-	let orgSmartbullExpectedPackage: ExpectedPackageWrap | undefined = undefined
+	const orgSmartbullExpectedPackages: ExpectedPackageWrap[] = []
 
 	// Find the smartbull package:
 	for (const packageWrap of expectedPackages) {
 		if (expectedPackageIsSmartbull(packageWrap)) {
 			// hack
-			orgSmartbullExpectedPackage = packageWrap
+			orgSmartbullExpectedPackages.push(packageWrap)
 		}
 	}
 
 	// Find smartbull source packages:
-	const smartbullExpectations: ExpectedPackageWrap[] = []
+	const smartbullExpectations: ExpectedPackageWrapMediaFile[] = []
 	for (const packageWrap of expectedPackages) {
 		if (expectedPackageIsSmartbullSource(packageWrap)) {
 			// Set the smartbull priority:
 			packageWrap.priority = PriorityMagnitude.PLAY_SOON
-			smartbullExpectations.push(packageWrap)
+			smartbullExpectations.push(packageWrap as ExpectedPackageWrapMediaFile)
 		}
 	}
 
-	// Handle Smartbull:
-	const smartbulls: ExpectedPackageWrapMediaFile[] = []
-	if (orgSmartbullExpectedPackage && smartbullExpectations.length > 0) {
-		// Sort alphabetically on filePath:
-		smartbullExpectations.sort((a, b) => {
-			const expA = a.expectedPackage as ExpectedPackage.ExpectedPackageMediaFile
-			const expB = b.expectedPackage as ExpectedPackage.ExpectedPackageMediaFile
+	// Sort smartbulls alphabetically on filePath:
+	smartbullExpectations.sort((a, b) => {
+		// Lowest first:
+		if (a.expectedPackage.content.filePath > b.expectedPackage.content.filePath) return 1
+		if (a.expectedPackage.content.filePath < b.expectedPackage.content.filePath) return -1
 
-			// lowest first:
-			if (expA.content.filePath > expB.content.filePath) return 1
-			if (expA.content.filePath < expB.content.filePath) return -1
+		// Lowest first: (lower is better)
+		if (a.priority > b.priority) return 1
+		if (a.priority < b.priority) return -1
 
-			return 0
-		})
-		// Pick the last one:
-		const bestSmartbull = smartbullExpectations[smartbullExpectations.length - 1] as
-			| ExpectedPackageWrapMediaFile
-			| undefined
-		if (bestSmartbull) {
-			if (orgSmartbullExpectedPackage.expectedPackage.type === ExpectedPackage.PackageType.MEDIA_FILE) {
-				const org = orgSmartbullExpectedPackage as ExpectedPackageWrapMediaFile
+		return 0
+	})
+	// Pick the last one:
+	const bestSmartbull =
+		smartbullExpectations.length > 0 ? smartbullExpectations[smartbullExpectations.length - 1] : undefined
 
-				const newPackage: ExpectedPackageWrapMediaFile = {
-					...org,
-					expectedPackage: {
-						...org.expectedPackage,
-						// Take these from bestSmartbull:
-						content: bestSmartbull.expectedPackage.content,
-						version: {}, // Don't even use bestSmartbull.expectedPackage.version,
-						sources: bestSmartbull.expectedPackage.sources,
-					},
-				}
-				smartbulls.push(newPackage)
-			} else logger.warn('orgSmartbullExpectation is not a MEDIA_FILE')
-		}
+	if (!bestSmartbull) return []
+
+	// Handle Smartbull:
+	const smartbulls: ExpectedPackageWrapMediaFile[] = []
+	for (const orgSmartbullExpectedPackage of orgSmartbullExpectedPackages) {
+		if (orgSmartbullExpectedPackage.expectedPackage.type === ExpectedPackage.PackageType.MEDIA_FILE) {
+			const org = orgSmartbullExpectedPackage as ExpectedPackageWrapMediaFile
+
+			const newPackage: ExpectedPackageWrapMediaFile = {
+				...org,
+				expectedPackage: {
+					...org.expectedPackage,
+					// Take these from bestSmartbull:
+					content: bestSmartbull.expectedPackage.content,
+					version: {}, // Don't even use bestSmartbull.expectedPackage.version,
+					sources: bestSmartbull.expectedPackage.sources,
+				},
+			}
+			smartbulls.push(newPackage)
+		} else logger.warn('orgSmartbullExpectation is not a MEDIA_FILE')
 	}
 	return smartbulls
 }
diff --git a/apps/single-app/app/CHANGELOG.md b/apps/single-app/app/CHANGELOG.md
@@ -3,6 +3,14 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [1.39.4-alpha.0](https://github.com/nrkno/tv-automation-package-manager/compare/v1.39.3...v1.39.4-alpha.0) (2022-12-05)
+
+**Note:** Version bump only for package @single-app/app
+
+
+
+
+
 ## [1.39.3](https://github.com/nrkno/tv-automation-package-manager/compare/v1.39.2...v1.39.3) (2022-11-30)
 
 **Note:** Version bump only for package @single-app/app

diff --git a/apps/single-app/app/package.json b/apps/single-app/app/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@single-app/app",
-    "version": "1.39.3",
+    "version": "1.39.4-alpha.0",
     "description": "Package Manager, http-proxy etc.. all in one application",
     "private": true,
     "scripts": {
@@ -16,12 +16,12 @@
         "nexe": "^3.3.7"
     },
     "dependencies": {
-        "@appcontainer-node/generic": "1.39.3",
+        "@appcontainer-node/generic": "1.39.4-alpha.0",
         "@http-server/generic": "1.39.2",
-        "@package-manager/generic": "1.39.3",
+        "@package-manager/generic": "1.39.4-alpha.0",
         "@quantel-http-transformer-proxy/generic": "1.39.2",
         "@sofie-package-manager/api": "1.39.2",
-        "@sofie-package-manager/worker": "1.39.3",
+        "@sofie-package-manager/worker": "1.39.4-alpha.0",
         "@sofie-package-manager/workforce": "1.39.2",
         "underscore": "^1.12.0"
     },

diff --git a/apps/worker/app/CHANGELOG.md b/apps/worker/app/CHANGELOG.md
@@ -3,6 +3,14 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [1.39.4-alpha.0](https://github.com/nrkno/tv-automation-package-manager/compare/v1.39.3...v1.39.4-alpha.0) (2022-12-05)
+
+**Note:** Version bump only for package @worker/app
+
+
+
+
+
 ## [1.39.3](https://github.com/nrkno/tv-automation-package-manager/compare/v1.39.2...v1.39.3) (2022-11-30)
 
 **Note:** Version bump only for package @worker/app

diff --git a/apps/worker/app/package.json b/apps/worker/app/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@worker/app",
-    "version": "1.39.3",
+    "version": "1.39.4-alpha.0",
     "description": "Boilerplace",
     "private": true,
     "scripts": {
@@ -17,7 +17,7 @@
         "nexe": "^3.3.7"
     },
     "dependencies": {
-        "@worker/generic": "1.39.3"
+        "@worker/generic": "1.39.4-alpha.0"
     },
     "peerDependencies": {
         "@sofie-automation/blueprints-integration": "*"

diff --git a/apps/worker/packages/generic/CHANGELOG.md b/apps/worker/packages/generic/CHANGELOG.md
@@ -3,6 +3,14 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [1.39.4-alpha.0](https://github.com/nrkno/tv-automation-package-manager/compare/v1.39.3...v1.39.4-alpha.0) (2022-12-05)
+
+**Note:** Version bump only for package @worker/generic
+
+
+
+
+
 ## [1.39.3](https://github.com/nrkno/tv-automation-package-manager/compare/v1.39.2...v1.39.3) (2022-11-30)
 
 **Note:** Version bump only for package @worker/generic

diff --git a/apps/worker/packages/generic/package.json b/apps/worker/packages/generic/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@worker/generic",
-    "version": "1.39.3",
+    "version": "1.39.4-alpha.0",
     "private": true,
     "main": "dist/index.js",
     "types": "dist/index.d.ts",
@@ -15,7 +15,7 @@
     },
     "dependencies": {
         "@sofie-package-manager/api": "1.39.2",
-        "@sofie-package-manager/worker": "1.39.3"
+        "@sofie-package-manager/worker": "1.39.4-alpha.0"
     },
     "devDependencies": {
         "lint-staged": "^7.2.0"

diff --git a/lerna.json b/lerna.json
@@ -4,7 +4,7 @@
         "apps/**",
         "tests/**"
     ],
-    "version": "1.39.3",
+    "version": "1.39.4-alpha.0",
     "npmClient": "yarn",
     "useWorkspaces": true
 }
diff --git a/shared/packages/expectationManager/CHANGELOG.md b/shared/packages/expectationManager/CHANGELOG.md
@@ -3,6 +3,14 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [1.39.4-alpha.0](https://github.com/nrkno/tv-automation-package-manager/compare/v1.39.3...v1.39.4-alpha.0) (2022-12-05)
+
+**Note:** Version bump only for package @sofie-package-manager/expectation-manager
+
+
+
+
+
 ## [1.39.3](https://github.com/nrkno/tv-automation-package-manager/compare/v1.39.2...v1.39.3) (2022-11-30)
 
 **Note:** Version bump only for package @sofie-package-manager/expectation-manager

diff --git a/shared/packages/expectationManager/package.json b/shared/packages/expectationManager/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@sofie-package-manager/expectation-manager",
-    "version": "1.39.3",
+    "version": "1.39.4-alpha.0",
     "main": "dist/index.js",
     "types": "dist/index.d.ts",
     "license": "MIT",
@@ -18,7 +18,7 @@
     },
     "dependencies": {
         "@sofie-package-manager/api": "1.39.2",
-        "@sofie-package-manager/worker": "1.39.3",
+        "@sofie-package-manager/worker": "1.39.4-alpha.0",
         "@supercharge/promise-pool": "^1.7.0",
         "underscore": "^1.12.0"
     },