From 5748efb3521db2cca4b7c2356f7ee2066e617a48 Mon Sep 17 00:00:00 2001 From: Nick Mowen Date: Mon, 19 Jun 2023 07:11:49 -0600 Subject: [PATCH] Fixes --- frigate/events/audio.py | 2 +- frigate/events/maintainer.py | 40 +++++++++++++++++++----------------- 2 files changed, 22 insertions(+), 20 deletions(-) diff --git a/frigate/events/audio.py b/frigate/events/audio.py index 0a73af84b..2e58f3409 100644 --- a/frigate/events/audio.py +++ b/frigate/events/audio.py @@ -195,7 +195,7 @@ class AudioEventMaintainer(threading.Thread): except FileExistsError: pass - start_or_restart_ffmpeg( + self.audio_listener = start_or_restart_ffmpeg( self.ffmpeg_cmd, logger, self.logpipe, None, self.audio_listener ) diff --git a/frigate/events/maintainer.py b/frigate/events/maintainer.py index 0186b871c..a28ec39e0 100644 --- a/frigate/events/maintainer.py +++ b/frigate/events/maintainer.py @@ -72,26 +72,28 @@ class EventProcessor(threading.Thread): except queue.Empty: continue - logger.error(f"Event received: {source_type} {event_type} {camera} {event_data['id']}") - - self.timeline_queue.put( - ( - camera, - source_type, - event_type, - self.events_in_process.get(event_data["id"]), - event_data, - ) + logger.error( + f"Event received: {source_type} {event_type} {camera} {event_data['id']}" ) if source_type == EventTypeEnum.tracked_object: + self.timeline_queue.put( + ( + camera, + source_type, + event_type, + self.events_in_process.get(event_data["id"]), + event_data, + ) + ) + if event_type == "start": self.events_in_process[event_data["id"]] = event_data continue self.handle_object_detection(event_type, camera, event_data) elif source_type == EventTypeEnum.audio: - self.handle_audio_detection(event_type, camera, event_data) + self.handle_audio_detection(event_type, event_data) elif source_type == EventTypeEnum.api: self.handle_external_detection(event_type, event_data) @@ -217,7 +219,7 @@ class EventProcessor(threading.Thread): self.event_processed_queue.put((event_data["id"], camera)) def handle_audio_detection(self, type: str, event_data: Event) -> None: - if type == "new": + if type == "start": event = { Event.id: event_data["id"], Event.label: event_data["label"], @@ -235,14 +237,14 @@ class EventProcessor(threading.Thread): Event.end_time: event_data["end_time"], } - ( - Event.insert(event) - .on_conflict( - conflict_target=[Event.id], - update=event, - ) - .execute() + ( + Event.insert(event) + .on_conflict( + conflict_target=[Event.id], + update=event, ) + .execute() + ) def handle_external_detection(self, type: str, event_data: Event) -> None: if type == "new":