administrator/frigate
1
0
Fork 0
mirror of https://github.com/blakeblackshear/frigate.git synced 2026-02-05 10:45:21 +03:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Fix conflict

Browse Source
This commit is contained in:
Nick Mowen 2023-05-08 14:48:56 -06:00
parent ccf1c10f47
commit b4426f7583
2 changed files with 2 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
frigate/comms/dispatcher.py
View File

@ -180,17 +180,14 @@ class Dispatcher:
record_settings = self.config.cameras[camera_name].record record_settings = self.config.cameras[camera_name].record
if payload == "ON": if payload == "ON":
<<<<<<< Updated upstream
if not record_settings.enabled:
=======
if not self.config.cameras[camera_name].record.enabled_in_config: if not self.config.cameras[camera_name].record.enabled_in_config:
logger.error( logger.error(
f"Recordings are not enabled in the config, they can not be enabled after startup." f"Recordings are not enabled in the config, they can not be enabled after startup."
) )
return return
if not self.record_metrics[camera_name]["record_enabled"].value:
>>>>>>> Stashed changes if not record_settings.enabled:
logger.info(f"Turning on recordings for {camera_name}") logger.info(f"Turning on recordings for {camera_name}")
record_settings.enabled = True record_settings.enabled = True
elif payload == "OFF": elif payload == "OFF":

12
frigate/config.py
View File

@ -955,21 +955,9 @@ class FrigateConfig(FrigateBaseModel):
for input in camera_config.ffmpeg.inputs: for input in camera_config.ffmpeg.inputs:
input.path = input.path.format(**FRIGATE_ENV_VARS) input.path = input.path.format(**FRIGATE_ENV_VARS)
<<<<<<< Updated upstream
=======
# ONVIF substitution
if camera_config.onvif.user or camera_config.onvif.password:
camera_config.onvif.user = camera_config.onvif.user.format(
**FRIGATE_ENV_VARS
)
camera_config.onvif.password = camera_config.onvif.password.format(
**FRIGATE_ENV_VARS
)
# set config recording value # set config recording value
camera_config.record.enabled_in_config = camera_config.record.enabled camera_config.record.enabled_in_config = camera_config.record.enabled
>>>>>>> Stashed changes
# Add default filters # Add default filters
object_keys = camera_config.objects.track object_keys = camera_config.objects.track
if camera_config.objects.filters is None: if camera_config.objects.filters is None: