From 95cc472037fcb3207b510e67f1a44af4e2a2cae9 Mon Sep 17 00:00:00 2001 From: Ellie Huxtable Date: Thu, 18 Apr 2024 16:41:28 +0100 Subject: chore: move crates into crates/ dir (#1958) I'd like to tidy up the root a little, and it's nice to have all the rust crates in one place --- atuin-server/src/handlers/mod.rs | 58 ---------------------------------------- 1 file changed, 58 deletions(-) delete mode 100644 atuin-server/src/handlers/mod.rs (limited to 'atuin-server/src/handlers/mod.rs') diff --git a/atuin-server/src/handlers/mod.rs b/atuin-server/src/handlers/mod.rs deleted file mode 100644 index 50f82336..00000000 --- a/atuin-server/src/handlers/mod.rs +++ /dev/null @@ -1,58 +0,0 @@ -use atuin_common::api::{ErrorResponse, IndexResponse}; -use atuin_server_database::Database; -use axum::{extract::State, http, response::IntoResponse, Json}; - -use crate::router::AppState; - -pub mod history; -pub mod record; -pub mod status; -pub mod user; -pub mod v0; - -const VERSION: &str = env!("CARGO_PKG_VERSION"); - -pub async fn index(state: State>) -> Json { - let homage = r#""Through the fathomless deeps of space swims the star turtle Great A'Tuin, bearing on its back the four giant elephants who carry on their shoulders the mass of the Discworld." -- Sir Terry Pratchett"#; - - // Error with a -1 response - // It's super unlikely this will happen - let count = state.database.total_history().await.unwrap_or(-1); - - Json(IndexResponse { - homage: homage.to_string(), - version: VERSION.to_string(), - total_history: count, - }) -} - -impl<'a> IntoResponse for ErrorResponseStatus<'a> { - fn into_response(self) -> axum::response::Response { - (self.status, Json(self.error)).into_response() - } -} - -pub struct ErrorResponseStatus<'a> { - pub error: ErrorResponse<'a>, - pub status: http::StatusCode, -} - -pub trait RespExt<'a> { - fn with_status(self, status: http::StatusCode) -> ErrorResponseStatus<'a>; - fn reply(reason: &'a str) -> Self; -} - -impl<'a> RespExt<'a> for ErrorResponse<'a> { - fn with_status(self, status: http::StatusCode) -> ErrorResponseStatus<'a> { - ErrorResponseStatus { - error: self, - status, - } - } - - fn reply(reason: &'a str) -> ErrorResponse { - Self { - reason: reason.into(), - } - } -} -- cgit v1.3.1