From ca279967041789be3900c33cc6af7cdcaa7ce4d1 Mon Sep 17 00:00:00 2001 From: Nick Mowen Date: Fri, 9 Jun 2023 08:58:00 -0600 Subject: [PATCH] Fix more --- frigate/events/cleanup.py | 10 +++++----- frigate/http.py | 6 +++--- frigate/storage.py | 2 +- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/frigate/events/cleanup.py b/frigate/events/cleanup.py index ada45e6fa..43fb5f8dc 100644 --- a/frigate/events/cleanup.py +++ b/frigate/events/cleanup.py @@ -52,7 +52,7 @@ class EventCleanup(threading.Thread): Event.camera.not_in(self.camera_keys), Event.start_time < expire_after, Event.label == event.label, - Event.retain_indefinitely is False, + Event.retain_indefinitely == False, ) # delete the media from disk for event in expired_events: @@ -72,7 +72,7 @@ class EventCleanup(threading.Thread): Event.camera.not_in(self.camera_keys), Event.start_time < expire_after, Event.label == event.label, - Event.retain_indefinitely is False, + Event.retain_indefinitely == False, ) update_query.execute() @@ -101,7 +101,7 @@ class EventCleanup(threading.Thread): Event.camera == name, Event.start_time < expire_after, Event.label == event.label, - Event.retain_indefinitely is False, + Event.retain_indefinitely == False, ) # delete the grabbed clips from disk for event in expired_events: @@ -120,7 +120,7 @@ class EventCleanup(threading.Thread): Event.camera == name, Event.start_time < expire_after, Event.label == event.label, - Event.retain_indefinitely is False, + Event.retain_indefinitely == False, ) update_query.execute() @@ -167,7 +167,7 @@ class EventCleanup(threading.Thread): # drop events from db where has_clip and has_snapshot are false delete_query = Event.delete().where( - Event.has_clip is False, Event.has_snapshot is False + Event.has_clip == False, Event.has_snapshot == False ) delete_query.execute() diff --git a/frigate/http.py b/frigate/http.py index 7ee4c7f43..b4813c1f2 100644 --- a/frigate/http.py +++ b/frigate/http.py @@ -591,7 +591,7 @@ def event_snapshot(id): event_complete = False jpg_bytes = None try: - event = Event.get(Event.id == id, Event.end_time is not None) + event = Event.get(Event.id == id, Event.end_time != None) event_complete = True if not event.has_snapshot: return "Snapshot not available", 404 @@ -643,7 +643,7 @@ def label_snapshot(camera_name, label): event_query = ( Event.select() .where(Event.camera == camera_name) - .where(Event.has_snapshot is True) + .where(Event.has_snapshot == True) .order_by(Event.start_time.desc()) ) else: @@ -651,7 +651,7 @@ def label_snapshot(camera_name, label): Event.select() .where(Event.camera == camera_name) .where(Event.label == label) - .where(Event.has_snapshot is True) + .where(Event.has_snapshot == True) .order_by(Event.start_time.desc()) ) diff --git a/frigate/storage.py b/frigate/storage.py index 6cdd54bdc..a7986752b 100644 --- a/frigate/storage.py +++ b/frigate/storage.py @@ -107,7 +107,7 @@ class StorageMaintainer(threading.Thread): retained_events: Event = ( Event.select() .where( - Event.retain_indefinitely is True, + Event.retain_indefinitely == True, Event.has_clip, ) .order_by(Event.start_time.asc())