Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Improve error checking and handling for recordings export #7647

Merged
merged 3 commits into from Sep 2, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
26 changes: 25 additions & 1 deletion frigate/http.py
Expand Up @@ -1617,7 +1617,31 @@ def vod_event(id):
methods=["POST"],
)
def export_recording(camera_name: str, start_time, end_time):
playback_factor = request.get_json(silent=True).get("playback", "realtime")
if not camera_name or not current_app.frigate_config.cameras.get(camera_name):
return make_response(
jsonify(
{"success": False, "message": f"{camera_name} is not a valid camera."}
),
404,
)

json: dict[str, any] = request.get_json(silent=True) or {}
playback_factor = json.get("playback", "realtime")

recordings_count = (
Recordings.select()
.where(
Recordings.start_time.between(start_time, end_time)
| Recordings.end_time.between(start_time, end_time)
| ((start_time > Recordings.start_time) & (end_time < Recordings.end_time))
)
.where(Recordings.camera == camera_name)
.count()
)

if recordings_count <= 0:
return "No recordings found for time range", 400

exporter = RecordingExporter(
current_app.frigate_config,
camera_name,
Expand Down
12 changes: 9 additions & 3 deletions web/src/routes/Export.jsx
Expand Up @@ -52,11 +52,17 @@ export default function Export() {

axios
.post(`export/${camera}/start/${start}/end/${end}`, { playback })
.then(() => {
setMessage({ text: 'Successfully started export. View the file in the /exports folder.', error: false });
.then((response) => {
if (response.status == 200) {
setMessage({ text: 'Successfully started export. View the file in the /exports folder.', error: false });
}
})
.catch((error) => {
setMessage({ text: `Failed to start export: ${error.response.data.message}`, error: true });
if (error.response) {
setMessage({ text: `Failed to start export: ${error.response.data.message}`, error: true });
} else {
setMessage({ text: `Failed to start export: ${error.message}`, error: true });
}
});
};

Expand Down