Skip to content

Commit 53387b8

Browse files
committed
feat: enforce a default delay removal package
1 parent 574bfe8 commit 53387b8

2 files changed

Lines changed: 13 additions & 3 deletions

File tree

apps/package-manager/packages/generic/src/configManifest.ts

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,9 @@
11
import { DeviceConfigManifest, ConfigManifestEntryType } from '@sofie-automation/server-core-integration'
22
import { LogLevel } from '@sofie-package-manager/api'
33

4+
export const DEFAULT_DELAY_REMOVAL_PACKAGE = 21600000
5+
export const DEFAULT_DELAY_REMOVAL_PACKAGE_INFO = 21600000
6+
47
export const PACKAGE_MANAGER_DEVICE_CONFIG: DeviceConfigManifest = {
58
deviceConfig: [
69
{
@@ -14,11 +17,13 @@ export const PACKAGE_MANAGER_DEVICE_CONFIG: DeviceConfigManifest = {
1417
id: 'delayRemoval',
1518
name: 'Delay removal of packages (milliseconds)',
1619
type: ConfigManifestEntryType.INT,
20+
defaultVal: DEFAULT_DELAY_REMOVAL_PACKAGE,
1721
},
1822
{
1923
id: 'delayRemovalPackageInfo',
2024
name: 'Delay removal of package scan results (milliseconds)',
2125
type: ConfigManifestEntryType.INT,
26+
defaultVal: DEFAULT_DELAY_REMOVAL_PACKAGE_INFO,
2227
},
2328
{
2429
id: 'useTemporaryFilePath',

apps/package-manager/packages/generic/src/coreHandler.ts

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,11 @@ import {
3131
setLogLevel,
3232
getLogLevel,
3333
} from '@sofie-package-manager/api'
34-
import { PACKAGE_MANAGER_DEVICE_CONFIG } from './configManifest'
34+
import {
35+
DEFAULT_DELAY_REMOVAL_PACKAGE,
36+
DEFAULT_DELAY_REMOVAL_PACKAGE_INFO,
37+
PACKAGE_MANAGER_DEVICE_CONFIG,
38+
} from './configManifest'
3539
import { PackageManagerHandler } from './packageManager'
3640

3741
export interface CoreConfig {
@@ -253,10 +257,11 @@ export class CoreHandler {
253257
}
254258

255259
if (this.deviceSettings['delayRemoval'] !== this.delayRemoval) {
256-
this.delayRemoval = this.deviceSettings['delayRemoval']
260+
this.delayRemoval = Number(this.deviceSettings['delayRemoval']) || DEFAULT_DELAY_REMOVAL_PACKAGE
257261
}
258262
if (this.deviceSettings['delayRemovalPackageInfo'] !== this.delayRemovalPackageInfo) {
259-
this.delayRemovalPackageInfo = this.deviceSettings['delayRemovalPackageInfo']
263+
this.delayRemovalPackageInfo =
264+
Number(this.deviceSettings['delayRemovalPackageInfo']) || DEFAULT_DELAY_REMOVAL_PACKAGE_INFO
260265
}
261266
if (this.deviceSettings['useTemporaryFilePath'] !== this.useTemporaryFilePath) {
262267
this.useTemporaryFilePath = this.deviceSettings['useTemporaryFilePath']

0 commit comments

Comments
 (0)