Mirrors/blakeblackshear.frigate
1
0
Fork 0
mirror of https://github.com/blakeblackshear/frigate.git synced 2024-11-26 19:06:11 +01:00
Code Issues Projects Releases Wiki Activity

Fix None filter for sub labels (#4981)

Browse Source
This commit is contained in:
Nicolas Mowen 2023-01-09 18:44:26 -07:00 committed by GitHub
parent e79eab711a
commit d49359e26a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
frigate/http.py
View File

@ -602,8 +602,13 @@ def events():
# for example a sub label 'bob' would get events # for example a sub label 'bob' would get events
# with sub labels 'bob' and 'bob, john' # with sub labels 'bob' and 'bob, john'
sub_label_clauses = [] sub_label_clauses = []
filtered_sub_labels = sub_labels.split(",")
for label in sub_labels.split(","): if "None" in filtered_sub_labels:
filtered_sub_labels.remove("None")
sub_label_clauses.append((Event.sub_label.is_null()))
for label in filtered_sub_labels:
sub_label_clauses.append((Event.sub_label.cast("text") % f"*{label}*")) sub_label_clauses.append((Event.sub_label.cast("text") % f"*{label}*"))
sub_label_clause = reduce(operator.or_, sub_label_clauses) sub_label_clause = reduce(operator.or_, sub_label_clauses)
@ -613,8 +618,13 @@ def events():
# use matching so events with multiple zones # use matching so events with multiple zones
# still match on a search where any zone matches # still match on a search where any zone matches
zone_clauses = [] zone_clauses = []
filtered_zones = zones.split(",")
for zone in zones.split(","): if "None" in filtered_zones:
filtered_zones.remove("None")
zone_clauses.append((Event.zones.length() == 0))
for zone in filtered_zones:
zone_clauses.append((Event.zones.cast("text") % f'*"{zone}"*')) zone_clauses.append((Event.zones.cast("text") % f'*"{zone}"*'))
zone_clause = reduce(operator.or_, zone_clauses) zone_clause = reduce(operator.or_, zone_clauses)