From 932bb8102c25785121447cbbc08a26f7d4076603 Mon Sep 17 00:00:00 2001 From: arc-alex Date: Thu, 13 Mar 2025 12:08:24 +0100 Subject: [PATCH] don't persist offset mode --- apps/server/src/api-data/db/db.controller.ts | 2 +- apps/server/src/app.ts | 3 --- .../src/classes/data-provider/DataProvider.ts | 14 ------------- .../__tests__/DataProvider.utils.test.ts | 3 +-- apps/server/src/models/dataModel.ts | 3 +-- apps/server/src/models/demoProject.ts | 3 +-- .../runtime-service/RuntimeService.ts | 4 ---- apps/server/src/utils/parser.ts | 10 +-------- apps/server/src/utils/parserFunctions.ts | 21 ------------------- .../types/src/definitions/DataModel.type.ts | 2 -- .../src/definitions/runtime/Runtime.type.ts | 2 +- 11 files changed, 6 insertions(+), 61 deletions(-) diff --git a/apps/server/src/api-data/db/db.controller.ts b/apps/server/src/api-data/db/db.controller.ts index 8b505ce06..8ed9fc02b 100644 --- a/apps/server/src/api-data/db/db.controller.ts +++ b/apps/server/src/api-data/db/db.controller.ts @@ -19,7 +19,7 @@ import * as projectService from '../../services/project-service/ProjectService.j export async function patchPartialProjectFile(req: Request, res: Response) { try { const { rundown, project, settings, viewSettings, urlPresets, customFields, automation } = req.body; - const patchDb: Partial = { + const patchDb: DatabaseModel = { rundown, project, settings, diff --git a/apps/server/src/app.ts b/apps/server/src/app.ts index 83e631964..5dda9aa1e 100644 --- a/apps/server/src/app.ts +++ b/apps/server/src/app.ts @@ -170,8 +170,6 @@ export const startServer = async ( socket.init(expressServer, showWelcome, prefix); - const offsetMode = getDataProvider().getOffsetMode(); - /** * Module initialises the services and provides initial payload for the store */ @@ -212,7 +210,6 @@ export const startServer = async ( // TODO: pass event store to rundownservice runtimeService.init(maybeRestorePoint); - runtimeService.setOffsetMode(offsetMode); const nif = getNetworkInterfaces(); consoleSuccess(`Local: http://localhost:${resultPort}${prefix}/editor`); diff --git a/apps/server/src/classes/data-provider/DataProvider.ts b/apps/server/src/classes/data-provider/DataProvider.ts index 09711681e..d9a79ecdc 100644 --- a/apps/server/src/classes/data-provider/DataProvider.ts +++ b/apps/server/src/classes/data-provider/DataProvider.ts @@ -7,7 +7,6 @@ import { CustomFields, URLPreset, AutomationSettings, - OffsetMode, } from 'ontime-types'; import type { Low } from 'lowdb'; @@ -56,8 +55,6 @@ export function getDataProvider() { setAutomation, getRundown, mergeIntoData, - getOffsetMode, - setOffsetMode, }; } @@ -135,17 +132,6 @@ function getRundown(): Readonly { return db.data.rundown; } -function getOffsetMode(): Readonly { - return db.data.offsetMode; -} - -async function setOffsetMode(mode): ReadonlyPromise { - db.data.offsetMode = mode; - //TODO: should this maybe not be persisted every time - await persist(); - return db.data.offsetMode; -} - async function mergeIntoData(newData: Partial): ReadonlyPromise { const mergedData = safeMerge(db.data, newData); db.data.project = mergedData.project; diff --git a/apps/server/src/classes/data-provider/__tests__/DataProvider.utils.test.ts b/apps/server/src/classes/data-provider/__tests__/DataProvider.utils.test.ts index 7c4a636dc..28314cf30 100644 --- a/apps/server/src/classes/data-provider/__tests__/DataProvider.utils.test.ts +++ b/apps/server/src/classes/data-provider/__tests__/DataProvider.utils.test.ts @@ -1,4 +1,4 @@ -import { DatabaseModel, OffsetMode, OntimeRundown, Settings, URLPreset, ViewSettings } from 'ontime-types'; +import { DatabaseModel, OntimeRundown, Settings, URLPreset, ViewSettings } from 'ontime-types'; import { safeMerge } from '../DataProvider.utils.js'; describe('safeMerge', () => { @@ -42,7 +42,6 @@ describe('safeMerge', () => { triggers: [], automations: {}, }, - offsetMode: OffsetMode.Absolute, } as DatabaseModel; it('returns existing data if new data is not provided', () => { diff --git a/apps/server/src/models/dataModel.ts b/apps/server/src/models/dataModel.ts index fae7687c9..a4a73a437 100644 --- a/apps/server/src/models/dataModel.ts +++ b/apps/server/src/models/dataModel.ts @@ -1,4 +1,4 @@ -import { DatabaseModel, OffsetMode } from 'ontime-types'; +import { DatabaseModel } from 'ontime-types'; import { ONTIME_VERSION } from '../ONTIME_VERSION.js'; export const dbModel: DatabaseModel = { @@ -38,5 +38,4 @@ export const dbModel: DatabaseModel = { triggers: [], automations: {}, }, - offsetMode: OffsetMode.Absolute, }; diff --git a/apps/server/src/models/demoProject.ts b/apps/server/src/models/demoProject.ts index 357d3a05b..b57e35dd6 100644 --- a/apps/server/src/models/demoProject.ts +++ b/apps/server/src/models/demoProject.ts @@ -1,4 +1,4 @@ -import { DatabaseModel, EndAction, OffsetMode, SupportedEvent, TimeStrategy, TimerType } from 'ontime-types'; +import { DatabaseModel, EndAction, SupportedEvent, TimeStrategy, TimerType } from 'ontime-types'; export const demoDb: DatabaseModel = { rundown: [ @@ -457,5 +457,4 @@ export const demoDb: DatabaseModel = { triggers: [], automations: {}, }, - offsetMode: OffsetMode.Absolute, }; diff --git a/apps/server/src/services/runtime-service/RuntimeService.ts b/apps/server/src/services/runtime-service/RuntimeService.ts index 4e44a3673..46232b82a 100644 --- a/apps/server/src/services/runtime-service/RuntimeService.ts +++ b/apps/server/src/services/runtime-service/RuntimeService.ts @@ -38,7 +38,6 @@ import { import { getForceUpdate, getShouldClockUpdate, getShouldTimerUpdate } from './rundownService.utils.js'; import { skippedOutOfEvent } from '../timerUtils.js'; import { triggerAutomations } from '../../api-data/automation/automation.service.js'; -import { getDataProvider } from '../../classes/data-provider/DataProvider.js'; type RuntimeStateEventKeys = keyof Pick; @@ -73,9 +72,6 @@ class RuntimeService { @broadcastResult setOffsetMode(mode: OffsetMode) { runtimeState.setOffsetMode(mode); - process.nextTick(() => { - getDataProvider().setOffsetMode(mode); - }); } /** diff --git a/apps/server/src/utils/parser.ts b/apps/server/src/utils/parser.ts index 69c027224..11680f5f6 100644 --- a/apps/server/src/utils/parser.ts +++ b/apps/server/src/utils/parser.ts @@ -27,14 +27,7 @@ import { logger } from '../classes/Logger.js'; import { event as eventDef } from '../models/eventsDefinition.js'; import { makeString } from './parserUtils.js'; -import { - parseOffsetMode, - parseProject, - parseRundown, - parseSettings, - parseUrlPresets, - parseViewSettings, -} from './parserFunctions.js'; +import { parseProject, parseRundown, parseSettings, parseUrlPresets, parseViewSettings } from './parserFunctions.js'; import { parseExcelDate } from './time.js'; export type ErrorEmitter = (message: string) => void; @@ -343,7 +336,6 @@ export function parseDatabaseModel(jsonData: Partial): { data: Da urlPresets: parseUrlPresets(jsonData, makeEmitError('URL Presets')), customFields, automation: parseAutomationSettings(jsonData), - offsetMode: parseOffsetMode(jsonData, makeEmitError('OffsetMode')), }; return { data, errors }; diff --git a/apps/server/src/utils/parserFunctions.ts b/apps/server/src/utils/parserFunctions.ts index d8093e1a5..7c8cce9d5 100644 --- a/apps/server/src/utils/parserFunctions.ts +++ b/apps/server/src/utils/parserFunctions.ts @@ -2,7 +2,6 @@ import { CustomField, CustomFields, DatabaseModel, - OffsetMode, OntimeBlock, OntimeDelay, OntimeEvent, @@ -21,7 +20,6 @@ import { customFieldLabelToKey, generateId, isAlphanumericWithSpace } from 'onti import { dbModel } from '../models/dataModel.js'; import { block as blockDef, delay as delayDef } from '../models/eventsDefinition.js'; import { createEvent, type ErrorEmitter } from './parser.js'; -import { coerceEnum } from './coerceType.js'; /** * Parse rundown array of an entry @@ -119,25 +117,6 @@ export function parseProject(data: Partial, emitError?: ErrorEmit }; } -/** - * Parse offsetmode - */ -export function parseOffsetMode(data: Partial, emitError?: ErrorEmitter): OffsetMode { - if (!data.offsetMode) { - emitError?.('No offsetmode found to import'); - return dbModel.offsetMode; - } - - console.log('Found offsetmode, importing...'); - - try { - return coerceEnum(data.offsetMode, OffsetMode); - } catch (error) { - emitError?.('Invalid offsetmode found'); - return dbModel.offsetMode; - } -} - /** * Parse settings portion of an entry */ diff --git a/packages/types/src/definitions/DataModel.type.ts b/packages/types/src/definitions/DataModel.type.ts index 1bc936d7e..0f8d31878 100644 --- a/packages/types/src/definitions/DataModel.type.ts +++ b/packages/types/src/definitions/DataModel.type.ts @@ -1,7 +1,6 @@ import type { AutomationSettings, CustomFields, - OffsetMode, OntimeRundown, ProjectData, Settings, @@ -17,5 +16,4 @@ export type DatabaseModel = { urlPresets: URLPreset[]; customFields: CustomFields; automation: AutomationSettings; - offsetMode: OffsetMode; }; diff --git a/packages/types/src/definitions/runtime/Runtime.type.ts b/packages/types/src/definitions/runtime/Runtime.type.ts index dc9315317..f19e36700 100644 --- a/packages/types/src/definitions/runtime/Runtime.type.ts +++ b/packages/types/src/definitions/runtime/Runtime.type.ts @@ -14,5 +14,5 @@ export type Runtime = { actualStart: MaybeNumber; plannedEnd: MaybeNumber; expectedEnd: MaybeNumber; - offsetMode: OffsetMode; // TODO: get proper names + offsetMode: OffsetMode; };