From 4f56b9325f627424f25ddac5c4ba7383df2385e5 Mon Sep 17 00:00:00 2001 From: mitch Date: Sun, 11 Apr 2021 21:43:02 -0400 Subject: [PATCH] prep for pr --- docker/Dockerfile.base | 1 - frigate/http.py | 7 +++++-- web/src/routes/Event.jsx | 4 ---- 3 files changed, 5 insertions(+), 7 deletions(-) diff --git a/docker/Dockerfile.base b/docker/Dockerfile.base index ff071ceda..58f1da912 100644 --- a/docker/Dockerfile.base +++ b/docker/Dockerfile.base @@ -58,6 +58,5 @@ RUN chmod +x /run.sh EXPOSE 5000 EXPOSE 1935 -EXPOSE 5678 CMD ["/run.sh"] diff --git a/frigate/http.py b/frigate/http.py index 2bb4c7dcf..61d20af1a 100644 --- a/frigate/http.py +++ b/frigate/http.py @@ -191,7 +191,8 @@ def delete_event(id): try: event = Event.get(Event.id == id) except DoesNotExist: - return "Event not found", 404 + return make_response(jsonify({"success": False, "message": "Event" + id + " not found"}),404) + media_name = f"{event.camera}-{event.id}" if event.has_snapshot: @@ -202,8 +203,10 @@ def delete_event(id): media.unlink(missing_ok=True) event.delete_instance() + return make_response(jsonify({"success": True, "message": "Event" + id + " deleted"}),204) + + - return '', 204 @bp.route('/events//thumbnail.jpg') def event_thumbnail(id): diff --git a/web/src/routes/Event.jsx b/web/src/routes/Event.jsx index 962a8272d..9814fea45 100644 --- a/web/src/routes/Event.jsx +++ b/web/src/routes/Event.jsx @@ -31,13 +31,9 @@ export default function Event({ eventId }) { setDeleteStatus(FetchStatus.LOADING); let success; try { - debugger; const response = await fetch(`${apiHost}/api/events/${eventId}`, { method: 'DELETE' }); - debugger; const deleteEvent = await getJSON(response) - debugger; success = deleteEvent.success; - debugger; setDeleteStatus(success ? FetchStatus.LOADED : FetchStatus.ERROR); setDeleteMessage(deleteEvent.message); } catch (e) {