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

Fix incorrect respnses (#7066)

Browse Source
This commit is contained in:
Nicolas Mowen 2023-07-07 06:06:42 -06:00 committed by GitHub
parent dd02958f7c
commit 69630e7385
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 41 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

66
frigate/http.py
View File

@ -420,8 +420,8 @@ def get_labels():
else: else:
events = Event.select(Event.label).distinct() events = Event.select(Event.label).distinct()
except Exception as e: except Exception as e:
return jsonify( return make_response(
{"success": False, "message": f"Failed to get labels: {e}"}, "404" jsonify({"success": False, "message": f"Failed to get labels: {e}"}), 404
) )
labels = sorted([e.label for e in events]) labels = sorted([e.label for e in events])
@ -435,8 +435,9 @@ def get_sub_labels():
try: try:
events = Event.select(Event.sub_label).distinct() events = Event.select(Event.sub_label).distinct()
except Exception as e: except Exception as e:
return jsonify( return make_response(
{"success": False, "message": f"Failed to get sub_labels: {e}"}, "404" jsonify({"success": False, "message": f"Failed to get sub_labels: {e}"}),
404,
) )
sub_labels = [e.sub_label for e in events] sub_labels = [e.sub_label for e in events]
@ -869,12 +870,17 @@ def events():
@bp.route("/events/<camera_name>/<label>/create", methods=["POST"]) @bp.route("/events/<camera_name>/<label>/create", methods=["POST"])
def create_event(camera_name, label): def create_event(camera_name, label):
if not camera_name or not current_app.frigate_config.cameras.get(camera_name): if not camera_name or not current_app.frigate_config.cameras.get(camera_name):
return jsonify( return make_response(
{"success": False, "message": f"{camera_name} is not a valid camera."}, 404 jsonify(
{"success": False, "message": f"{camera_name} is not a valid camera."}
),
404,
) )
if not label: if not label:
return jsonify({"success": False, "message": f"{label} must be set."}, 404) return make_response(
jsonify({"success": False, "message": f"{label} must be set."}), 404
)
json: dict[str, any] = request.get_json(silent=True) or {} json: dict[str, any] = request.get_json(silent=True) or {}
@ -892,17 +898,19 @@ def create_event(camera_name, label):
frame, frame,
) )
except Exception as e: except Exception as e:
logger.error(f"The error is {e}") return make_response(
return jsonify( jsonify({"success": False, "message": f"An unknown error occurred: {e}"}),
{"success": False, "message": f"An unknown error occurred: {e}"}, 404 404,
) )
return jsonify( return make_response(
{ jsonify(
"success": True, {
"message": "Successfully created event.", "success": True,
"event_id": event_id, "message": "Successfully created event.",
}, "event_id": event_id,
}
),
200, 200,
) )
@ -915,11 +923,16 @@ def end_event(event_id):
end_time = json.get("end_time", datetime.now().timestamp()) end_time = json.get("end_time", datetime.now().timestamp())
current_app.external_processor.finish_manual_event(event_id, end_time) current_app.external_processor.finish_manual_event(event_id, end_time)
except Exception: except Exception:
return jsonify( return make_response(
{"success": False, "message": f"{event_id} must be set and valid."}, 404 jsonify(
{"success": False, "message": f"{event_id} must be set and valid."}
),
404,
) )
return jsonify({"success": True, "message": "Event successfully ended."}, 200) return make_response(
jsonify({"success": True, "message": "Event successfully ended."}), 200
)
@bp.route("/config") @bp.route("/config")
@ -1621,21 +1634,24 @@ def ffprobe():
path_param = request.args.get("paths", "") path_param = request.args.get("paths", "")
if not path_param: if not path_param:
return jsonify( return make_response(
{"success": False, "message": "Path needs to be provided."}, "404" jsonify({"success": False, "message": "Path needs to be provided."}), 404
) )
if path_param.startswith("camera"): if path_param.startswith("camera"):
camera = path_param[7:] camera = path_param[7:]
if camera not in current_app.frigate_config.cameras.keys(): if camera not in current_app.frigate_config.cameras.keys():
return jsonify( return make_response(
{"success": False, "message": f"{camera} is not a valid camera."}, "404" jsonify(
{"success": False, "message": f"{camera} is not a valid camera."}
),
404,
) )
if not current_app.frigate_config.cameras[camera].enabled: if not current_app.frigate_config.cameras[camera].enabled:
return jsonify( return make_response(
{"success": False, "message": f"{camera} is not enabled."}, "404" jsonify({"success": False, "message": f"{camera} is not enabled."}), 404
) )
paths = map( paths = map(