Skip to content

have /calc/path return an enum #6

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.

Sign up for GitHub

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

Draft
shish wants to merge 1 commit into
base: main
Choose a base branch
from
Draft

have /calc/path return an enum #6

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 17 additions & 10 deletions backend/web.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -142,9 +142,15 @@ struct PathStep {
to: WebStar,
}
#[derive(Debug, Serialize)]
enum PathResult {
Found(Vec<PathStep>),
Timeout,
NotFound,
}
#[derive(Debug, Serialize)]
struct PathReturn {
version: u32,
data: Vec<PathStep>,
data: PathResult,
}

#[get("/path?<start>&<end>&<jump>&<optimize>&<use_smart_gates>")]
Expand Down Expand Up @@ -203,17 +209,18 @@ fn calc_path(
last_id = conn.target;
}
Ok(Json(PathReturn {
version: 2,
data: result,
version: 3,
data: PathResult::Found(result),
}))
}
eftb::calc::path::PathResult::NotFound => {
Err(CustomError(Status::NotFound, format!("No path found")))
}
eftb::calc::path::PathResult::Timeout => Err(CustomError(
Status::InternalServerError,
format!("Path calculation timed out"),
)),
eftb::calc::path::PathResult::Timeout => Ok(Json(PathReturn {
version: 3,
data: PathResult::Timeout,
})),
eftb::calc::path::PathResult::NotFound => Ok(Json(PathReturn {
version: 3,
data: PathResult::NotFound,
})),
}
}

Expand Down