flan/advanced-camera-card
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #987 from dermotduffy/image-refresh-rate

Browse Source 
Fix `low` performance profile camera defaults
This commit is contained in:
Dermot Duffy
2023-03-04 14:08:50 -08:00
committed by GitHub
parent 012117c188 d1444426d9
commit bc54f2f7a5
2 changed files with 9 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/const.ts
+4
View File
@@ -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_JSMPEG = `${CONF_CAMERAS_GLOBAL}.jsmpeg` as const;
export const CONF_CAMERAS_GLOBAL_WEBRTC_CARD = export const CONF_CAMERAS_GLOBAL_WEBRTC_CARD =
`${CONF_CAMERAS_GLOBAL}.webrtc_card` as const; `${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; export const CONF_ELEMENTS = 'elements' as const;
src/performance.ts
+5 -16
View File
@@ -4,10 +4,8 @@ import {
RawFrigateCardConfig, RawFrigateCardConfig,
PerformanceConfig, PerformanceConfig,
} from './types'; } from './types';
import { getArrayConfigPath, getConfigValue, setConfigValue } from './config-mgmt.js'; import { getConfigValue, setConfigValue } from './config-mgmt.js';
import { 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_DETAILS,
CONF_MEDIA_GALLERY_CONTROLS_THUMBNAILS_SHOW_FAVORITE_CONTROL, CONF_MEDIA_GALLERY_CONTROLS_THUMBNAILS_SHOW_FAVORITE_CONTROL,
CONF_MEDIA_GALLERY_CONTROLS_THUMBNAILS_SHOW_TIMELINE_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_FAVORITE_CONTROL,
CONF_TIMELINE_CONTROLS_THUMBNAILS_SHOW_TIMELINE_CONTROL, CONF_TIMELINE_CONTROLS_THUMBNAILS_SHOW_TIMELINE_CONTROL,
CONF_TIMELINE_SHOW_RECORDINGS, CONF_TIMELINE_SHOW_RECORDINGS,
CONF_CAMERAS_GLOBAL_TRIGGERS_OCCUPANCY,
CONF_CAMERAS_GLOBAL_IMAGE_REFRESH_SECONDS,
} from './const.js'; } from './const.js';
// Caution: These values are applied after parsing (since we cannot know the // 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. // Clicking on a snapshot should not play a clip.
[CONF_MEDIA_VIEWER_SNAPSHOT_CLICK_PLAYS_CLIP]: false, [CONF_MEDIA_VIEWER_SNAPSHOT_CLICK_PLAYS_CLIP]: false,
};
const LOW_PROFILE_CAMERA_DEFAULTS = { [CONF_CAMERAS_GLOBAL_TRIGGERS_OCCUPANCY]: false,
[CONF_CAMERAS_ARRAY_TRIGGERS_OCCUPANCY]: false,
// Refresh the live camera image every 10 seconds (same as stock Home // Refresh the live camera image every 10 seconds (same as stock Home
// Assistant Picture Glance). // 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]) => Object.entries(LOW_PROFILE_DEFAULTS).forEach(([k, v]: [string, unknown]) =>
setIfNotSpecified(defaultLessConfig, outputConfig, k, v), 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; return outputConfig;
}; };