From 5c0207d3b9c74c5ff62c7ad33342813db2523947 Mon Sep 17 00:00:00 2001 From: Nick Mowen Date: Mon, 18 Apr 2022 10:24:47 -0600 Subject: [PATCH] Tweak behavior --- frigate/mqtt.py | 4 ++-- frigate/video.py | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/frigate/mqtt.py b/frigate/mqtt.py index 9c20fd73a..a7e100744 100644 --- a/frigate/mqtt.py +++ b/frigate/mqtt.py @@ -99,14 +99,14 @@ def create_mqtt_client(config: FrigateConfig, camera_metrics): payload = message.payload.decode() logger.debug(f"on_motion_toggle: {message.topic} {payload}") - camera_name = message.topic.split("/")[3] + camera_name = message.topic.split("/")[-3] if payload == "ON": if not camera_metrics[camera_name]["motion_enabled"].value: logger.info(f"Turning on motion for {camera_name} via mqtt") camera_metrics[camera_name]["motion_enabled"].value = True elif payload == "OFF": - if not camera_metrics[camera_name]["detection_enabled"].value: + if camera_metrics[camera_name]["detection_enabled"].value: logger.error( f"Turning off motion is not allowed when detection is enabled." ) diff --git a/frigate/video.py b/frigate/video.py index 2d3b0ddd7..a4f31723e 100755 --- a/frigate/video.py +++ b/frigate/video.py @@ -511,11 +511,11 @@ def process_frames( f"{camera_name}{frame_time}", (frame_shape[0] * 3 // 2, frame_shape[1]) ) - if frame is None: - logger.info(f"{camera_name}: frame {frame_time} is not in memory store.") + if not motion_enabled.value: continue - if not motion_enabled: + if frame is None: + logger.info(f"{camera_name}: frame {frame_time} is not in memory store.") continue # look for motion