From 315e0fdbe0bb04eb281ebdc385d9ceb0492d8605 Mon Sep 17 00:00:00 2001 From: Jesper Nilsson Date: Fri, 4 Sep 2020 06:53:24 +0000 Subject: [PATCH] fix motion and object schema for cameras --- src/lib/config/config_camera.py | 29 ++++++++++++++++------------- 1 file changed, 16 insertions(+), 13 deletions(-) diff --git a/src/lib/config/config_camera.py b/src/lib/config/config_camera.py index 0e5bfe7ac..41914e32f 100644 --- a/src/lib/config/config_camera.py +++ b/src/lib/config/config_camera.py @@ -68,19 +68,22 @@ def get_codec() -> str: ): check_for_hwaccels, Optional("codec", default=get_codec()): str, Optional("filter_args", default=[]): list, - Optional("motion_detection", default=None): { - Optional("interval"): int, - Optional("trigger"): bool, - Optional("timeout"): bool, - Optional("width"): int, - Optional("height"): int, - Optional("area"): int, - Optional("frames"): int, - }, - Optional("object_detection", default=None): { - Optional("interval"): int, - Optional("labels"): LABELS_SCHEMA, - }, + Optional("motion_detection", default=None): Any( + { + Optional("interval"): int, + Optional("trigger"): bool, + Optional("timeout"): bool, + Optional("width"): int, + Optional("height"): int, + Optional("area"): int, + Optional("frames"): int, + }, + None, + ), + Optional("object_detection", default=None): Any( + {Optional("interval"): int, Optional("labels"): LABELS_SCHEMA,}, + None, + ), } ], ensure_mqtt_name,