mirror of
https://github.com/blakeblackshear/frigate.git
synced 2026-04-19 23:08:08 +02:00
Remove score sorting constraint (#19501)
Do not require a score filter to be applied in order to sort by object score.
This commit is contained in:
@@ -724,15 +724,24 @@ def events_search(request: Request, params: EventsSearchQueryParams = Depends())
|
||||
|
||||
if (sort is None or sort == "relevance") and search_results:
|
||||
processed_events.sort(key=lambda x: x.get("search_distance", float("inf")))
|
||||
elif min_score is not None and max_score is not None and sort == "score_asc":
|
||||
elif sort == "score_asc":
|
||||
processed_events.sort(key=lambda x: x["data"]["score"])
|
||||
elif min_score is not None and max_score is not None and sort == "score_desc":
|
||||
elif sort == "score_desc":
|
||||
processed_events.sort(key=lambda x: x["data"]["score"], reverse=True)
|
||||
elif min_speed is not None and max_speed is not None and sort == "speed_asc":
|
||||
processed_events.sort(key=lambda x: x["data"]["average_estimated_speed"])
|
||||
elif min_speed is not None and max_speed is not None and sort == "speed_desc":
|
||||
elif sort == "speed_asc":
|
||||
processed_events.sort(
|
||||
key=lambda x: x["data"]["average_estimated_speed"], reverse=True
|
||||
key=lambda x: (
|
||||
x["data"].get("average_estimated_speed") is None,
|
||||
x["data"].get("average_estimated_speed"),
|
||||
)
|
||||
)
|
||||
elif sort == "speed_desc":
|
||||
processed_events.sort(
|
||||
key=lambda x: (
|
||||
x["data"].get("average_estimated_speed") is None,
|
||||
x["data"].get("average_estimated_speed", float("-inf")),
|
||||
),
|
||||
reverse=True,
|
||||
)
|
||||
elif sort == "date_asc":
|
||||
processed_events.sort(key=lambda x: x["start_time"])
|
||||
|
||||
Reference in New Issue
Block a user