V3 (#657)

* refactor: cleanup routes * style: smaller base font * chore: upgrade dependencies * chore: lock node version to electron * refactor: pass HTTP to integration controller (#652) * refactor: deprecate onair control * refactor: remove playback router * Several project files user folder (#617) * chore: automated screenshots (#667) * feat: app settings (#658) * refactor: remove deprecated event data (#674) * Studio clock (#663) --------- Co-authored-by: Carlos Valente <carlosvalente@pm.me> * Feat: reorder events with alt+ctrl + arrow up/down (#645) * Warning and danger per event (#677) --------- Co-authored-by: Fabian Posenau <fabian@fphome.de> * refactor: stabilise actionHandler (#683) Co-authored-by: Fabian Posenau <fabian@fphome.de> * improvement: hide seconds (#675) * wip: overview (#688) * fix: focus cursor (#695) * refactor: update lower third (#665) * Refactor/time formatting (#696) --------- Co-authored-by: Carlos Valente <34649812+cpvalente@users.noreply.github.com> Co-authored-by: Carlos Valente <carlosvalente@pm.me> * feat: multiple selection (#703) --------- Co-authored-by: asharonbaltazar <asharonbaltazar@outlook.com> Co-authored-by: Alex <ac@omnivox.dk> * fix: test - go to `Edit mode` befor tying to click `Event options` button (#708) * refactor: runtime service (#715) * fix: issue with loosing cursor position on message (#719) * remove info panel (#721) * Event editor continue (#722) * update API - part (#709) --------- Co-authored-by: Carlos Valente <34649812+cpvalente@users.noreply.github.com> Co-authored-by: Carlos Valente <carlosvalente@pm.me> * refactor: update timers (#729) * feat: many timers (#706) --------- Co-authored-by: arc-alex <ac@omnivox.dk> * refactor: excel cleanup (#734) * refactor: allow import of blocks and skip import (#735) * Project manager (#697) * refactor: UI for linking events (#763) * upgraded pipeline actions (#777) * Over under (#771) * custom fields (#744) --------- Co-authored-by: Carlos Valente <carlosvalente@pm.me> * Sheets settings (#774) --------- Co-authored-by: arc-alex <ac@omnivox.dk> * style: tweaks to lower thirds (#785) * refactor: delays account for gaps (#784) * refactor: partial state updates (#780) * feat: generate crash report (#787) * Sheet use limited input device auth flow (#782) --------- Co-authored-by: cv <34649812+cpvalente@users.noreply.github.com> Co-authored-by: Carlos Valente <carlosvalente@pm.me> * Custom fields views (#789) * refactor: deprecate presenter and subtitle (#795) * refactor: organise API around resources (#798) --------- Co-authored-by: Bianca Procopio <biancahprocopio@gmail.com> * Time to end (#804) * Skip fixes (#805) * fix: onair derives from playback * Param nav (#822) --------- Co-authored-by: Alex Christoffer Rasmussen <ac@omnivox.dk> * refactor: download files from interface (#831) * Quick options (#814) * End pause (#832) * chore: bump node version in docker (#834) * refactor: follow in run mode (#840) * fix: uncaught error in http integration (#837) * Apply project (#843) Co-authored-by: Matteo Gheza <matteo.gheza07@gmail.com> Co-authored-by: Ary <arylmoraesn@gmail.com> Co-authored-by: Alex Christoffer Rasmussen <ac@omnivox.dk> Co-authored-by: Fabian Posenau <19673098+kellhogs@users.noreply.github.com> Co-authored-by: Fabian Posenau <fabian@fphome.de> Co-authored-by: Alex Rohleder <alexrohleder96@gmail.com> Co-authored-by: asharonbaltazar <asharonbaltazar@outlook.com> Co-authored-by: Bianca Procopio <biancahprocopio@gmail.com> Co-authored-by: Fabian Posenau <fabianpos99+github@gmail.com>
2026-08-16 21:03:29 +00:00 · 2024-04-13 10:06:46 +02:00
parent debdbd1c5a
commit 55d1aca9b6
640 changed files with 26702 additions and 21623 deletions
@@ -1,13 +1,32 @@
-import { EndAction, TimerType } from 'ontime-types';
+import type { MaybeString } from 'ontime-types';
+import { EndAction, TimerType, TimeStrategy } from 'ontime-types';

-import { dayInMs } from '../timeConstants.js';
+/**
+ * Check if a given value is a valid type of string, returns null otherwise
+ * @param {MaybeString} maybeLinkStart
+ * @returns {MaybeString}
+ */
+export function validateLinkStart(maybeLinkStart: unknown): MaybeString {
+  return typeof maybeLinkStart === 'string' ? maybeLinkStart : null;
+}
+
+/**
+ * Check if a given value is a valid time strategy, returns the fallback otherwise
+ * @param {TimeStrategy} maybeTimeStrategy
+ * @returns {TimeStrategy}
+ */
+export function validateTimeStrategy(maybeTimeStrategy: unknown, fallback = TimeStrategy.LockDuration): TimeStrategy {
+  return Object.values(TimeStrategy).includes(maybeTimeStrategy as TimeStrategy)
+    ? (maybeTimeStrategy as TimeStrategy)
+    : fallback;
+}

 /**
 * Checks if given value is a valid type of EndAction, returns the fallback otherwise
 * @param {EndAction} maybeAction
 * @param {EndAction} [fallback]
 */
-export function validateEndAction(maybeAction: unknown, fallback = EndAction.None) {
+export function validateEndAction(maybeAction: unknown, fallback = EndAction.None): EndAction {
  return Object.values(EndAction).includes(maybeAction as EndAction) ? (maybeAction as EndAction) : fallback;
 }

@@ -16,70 +35,10 @@ export function validateEndAction(maybeAction: unknown, fallback = EndAction.Non
 * @param {TimerType} maybeTimerType
 * @param {TimerType} [fallback]
 */
-export function validateTimerType(maybeTimerType: unknown, fallback = TimerType.CountDown) {
+export function validateTimerType(maybeTimerType: unknown, fallback = TimerType.CountDown): TimerType {
  return Object.values(TimerType).includes(maybeTimerType as TimerType) ? (maybeTimerType as TimerType) : fallback;
 }

-/**
- * @description calculates event duration considering midnight
- * @param {number} timeStart
- * @param {number} timeEnd
- * @returns {number}
- */
-export const calculateDuration = (timeStart: number, timeEnd: number): number => {
-  // Durations must be positive
-  if (timeEnd < timeStart) {
-    return timeEnd + dayInMs - timeStart;
-  }
-  return timeEnd - timeStart;
-};
-
-/**
- * Converts a given value to an int, returns 0 otherwise
- * @param value
- * number
- */
-function convertToInteger(value: unknown): number {
-  const result = Number(value);
-  return isNaN(result) ? 0 : Math.floor(result);
-}
-
-/**
- * Ensures the time input variables are valid in relationship to each other
- * Infers values if necessary
- * @param _start
- * @param _end
- * @param _duration
- */
-export function validateTimes(_start?: unknown, _end?: unknown, _duration?: unknown) {
-  const timeStart = convertToInteger(_start) % dayInMs;
-  const timeEnd = convertToInteger(_end) % dayInMs;
-  const duration = convertToInteger(_duration) % dayInMs;
-
-  if (_start != null && _end != null) {
-    // Case 1. if we have start and end, duration must be derived
-    return { timeStart, duration: calculateDuration(timeStart, timeEnd), timeEnd };
-  }
-
-  if (_start == null && _end == null) {
-    if (_duration == null) {
-      // Case 2. no valid times were given
-      return { timeStart, duration, timeEnd };
-    }
-    // Case 3. we have a duration and infer the rest
-    return { timeStart, duration, timeEnd: duration };
-  }
-
-  if (_start != null) {
-    // Case 5. with only start, we can calculate the rest
-    return { timeStart, duration, timeEnd: timeStart + duration };
-  }
-
-  if (_end != null) {
-    // Case 6. with only end, we can calculate the rest
-    return { timeStart: timeEnd - duration, duration, timeEnd };
-  }
-
-  // we should have covered all cases
-  return { timeStart, duration, timeEnd };
+export function isKnownTimerType(maybeTimerType: unknown) {
+  return Object.values(TimerType).includes(maybeTimerType as TimerType);
 }