administrator/frigate
1
0
Fork 0
mirror of https://github.com/blakeblackshear/frigate.git synced 2026-02-02 17:25:22 +03:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Undo null

Browse Source
This commit is contained in:
Nick Mowen 2022-03-12 16:34:51 -07:00
parent 7977e78e3d
commit 47e09a99f8
4 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
frigate/events.py
View File

@ -79,6 +79,8 @@ class EventProcessor(threading.Thread):
area=event_data["area"], area=event_data["area"],
has_clip=event_data["has_clip"], has_clip=event_data["has_clip"],
has_snapshot=event_data["has_snapshot"], has_snapshot=event_data["has_snapshot"],
sub_label="",
retain_indefinitely=False,
).execute() ).execute()
elif event_type == "end": elif event_type == "end":
@ -98,6 +100,8 @@ class EventProcessor(threading.Thread):
area=event_data["area"], area=event_data["area"],
has_clip=event_data["has_clip"], has_clip=event_data["has_clip"],
has_snapshot=event_data["has_snapshot"], has_snapshot=event_data["has_snapshot"],
sub_label="",
retain_indefinitely=False,
).execute() ).execute()
del self.events_in_process[event_data["id"]] del self.events_in_process[event_data["id"]]

7
frigate/http.py
View File

@ -167,9 +167,12 @@ def set_sub_label(id):
else: else:
new_sub_label = "" new_sub_label = ""
print(f'Check before {event.sub_label}')
if new_sub_label: if new_sub_label:
event.sub_label = 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( return make_response(
jsonify({"success": True, "message": "Event " + id + " sub label set to " + new_sub_label}), 200 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 jsonify({"success": False, "message": "Event " + id + " not found"}), 404
) )
event.sub_label = None event.sub_label = ""
event.save() event.save()
return make_response( return make_response(
jsonify({"success": True, "message": "Event " + id + " sub label removed"}), 200 jsonify({"success": True, "message": "Event " + id + " sub label removed"}), 200

2
frigate/models.py
View File

@ -6,7 +6,7 @@ from playhouse.sqlite_ext import *
class Event(Model): class Event(Model):
id = CharField(null=False, primary_key=True, max_length=30) id = CharField(null=False, primary_key=True, max_length=30)
label = CharField(index=True, max_length=20) 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) camera = CharField(index=True, max_length=20)
start_time = DateTimeField() start_time = DateTimeField()
end_time = DateTimeField() end_time = DateTimeField()

2
migrations/008_add_sub_label.py
View File

@ -38,7 +38,7 @@ SQL = pw.SQL
def migrate(migrator, database, fake=False, **kwargs): def migrate(migrator, database, fake=False, **kwargs):
migrator.add_fields( migrator.add_fields(
Event, Event,
sub_label=pw.CharField(default=None, null=True), sub_label=pw.CharField(max_length=20, default=""),
) )