From b2a8f8330aa7240927f02a7015f5e1b627a441a0 Mon Sep 17 00:00:00 2001 From: Nick Mowen Date: Thu, 20 Apr 2023 15:59:00 -0600 Subject: [PATCH] Add other fields --- frigate/events.py | 7 +++---- frigate/timeline.py | 6 +++--- migrations/013_create_timeline_table.py | 2 +- 3 files changed, 7 insertions(+), 8 deletions(-) diff --git a/frigate/events.py b/frigate/events.py index 26a70ce42..416b28fd7 100644 --- a/frigate/events.py +++ b/frigate/events.py @@ -3,15 +3,14 @@ import logging import os import queue import threading -import time from pathlib import Path from peewee import fn -from frigate.config import EventsConfig, FrigateConfig, RecordConfig +from frigate.config import EventsConfig, FrigateConfig from frigate.const import CLIPS_DIR from frigate.models import Event -from frigate.timeline import InputTypeEnum +from frigate.timeline import TimelineSourceEnum from frigate.types import CameraMetricsTypes from multiprocessing.queues import Queue @@ -79,7 +78,7 @@ class EventProcessor(threading.Thread): self.timeline_queue.put( ( camera, - InputTypeEnum.tracked_object, + TimelineSourceEnum.tracked_object, event_type, self.events_in_process.get(event_data["id"]), event_data, diff --git a/frigate/timeline.py b/frigate/timeline.py index 12aa42ac4..da052b5a7 100644 --- a/frigate/timeline.py +++ b/frigate/timeline.py @@ -14,9 +14,9 @@ from multiprocessing.synchronize import Event as MpEvent logger = logging.getLogger(__name__) -class InputTypeEnum(str, Enum): +class TimelineSourceEnum(str, Enum): + # api = "api" # audio = "audio" - # external = "external" tracked_object = "tracked_object" @@ -42,7 +42,7 @@ class TimelineProcessor(threading.Thread): except queue.Empty: continue - if input_type == InputTypeEnum.object: + if input_type == TimelineSourceEnum.object: self.handle_object_detection( camera, event_type, prev_event_data, event_data ) diff --git a/migrations/013_create_timeline_table.py b/migrations/013_create_timeline_table.py index 9fed3f1ab..fea7867af 100644 --- a/migrations/013_create_timeline_table.py +++ b/migrations/013_create_timeline_table.py @@ -37,7 +37,7 @@ SQL = pw.SQL def migrate(migrator, database, fake=False, **kwargs): migrator.sql( - 'CREATE TABLE IF NOT EXISTS "timeline" ("timestamp" DATETIME NOT NULL, "camera" VARCHAR(20) NOT NULL, "source" VARCHAR(20) NOT NULL, "source_id" VARCHAR(30) NOT NULL, "class_type" VARCHAR(50) NOT NULL, "data" JSON)' + 'CREATE TABLE IF NOT EXISTS "timeline" ("timestamp" DATETIME NOT NULL, "camera" VARCHAR(20) NOT NULL, "source" VARCHAR(20) NOT NULL, "source_id" VARCHAR(30), "class_type" VARCHAR(50) NOT NULL, "data" JSON)' ) migrator.sql('CREATE INDEX IF NOT EXISTS "timeline_camera" ON "timeline" ("camera")') migrator.sql('CREATE INDEX IF NOT EXISTS "timeline_source" ON "timeline" ("source")')