From d1444426d9de54b05c79035e667d5f51720a955b Mon Sep 17 00:00:00 2001
From: Dermot Duffy <dermot.duffy@gmail.com>
Date: Sat, 4 Mar 2023 14:04:47 -0800
Subject: [PATCH] Fix low performance profile camera overrides.

---
 src/const.ts       |  4 ++++
 src/performance.ts | 21 +++++----------------
 2 files changed, 9 insertions(+), 16 deletions(-)

diff --git a/src/const.ts b/src/const.ts
index 0d2b6084..2c2eeab4 100644
--- a/src/const.ts
+++ b/src/const.ts
@@ -44,6 +44,10 @@ export const CONF_CAMERAS_GLOBAL_IMAGE = `${CONF_CAMERAS_GLOBAL}.image` as const
 export const CONF_CAMERAS_GLOBAL_JSMPEG = `${CONF_CAMERAS_GLOBAL}.jsmpeg` as const;
 export const CONF_CAMERAS_GLOBAL_WEBRTC_CARD =
   `${CONF_CAMERAS_GLOBAL}.webrtc_card` as const;
+export const CONF_CAMERAS_GLOBAL_TRIGGERS_OCCUPANCY =
+  `${CONF_CAMERAS_GLOBAL}.triggers.occupancy` as const;
+export const CONF_CAMERAS_GLOBAL_IMAGE_REFRESH_SECONDS =
+  `${CONF_CAMERAS_GLOBAL}.image.refresh_seconds` as const;
 
 export const CONF_ELEMENTS = 'elements' as const;
 
diff --git a/src/performance.ts b/src/performance.ts
index f024b0a2..4467ff2b 100644
--- a/src/performance.ts
+++ b/src/performance.ts
@@ -4,10 +4,8 @@ import {
   RawFrigateCardConfig,
   PerformanceConfig,
 } from './types';
-import { getArrayConfigPath, getConfigValue, setConfigValue } from './config-mgmt.js';
+import { getConfigValue, setConfigValue } from './config-mgmt.js';
 import {
-  CONF_CAMERAS_ARRAY_TRIGGERS_OCCUPANCY,
-  CONF_CAMERAS_ARRAY_IMAGE_REFRESH_SECONDS,
   CONF_MEDIA_GALLERY_CONTROLS_THUMBNAILS_SHOW_DETAILS,
   CONF_MEDIA_GALLERY_CONTROLS_THUMBNAILS_SHOW_FAVORITE_CONTROL,
   CONF_MEDIA_GALLERY_CONTROLS_THUMBNAILS_SHOW_TIMELINE_CONTROL,
@@ -48,6 +46,8 @@ import {
   CONF_TIMELINE_CONTROLS_THUMBNAILS_SHOW_FAVORITE_CONTROL,
   CONF_TIMELINE_CONTROLS_THUMBNAILS_SHOW_TIMELINE_CONTROL,
   CONF_TIMELINE_SHOW_RECORDINGS,
+  CONF_CAMERAS_GLOBAL_TRIGGERS_OCCUPANCY,
+  CONF_CAMERAS_GLOBAL_IMAGE_REFRESH_SECONDS,
 } from './const.js';
 
 // Caution: These values are applied after parsing (since we cannot know the
@@ -128,14 +128,12 @@ const LOW_PROFILE_DEFAULTS = {
 
   // Clicking on a snapshot should not play a clip.
   [CONF_MEDIA_VIEWER_SNAPSHOT_CLICK_PLAYS_CLIP]: false,
-};
 
-const LOW_PROFILE_CAMERA_DEFAULTS = {
-  [CONF_CAMERAS_ARRAY_TRIGGERS_OCCUPANCY]: false,
+  [CONF_CAMERAS_GLOBAL_TRIGGERS_OCCUPANCY]: false,
 
   // Refresh the live camera image every 10 seconds (same as stock Home
   // Assistant Picture Glance).
-  [CONF_CAMERAS_ARRAY_IMAGE_REFRESH_SECONDS]: 10,
+  [CONF_CAMERAS_GLOBAL_IMAGE_REFRESH_SECONDS]: 10,
 };
 
 /**
@@ -169,15 +167,6 @@ export const setLowPerformanceProfile = <T extends RawFrigateCardConfig>(
     Object.entries(LOW_PROFILE_DEFAULTS).forEach(([k, v]: [string, unknown]) =>
       setIfNotSpecified(defaultLessConfig, outputConfig, k, v),
     );
-
-    Object.entries(LOW_PROFILE_CAMERA_DEFAULTS).forEach(
-      ([rawKey, v]: [string, unknown]) => {
-        defaultLessConfig.cameras.forEach((_, index: number) => {
-          const indexedKey = getArrayConfigPath(rawKey, index);
-          setIfNotSpecified(defaultLessConfig, outputConfig, indexedKey, v);
-        });
-      },
-    );
   }
   return outputConfig;
 };