From 47e09a99f86835d0c859ce7384b522027db2347a Mon Sep 17 00:00:00 2001
From: Nick Mowen <nickmowen213@gmail.com>
Date: Sat, 12 Mar 2022 16:34:51 -0700
Subject: [PATCH] Undo null

---
 frigate/events.py               | 4 ++++
 frigate/http.py                 | 7 +++++--
 frigate/models.py               | 2 +-
 migrations/008_add_sub_label.py | 2 +-
 4 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/frigate/events.py b/frigate/events.py
index b90204361..b05f997fb 100644
--- a/frigate/events.py
+++ b/frigate/events.py
@@ -79,6 +79,8 @@ class EventProcessor(threading.Thread):
                         area=event_data["area"],
                         has_clip=event_data["has_clip"],
                         has_snapshot=event_data["has_snapshot"],
+                        sub_label="",
+                        retain_indefinitely=False,
                     ).execute()
 
             elif event_type == "end":
@@ -98,6 +100,8 @@ class EventProcessor(threading.Thread):
                         area=event_data["area"],
                         has_clip=event_data["has_clip"],
                         has_snapshot=event_data["has_snapshot"],
+                        sub_label="",
+                        retain_indefinitely=False,
                     ).execute()
 
                 del self.events_in_process[event_data["id"]]
diff --git a/frigate/http.py b/frigate/http.py
index a6eb516ba..ef000d410 100644
--- a/frigate/http.py
+++ b/frigate/http.py
@@ -167,9 +167,12 @@ def set_sub_label(id):
     else:
         new_sub_label = ""
 
+    print(f'Check before {event.sub_label}')
+
     if new_sub_label:
         event.sub_label = new_sub_label
-        event.save()
+        something = event.save()
+        print(f'Set sub_label to {new_sub_label} verify {event.sub_label} and {something}')
         return make_response(
             jsonify({"success": True, "message": "Event " + id + " sub label set to " + new_sub_label}), 200
         )
@@ -187,7 +190,7 @@ def delete_sub_label(id):
             jsonify({"success": False, "message": "Event " + id + " not found"}), 404
         )
 
-    event.sub_label = None
+    event.sub_label = ""
     event.save()
     return make_response(
         jsonify({"success": True, "message": "Event " + id + " sub label removed"}), 200
diff --git a/frigate/models.py b/frigate/models.py
index 857d88eb3..adbb10223 100644
--- a/frigate/models.py
+++ b/frigate/models.py
@@ -6,7 +6,7 @@ from playhouse.sqlite_ext import *
 class Event(Model):
     id = CharField(null=False, primary_key=True, max_length=30)
     label = CharField(index=True, max_length=20)
-    sub_label = CharField(index=True, max_length=12, default=None, null=True),
+    sub_label = CharField(max_length=20, default="")
     camera = CharField(index=True, max_length=20)
     start_time = DateTimeField()
     end_time = DateTimeField()
diff --git a/migrations/008_add_sub_label.py b/migrations/008_add_sub_label.py
index 442355034..cd0483ad4 100644
--- a/migrations/008_add_sub_label.py
+++ b/migrations/008_add_sub_label.py
@@ -38,7 +38,7 @@ SQL = pw.SQL
 def migrate(migrator, database, fake=False, **kwargs):
     migrator.add_fields(
         Event,
-        sub_label=pw.CharField(default=None, null=True),
+        sub_label=pw.CharField(max_length=20, default=""),
     )