Prevent recordings from being turned on if disabled in config (blakeb…

…lackshear#6444) * Prevent enabling recordings if not enabled in config * Fix conflict * Fix spacing * Update wording * Update wording --------- Co-authored-by: Blake Blackshear <[email protected]>
gilankpam · May 15, 2023 · 5951a74 · 5951a74
1 parent 305323c
commit 5951a74
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 10 deletions.
diff --git a/frigate/comms/dispatcher.py b/frigate/comms/dispatcher.py
@@ -180,6 +180,12 @@ def _on_recordings_command(self, camera_name: str, payload: str) -> None:
  record_settings = self.config.cameras[camera_name].record
 
  if payload == "ON":
+ if not self.config.cameras[camera_name].record.enabled_in_config:
+ logger.error(
+ f"Recordings must be enabled in the config to be turned on via MQTT."
+ )
+ return
+
  if not record_settings.enabled:
  logger.info(f"Turning on recordings for {camera_name}")
  record_settings.enabled = True

diff --git a/frigate/config.py b/frigate/config.py
@@ -172,6 +172,9 @@ class RecordConfig(FrigateBaseModel):
  events: EventsConfig = Field(
  default_factory=EventsConfig, title="Event specific settings."
  )
+ enabled_in_config: Optional[bool] = Field(
+ title="Keep track of original state of recording."
+ )
 
 
 class MotionConfig(FrigateBaseModel):
@@ -952,6 +955,9 @@ def runtime_config(self) -> FrigateConfig:
  for input in camera_config.ffmpeg.inputs:
  input.path = input.path.format(**FRIGATE_ENV_VARS)
 
+ # set config recording value
+ camera_config.record.enabled_in_config = camera_config.record.enabled
+
  # Add default filters
  object_keys = camera_config.objects.track
  if camera_config.objects.filters is None:

diff --git a/web/__test__/handlers.js b/web/__test__/handlers.js
@@ -16,7 +16,7 @@ export const handlers = [
  front: {
  name: 'front',
  objects: { track: ['taco', 'cat', 'dog'] },
- record: { enabled: true },
+ record: { enabled: true, enabled_in_config: true },
  detect: { width: 1280, height: 720 },
  snapshots: {},
  restream: { enabled: true, jsmpeg: { height: 720 } },
@@ -25,7 +25,7 @@ export const handlers = [
  side: {
  name: 'side',
  objects: { track: ['taco', 'cat', 'dog'] },
- record: { enabled: false },
+ record: { enabled: false, enabled_in_config: true },
  detect: { width: 1280, height: 720 },
  snapshots: {},
  restream: { enabled: true, jsmpeg: { height: 720 } },

diff --git a/web/src/routes/Cameras.jsx b/web/src/routes/Cameras.jsx
@@ -16,12 +16,12 @@ export default function Cameras() {
  <ActivityIndicator />
  ) : (
  <div className="grid grid-cols-1 3xl:grid-cols-3 md:grid-cols-2 gap-4 p-2 px-4">
- <SortedCameras unsortedCameras={config.cameras} />
+ <SortedCameras config={config} unsortedCameras={config.cameras} />
  </div>
  );
 }
 
-function SortedCameras({ unsortedCameras }) {
+function SortedCameras({ config, unsortedCameras }) {
  const sortedCameras = useMemo(
  () =>
  Object.entries(unsortedCameras)
@@ -33,13 +33,13 @@ function SortedCameras({ unsortedCameras }) {
  return (
  <Fragment>
  {sortedCameras.map(([camera, conf]) => (
- <Camera key={camera} name={camera} conf={conf} />
+ <Camera key={camera} name={camera} config={config.cameras[camera]} conf={conf} />
  ))}
  </Fragment>
  );
 }
 
-function Camera({ name }) {
+function Camera({ name, config }) {
  const { payload: detectValue, send: sendDetect } = useDetectState(name);
  const { payload: recordValue, send: sendRecordings } = useRecordingsState(name);
  const { payload: snapshotValue, send: sendSnapshots } = useSnapshotsState(name);
@@ -65,11 +65,13 @@ function Camera({ name }) {
  },
  },
  {
- name: `Toggle recordings ${recordValue === 'ON' ? 'off' : 'on'}`,
+ name: config.record.enabled_in_config ? `Toggle recordings ${recordValue === 'ON' ? 'off' : 'on'}` : 'Recordings must be enabled in the config to be turned on in the UI.',
  icon: ClipIcon,
- color: recordValue === 'ON' ? 'blue' : 'gray',
+ color: config.record.enabled_in_config ? (recordValue === 'ON' ? 'blue' : 'gray') : 'red',
  onClick: () => {
- sendRecordings(recordValue === 'ON' ? 'OFF' : 'ON', true);
+ if (config.record.enabled_in_config) {
+ sendRecordings(recordValue === 'ON' ? 'OFF' : 'ON', true);
+ }
  },
  },
  {
@@ -81,7 +83,7 @@ function Camera({ name }) {
  },
  },
  ],
- [detectValue, sendDetect, recordValue, sendRecordings, snapshotValue, sendSnapshots]
+ [config, detectValue, sendDetect, recordValue, sendRecordings, snapshotValue, sendSnapshots]
  );
 
  return (