diff options
Diffstat (limited to 'atuin-server/src')
-rw-r--r-- | atuin-server/src/database.rs | 2 | ||||
-rw-r--r-- | atuin-server/src/router.rs | 7 | ||||
-rw-r--r-- | atuin-server/src/settings.rs | 5 |
3 files changed, 8 insertions, 6 deletions
diff --git a/atuin-server/src/database.rs b/atuin-server/src/database.rs index 5945baaf..4a3828d0 100644 --- a/atuin-server/src/database.rs +++ b/atuin-server/src/database.rs @@ -40,6 +40,8 @@ impl Postgres { .connect(uri) .await?; + sqlx::migrate!("./migrations").run(&pool).await?; + Ok(Self { pool }) } } diff --git a/atuin-server/src/router.rs b/atuin-server/src/router.rs index d106068d..ffab74e5 100644 --- a/atuin-server/src/router.rs +++ b/atuin-server/src/router.rs @@ -1,7 +1,7 @@ use std::convert::Infallible; use eyre::Result; -use warp::Filter; +use warp::{hyper::StatusCode, Filter}; use atuin_common::api::SyncHistoryRequest; @@ -56,7 +56,7 @@ fn with_user( pub async fn router( settings: &Settings, -) -> Result<impl Filter<Extract = impl warp::Reply, Error = warp::Rejection> + Clone> { +) -> Result<impl Filter<Extract = impl warp::Reply, Error = Infallible> + Clone> { let postgres = Postgres::new(settings.db_uri.as_str()).await?; let index = warp::get().and(warp::path::end()).map(handlers::index); @@ -115,7 +115,8 @@ pub async fn router( .or(add_history) .or(user) .or(register) - .or(login), + .or(login) + .or(warp::any().map(|| warp::reply::with_status("☕", StatusCode::IM_A_TEAPOT))), ) .with(warp::filters::log::log("atuin::api")); diff --git a/atuin-server/src/settings.rs b/atuin-server/src/settings.rs index e51b6b2a..7364656e 100644 --- a/atuin-server/src/settings.rs +++ b/atuin-server/src/settings.rs @@ -3,7 +3,6 @@ use std::io::prelude::*; use std::path::PathBuf; use config::{Config, Environment, File as ConfigFile}; -use directories::ProjectDirs; use eyre::{eyre, Result}; pub const HISTORY_PAGE_SIZE: i64 = 100; @@ -18,8 +17,8 @@ pub struct Settings { impl Settings { pub fn new() -> Result<Self> { - let config_dir = ProjectDirs::from("com", "elliehuxtable", "atuin").unwrap(); - let config_dir = config_dir.config_dir(); + let config_dir = atuin_common::utils::config_dir(); + let config_dir = config_dir.as_path(); create_dir_all(config_dir)?; |