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

Simplified If-block and removed wrong Optional

Browse Source
This commit is contained in:
banthungprong 2022-10-25 14:58:32 +02:00
parent 1fe6236f0c
commit 52ac65a911
1 changed files with 100 additions and 101 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
frigate/config.py
View File

@ -530,7 +530,7 @@ class CameraUiConfig(FrigateBaseModel):
class CameraConfig(FrigateBaseModel): class CameraConfig(FrigateBaseModel):
name: Optional[str] = Field(title="Camera name.", regex="^[a-zA-Z0-9_-]+$") name: Optional[str] = Field(title="Camera name.", regex="^[a-zA-Z0-9_-]+$")
enabled: Optional[bool] = Field(default=True, title="Enable camera.") enabled: bool = Field(default=True, title="Enable camera.")
ffmpeg: CameraFfmpegConfig = Field(title="FFmpeg configuration for the camera.") ffmpeg: CameraFfmpegConfig = Field(title="FFmpeg configuration for the camera.")
best_image_timeout: int = Field( best_image_timeout: int = Field(
default=60, default=60,
@ -823,7 +823,10 @@ class FrigateConfig(FrigateBaseModel):
{"name": name, **merged_config} {"name": name, **merged_config}
) )
if camera_config.enabled: if not camera_config.enabled:
config.cameras.pop(name)
continue
# Default max_disappeared configuration # Default max_disappeared configuration
max_disappeared = camera_config.detect.fps * 5 max_disappeared = camera_config.detect.fps * 5
if camera_config.detect.max_disappeared is None: if camera_config.detect.max_disappeared is None:
@ -901,9 +904,7 @@ class FrigateConfig(FrigateBaseModel):
"The 'retain_days' config option has been DEPRECATED and will be removed in a future version. Please use the 'days' setting under 'retain'" "The 'retain_days' config option has been DEPRECATED and will be removed in a future version. Please use the 'days' setting under 'retain'"
) )
if camera_config.record.retain.days == 0: if camera_config.record.retain.days == 0:
camera_config.record.retain.days = ( camera_config.record.retain.days = camera_config.record.retain_days
camera_config.record.retain_days
)
# warning if the higher level record mode is potentially more restrictive than the events # warning if the higher level record mode is potentially more restrictive than the events
rank_map = { rank_map = {
@ -922,8 +923,6 @@ class FrigateConfig(FrigateBaseModel):
# generate the ffmpeg commands # generate the ffmpeg commands
camera_config.create_ffmpeg_cmds() camera_config.create_ffmpeg_cmds()
config.cameras[name] = camera_config config.cameras[name] = camera_config
else:
config.cameras.pop(name)
return config return config
@validator("cameras") @validator("cameras")