mirror of
https://github.com/blakeblackshear/frigate.git
synced 2026-02-02 09:15:22 +03:00
Fix bug with label not working
This commit is contained in:
parent
6422d13d64
commit
d2b0fbaf93
@ -367,30 +367,38 @@ def latest(camera_name, label):
|
|||||||
resize_quality = request.args.get("quality", default=70, type=int)
|
resize_quality = request.args.get("quality", default=70, type=int)
|
||||||
|
|
||||||
if camera_name in current_app.frigate_config.cameras:
|
if camera_name in current_app.frigate_config.cameras:
|
||||||
|
if label is "any":
|
||||||
event_query = (
|
event_query = (
|
||||||
Event.select()
|
Event.select()
|
||||||
.where(Event.camera == camera_name)
|
.where(Event.camera == camera_name)
|
||||||
.where(Event.has_snapshot == True)
|
.where(Event.has_snapshot == True)
|
||||||
.where(Event.end_time != None)
|
.where(Event.end_time != None)
|
||||||
|
.order_by(Event.start_time.desc())
|
||||||
|
)
|
||||||
|
else:
|
||||||
|
event_query = (
|
||||||
|
Event.select()
|
||||||
|
.where(Event.camera == camera_name)
|
||||||
|
.where(Event.label == label)
|
||||||
|
.where(Event.has_snapshot == True)
|
||||||
|
.where(Event.end_time != None)
|
||||||
|
.order_by(Event.start_time.desc())
|
||||||
)
|
)
|
||||||
|
|
||||||
if label != "any":
|
try:
|
||||||
event_query.where(Event.label == label)
|
event = event_query.get()
|
||||||
|
|
||||||
event = event_query.order_by(Event.start_time.desc()).get()
|
|
||||||
|
|
||||||
if event is None:
|
|
||||||
return "No event for {} was found".format(label), 404
|
|
||||||
|
|
||||||
# read snapshot from disk
|
# read snapshot from disk
|
||||||
frame = cv2.imread(
|
frame = cv2.imread(
|
||||||
os.path.join(CLIPS_DIR, f"{event.camera}-{event.id}-clean.png")
|
os.path.join(CLIPS_DIR, f"{event.camera}-{event.id}-clean.png")
|
||||||
)
|
)
|
||||||
|
except DoesNotExist:
|
||||||
|
event = None
|
||||||
|
frame = np.zeros((720, 1280, 3), np.uint8)
|
||||||
|
|
||||||
crop = bool(request.args.get("crop", 0, type=int))
|
crop = bool(request.args.get("crop", 0, type=int))
|
||||||
if crop:
|
if crop:
|
||||||
box_size = 300
|
box_size = 300
|
||||||
box = event.box
|
box = event.box if event is not None else (0, 0, box_size, box_size)
|
||||||
region = calculate_region(
|
region = calculate_region(
|
||||||
frame.shape,
|
frame.shape,
|
||||||
box[0],
|
box[0],
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user