From 188b2028362f9ff22200616bec06a3dcf62449d5 Mon Sep 17 00:00:00 2001 From: Blake Blackshear Date: Sat, 11 Dec 2021 13:47:59 -0600 Subject: [PATCH] store objects and motion counts in the db --- frigate/models.py | 2 + frigate/record.py | 2 + migrations/006_add_motion_active_objects.py | 47 +++++++++++++++++++++ 3 files changed, 51 insertions(+) create mode 100644 migrations/006_add_motion_active_objects.py diff --git a/frigate/models.py b/frigate/models.py index e933abe90..35a397f5c 100644 --- a/frigate/models.py +++ b/frigate/models.py @@ -27,3 +27,5 @@ class Recordings(Model): start_time = DateTimeField() end_time = DateTimeField() duration = FloatField() + motion = IntegerField(null=True) + objects = IntegerField(null=True) diff --git a/frigate/record.py b/frigate/record.py index 2af5e916a..0d4070d63 100644 --- a/frigate/record.py +++ b/frigate/record.py @@ -284,6 +284,8 @@ class RecordingMaintainer(threading.Thread): start_time=start_time.timestamp(), end_time=end_time.timestamp(), duration=duration, + motion=motion_count, + objects=active_count, ) except Exception as e: logger.error(f"Unable to store recording segment {cache_path}") diff --git a/migrations/006_add_motion_active_objects.py b/migrations/006_add_motion_active_objects.py new file mode 100644 index 000000000..6bd564b8c --- /dev/null +++ b/migrations/006_add_motion_active_objects.py @@ -0,0 +1,47 @@ +"""Peewee migrations -- 004_add_bbox_region_area.py. + +Some examples (model - class or model name):: + + > Model = migrator.orm['model_name'] # Return model in current state by name + + > migrator.sql(sql) # Run custom SQL + > migrator.python(func, *args, **kwargs) # Run python code + > migrator.create_model(Model) # Create a model (could be used as decorator) + > migrator.remove_model(model, cascade=True) # Remove a model + > migrator.add_fields(model, **fields) # Add fields to a model + > migrator.change_fields(model, **fields) # Change fields + > migrator.remove_fields(model, *field_names, cascade=True) + > migrator.rename_field(model, old_field_name, new_field_name) + > migrator.rename_table(model, new_table_name) + > migrator.add_index(model, *col_names, unique=False) + > migrator.drop_index(model, *col_names) + > migrator.add_not_null(model, *field_names) + > migrator.drop_not_null(model, *field_names) + > migrator.add_default(model, field_name, default) + +""" + +import datetime as dt +import peewee as pw +from playhouse.sqlite_ext import * +from decimal import ROUND_HALF_EVEN +from frigate.models import Recordings + +try: + import playhouse.postgres_ext as pw_pext +except ImportError: + pass + +SQL = pw.SQL + + +def migrate(migrator, database, fake=False, **kwargs): + migrator.add_fields( + Recordings, + objects=pw.IntegerField(null=True), + motion=pw.IntegerField(null=True), + ) + + +def rollback(migrator, database, fake=False, **kwargs): + migrator.remove_fields(Recordings, ["objects", "motion"])