Remove redundant if and have should_update_db include clip or snapshot requirement.

This commit is contained in:
Nick Mowen 2022-03-13 12:58:53 -06:00
parent 985c57aded
commit 745e7b22af

View File

@ -15,18 +15,21 @@ from frigate.models import Event
logger = logging.getLogger(__name__)
def should_insert_db(prev_event, current_event):
"""If current event has new clip or snapshot."""
return (
(not prev_event["has_clip"] and not prev_event["has_snapshot"])
and (current_event["has_clip"] or current_event["has_snapshot"])
)
def should_update_db(prev_event, current_event):
"""If current_event has updated fields and (clip or snapshot)."""
return (
prev_event["top_score"] != current_event["top_score"]
(current_event["has_clip"] or current_event["has_snapshot"])
and (prev_event["top_score"] != current_event["top_score"]
or prev_event["entered_zones"] != current_event["entered_zones"]
or prev_event["thumbnail"] != current_event["thumbnail"]
or prev_event["has_clip"] != current_event["has_clip"]
or prev_event["has_snapshot"] != current_event["has_snapshot"]
or prev_event["has_snapshot"] != current_event["has_snapshot"])
)
@ -68,7 +71,6 @@ class EventProcessor(threading.Thread):
):
self.events_in_process[event_data["id"]] = event_data
# TODO: this will generate a lot of db activity possibly
if event_data["has_clip"] or event_data["has_snapshot"]:
Event.insert(
id=event_data["id"],
label=event_data["label"],
@ -91,7 +93,6 @@ class EventProcessor(threading.Thread):
):
self.events_in_process[event_data["id"]] = event_data
# TODO: this will generate a lot of db activity possibly
if event_data["has_clip"] or event_data["has_snapshot"]:
Event.update(
label=event_data["label"],
camera=camera,