From 825277e4c941c317253c1045aebb8e83c5ee14f7 Mon Sep 17 00:00:00 2001 From: leccelecce <24962424+leccelecce@users.noreply.github.com> Date: Thu, 12 Mar 2026 22:49:26 +0000 Subject: [PATCH] Further config and web fixes --- frigate/config/camera/camera.py | 2 +- frigate/config/config.py | 2 +- web/public/locales/en/config/cameras.json | 10 +++------- web/public/locales/en/config/global.json | 18 +++++++----------- web/public/locales/en/views/settings.json | 7 +++---- .../views/settings/FrigatePlusSettingsView.tsx | 12 ------------ 6 files changed, 15 insertions(+), 36 deletions(-) diff --git a/frigate/config/camera/camera.py b/frigate/config/camera/camera.py index 3c9e1f892..529b8e45c 100644 --- a/frigate/config/camera/camera.py +++ b/frigate/config/camera/camera.py @@ -141,7 +141,7 @@ class CameraConfig(FrigateBaseModel): snapshots: SnapshotsConfig = Field( default_factory=SnapshotsConfig, title="Snapshots", - description="Settings for saved JPEG snapshots of tracked objects for this camera.", + description="Settings for API-generated snapshots of tracked objects for this camera.", ) timestamp_style: TimestampStyleConfig = Field( default_factory=TimestampStyleConfig, diff --git a/frigate/config/config.py b/frigate/config/config.py index 9184bc1b3..19d0b73a3 100644 --- a/frigate/config/config.py +++ b/frigate/config/config.py @@ -498,7 +498,7 @@ class FrigateConfig(FrigateBaseModel): snapshots: SnapshotsConfig = Field( default_factory=SnapshotsConfig, title="Snapshots", - description="Settings for saved JPEG snapshots of tracked objects for all cameras; can be overridden per-camera.", + description="Settings for API-generated snapshots of tracked objects for all cameras; can be overridden per-camera.", ) timestamp_style: TimestampStyleConfig = Field( default_factory=TimestampStyleConfig, diff --git a/web/public/locales/en/config/cameras.json b/web/public/locales/en/config/cameras.json index f14599e14..ca069da73 100644 --- a/web/public/locales/en/config/cameras.json +++ b/web/public/locales/en/config/cameras.json @@ -626,15 +626,11 @@ }, "snapshots": { "label": "Snapshots", - "description": "Settings for saved JPEG snapshots of tracked objects for this camera.", + "description": "Settings for API-generated snapshots of tracked objects for this camera.", "enabled": { "label": "Enable snapshots", "description": "Enable or disable saving snapshots for this camera." }, - "clean_copy": { - "label": "Save clean copy", - "description": "Save an unannotated clean copy of snapshots in addition to annotated ones." - }, "timestamp": { "label": "Timestamp overlay", "description": "Overlay a timestamp on saved snapshots." @@ -672,8 +668,8 @@ } }, "quality": { - "label": "JPEG quality", - "description": "JPEG encode quality for saved snapshots (0-100)." + "label": "WEBP quality", + "description": "WEBP encode quality for saved snapshots (0-100)." } }, "timestamp_style": { diff --git a/web/public/locales/en/config/global.json b/web/public/locales/en/config/global.json index b5c36ed36..0aa681adb 100644 --- a/web/public/locales/en/config/global.json +++ b/web/public/locales/en/config/global.json @@ -1109,22 +1109,18 @@ }, "snapshots": { "label": "Snapshots", - "description": "Settings for saved JPEG snapshots of tracked objects for all cameras; can be overridden per-camera.", + "description": "Settings for API-generated snapshots of tracked objects for all cameras; can be overridden per-camera.", "enabled": { "label": "Enable snapshots", "description": "Enable or disable saving snapshots for all cameras; can be overridden per-camera." }, - "clean_copy": { - "label": "Save clean copy", - "description": "Save an unannotated clean copy of snapshots in addition to annotated ones." - }, "timestamp": { "label": "Timestamp overlay", - "description": "Overlay a timestamp on saved snapshots." + "description": "Overlay a timestamp on snapshots." }, "bounding_box": { "label": "Bounding box overlay", - "description": "Draw bounding boxes for tracked objects on saved snapshots." + "description": "Draw bounding boxes for tracked objects on snapshots." }, "crop": { "label": "Crop snapshot", @@ -1136,11 +1132,11 @@ }, "height": { "label": "Snapshot height", - "description": "Height (pixels) to resize saved snapshots to; leave empty to preserve original size." + "description": "Height (pixels) to resize snapshots to; leave empty to preserve original size." }, "retain": { "label": "Snapshot retention", - "description": "Retention settings for saved snapshots including default days and per-object overrides.", + "description": "Retention settings for snapshots including default days and per-object overrides.", "default": { "label": "Default retention", "description": "Default number of days to retain snapshots." @@ -1155,8 +1151,8 @@ } }, "quality": { - "label": "JPEG quality", - "description": "JPEG encode quality for saved snapshots (0-100)." + "label": "WEBP quality", + "description": "WEBP encode quality for saved snapshots (0-100)." } }, "timestamp_style": { diff --git a/web/public/locales/en/views/settings.json b/web/public/locales/en/views/settings.json index 16fafe98a..8666e48fc 100644 --- a/web/public/locales/en/views/settings.json +++ b/web/public/locales/en/views/settings.json @@ -1060,12 +1060,11 @@ }, "snapshotConfig": { "title": "Snapshot Configuration", - "desc": "Submitting to Frigate+ requires both snapshots and clean_copy snapshots to be enabled in your config.", - "cleanCopyWarning": "Some cameras have snapshots enabled but have the clean copy disabled. You need to enable clean_copy in your snapshot config to be able to submit images from these cameras to Frigate+.", + "desc": "Submitting to Frigate+ requires snapshots to be enabled in your config.", + "cleanCopyWarning": "Some cameras have snapshots disabled", "table": { "camera": "Camera", - "snapshots": "Snapshots", - "cleanCopySnapshots": "clean_copy Snapshots" + "snapshots": "Snapshots" } }, "modelInfo": { diff --git a/web/src/views/settings/FrigatePlusSettingsView.tsx b/web/src/views/settings/FrigatePlusSettingsView.tsx index 181fadaac..4beeeea36 100644 --- a/web/src/views/settings/FrigatePlusSettingsView.tsx +++ b/web/src/views/settings/FrigatePlusSettingsView.tsx @@ -405,11 +405,6 @@ export default function FrigatePlusSettingsView({ "frigatePlus.snapshotConfig.table.snapshots", )} - - - frigatePlus.snapshotConfig.table.cleanCopySnapshots - - @@ -429,13 +424,6 @@ export default function FrigatePlusSettingsView({ )} - - {camera.snapshots?.enabled ? ( - - ) : ( - - )} - ), )}