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

Convert camera configuration to YAML dictionary.

Browse Source
This commit is contained in:
Dermot Duffy
2022-01-14 21:31:16 -08:00
parent af3b9092fd
commit 85ba8f3a93
5 changed files with 68 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/card.ts
+32 -34
View File
@@ -1,5 +1,3 @@
// TODO change url to frigate_url?
/* eslint-disable @typescript-eslint/no-explicit-any */
import {
CSSResultGroup,
@@ -33,7 +31,6 @@ import {
CameraConfig,
} from './types.js';
import type {
BrowseMediaQueryParameters,
Entity,
ExtendedHomeAssistant,
FrigateCardConfig,
@@ -53,6 +50,7 @@ import {
homeAssistantSignPath,
homeAssistantWSRequest,
isValidMediaShowInfo,
refreshCameraConfigDynamicParameters,
shouldUpdateBasedOnHass,
} from './common.js';
import { localize } from './localize/localize.js';
@@ -280,18 +278,24 @@ export class FrigateCard extends LitElement {
}
if (this.config.menu.buttons.cameras && this._cameras && this._cameras.size > 1) {
const menuItems = Array.from(this._cameras, ([camera, config]) => ({
icon: config.icon || 'mdi:cctv',
entity: config.camera_entity,
state_color: true,
title: config.title,
tap_action: createFrigateCardCustomAction('camera_select', camera),
}));
const menuItems = Array.from(this._cameras, ([camera, config]) => {
const dynamicConfig = refreshCameraConfigDynamicParameters(
{ ...config },
this._hass,
);
return {
icon: dynamicConfig.icon || 'mdi:cctv',
entity: dynamicConfig.camera_entity,
state_color: true,
title: dynamicConfig.title,
tap_action: createFrigateCardCustomAction('camera_select', camera),
};
});
buttons.push({
type: 'custom:frigate-card-menu-submenu',
title: localize('config.menu.buttons.cameras'),
icon: 'mdi:camera-switch',
icon: 'mdi:video-switch',
items: menuItems,
});
}
@@ -399,8 +403,13 @@ export class FrigateCard extends LitElement {
protected async _loadCameras(): Promise<void> {
const cameras: Map<string, CameraConfig> = new Map();
const addCameraConfig = async (config: CameraConfig) => {
if (!config.camera_name && config.camera_entity) {
const addCameraConfig = async (id: string, config: CameraConfig) => {
if (!config.camera_name && (config.camera_entity || id.startsWith('camera.'))) {
if (!config.camera_entity) {
// If the camera_entity isn't explicitly set and the id looks like
// one, use that.
config.camera_entity = id;
}
const resolvedName = await this._getFrigateCameraNameFromEntity(
config.camera_entity,
);
@@ -408,30 +417,17 @@ export class FrigateCard extends LitElement {
config.camera_name = resolvedName;
}
}
if (config.camera_name) {
const id = config.id || config.camera_name;
if (cameras.has(id)) {
this._setMessageAndUpdate(
{
message: localize('error.duplicate_frigate_camera_name'),
type: 'error',
},
true,
);
} else {
cameras.set(config.id || config.camera_name, config);
}
if (!config.camera_name) {
config.camera_name = id;
}
cameras.set(id, config);
};
if (this.config.camera) {
if (Array.isArray(this.config.camera)) {
await Promise.all(this.config.camera.map(addCameraConfig.bind(this)));
} else {
await addCameraConfig(this.config.camera);
}
}
await Promise.all(
Object.keys(this.config.cameras).map((key) =>
addCameraConfig(key, this.config.cameras[key]),
),
);
if (!cameras.size) {
return this._setMessageAndUpdate(
@@ -945,6 +941,8 @@ export class FrigateCard extends LitElement {
if (requestRefresh) {
this.requestUpdate();
}
// TODO: Remove
console.info(`Showing media: ${JSON.stringify(mediaShowInfo)}`);
}
/**
src/common.ts
+23 -11
View File
@@ -287,7 +287,8 @@ export function convertActionToFrigateCardCustomAction(
*/
export function createFrigateCardCustomAction(
action: FrigateCardAction,
camera?: string): FrigateCardCustomAction | undefined {
camera?: string,
): FrigateCardCustomAction | undefined {
if (action == 'camera_select') {
if (!camera) {
return undefined;
@@ -296,12 +297,12 @@ export function createFrigateCardCustomAction(
action: 'fire-dom-event',
frigate_card_action: action,
camera: camera,
}
};
}
return {
action: 'fire-dom-event',
frigate_card_action: action,
}
};
}
/**
@@ -397,13 +398,24 @@ export function refreshDynamicStateParameters(
return params;
}
function prettifyCameraName(input: string): string {
const words = input.split(/[_\s]+/);
return words
.map((word) => {
return word[0].toUpperCase() + word.substring(1);
})
.join(' ');
}
export function refreshCameraConfigDynamicParameters(
hass: HomeAssistant,
config: CameraConfig): CameraConfig {
if (hass && config.camera_entity) {
const state = hass.states[config.camera_entity];
config.title = config.title ?? (state?.attributes?.friendly_name || config.camera_entity);
config.icon = config.icon ?? stateIcon(state);
}
config: CameraConfig,
hass?: HomeAssistant,
): CameraConfig {
const state =
hass && config.camera_entity ? hass.states[config.camera_entity] : undefined;
config.title =
config.title ??
(state?.attributes?.friendly_name || prettifyCameraName(config.camera_name || ''));
config.icon = config.icon ?? (state ? stateIcon(state) : 'mdi:video');
return config;
}
}
src/components/live.ts
+10 -8
View File
@@ -1,4 +1,8 @@
// TODO editor
// TODO webrtc entities in camera section?
// TODO conditional elements based on camera name (requires event changed to propagate upwards)
// TODO change url to frigate_url?
// TODO Remove media load event warning
// TODO readme
// TODO search for TODOs
@@ -237,12 +241,10 @@ export class FrigateCardLiveCarousel extends FrigateCardMediaCarousel {
}
return Array.from(this.cameras.values()).map((cameraConfig, index) => {
let refreshedConfig = { ...cameraConfig };
if (this.hass) {
refreshedConfig = refreshCameraConfigDynamicParameters(
this.hass,
refreshedConfig,
);
}
refreshedConfig = refreshCameraConfigDynamicParameters(
refreshedConfig,
this.hass,
);
return this._renderLive(refreshedConfig, index);
});
}
@@ -303,13 +305,13 @@ export class FrigateCardLiveCarousel extends FrigateCardMediaCarousel {
if (currentIndex > 0) {
prev = this.cameras.get(keys[currentIndex - 1]) ?? null;
if (prev) {
prev = refreshCameraConfigDynamicParameters(this.hass, { ...prev });
prev = refreshCameraConfigDynamicParameters({ ...prev }, this.hass);
}
}
if (currentIndex + 1 < this.cameras.size) {
next = this.cameras.get(keys[currentIndex + 1]) ?? null;
if (next) {
next = refreshCameraConfigDynamicParameters(this.hass, { ...next });
next = refreshCameraConfigDynamicParameters({ ...next }, this.hass);
}
}
return [prev, next];
src/localize/languages/en.json
-1
View File
@@ -154,7 +154,6 @@
"upgrade_available": "An automated card configuration upgrade is available, please visit the visual card editor",
"missing_webrtc": "WebRTC component not found",
"no_cameras": "No cameras found, you must configure at least one camera configured with a camera_entity or camera_name",
"duplicate_frigate_camera_name": "Duplicate Frigate camera name, use the 'id' parameter to uniquely identify them",
"could_not_render_elements": "Could not render picture elements",
"invalid_elements_config": "Invalid picture elements configuration",
"jsmpeg_no_sign": "Could not retrieve or sign JSMPEG websocket path",
src/types.ts
+3 -3
View File
@@ -368,12 +368,12 @@ const cameraConfigDefaultSchema = z
// specified).
icon: z.string().optional(),
title: z.string().optional(),
id: z.string().optional(),
})
.default(cameraConfigDefault);
export type CameraConfig = z.infer<typeof cameraConfigDefaultSchema>;
const camerasConfigDefaultSchema = z.record(cameraConfigDefaultSchema);
/**
* View configuration section.
*/
@@ -650,7 +650,7 @@ const dimensionsConfigSchema = z
*/
export const frigateCardConfigSchema = z.object({
// Main configuration sections.
camera: cameraConfigDefaultSchema.or(cameraConfigDefaultSchema.array().nonempty()),
cameras: camerasConfigDefaultSchema,
view: viewConfigSchema,
menu: menuConfigSchema,
live: liveConfigSchema,