diff --git a/Cargo.lock b/Cargo.lock index 902c0ea..ff9c5f6 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1332,7 +1332,7 @@ dependencies = [ [[package]] name = "rustpad" -version = "0.0.1-dev" +version = "0.0.2" dependencies = [ "argon2", "axum", diff --git a/src/config.rs b/src/config.rs index bf23bee..0d1c580 100644 --- a/src/config.rs +++ b/src/config.rs @@ -16,26 +16,30 @@ impl Config { pub fn from_env() -> Result> { let host = env_var("APP_HOST", "127.0.0.1").parse()?; let port = env_var("APP_PORT", "3000").parse()?; - let database_max_connections = env_var("DATABASE_MAX_CONNECTIONS", "8").parse()?; - let upload_max_size_mb: usize = env_var("UPLOAD_MAX_SIZE_MB", "20").parse()?; + let database_max_connections = + env_var("DATABASE_MAX_CONNECTIONS", "8").parse()?; + + let upload_max_size_mb: usize = + env_var("UPLOAD_MAX_SIZE_MB", "20").parse()?; + if upload_max_size_mb == 0 { - return Err("UPLOAD_MAX_SIZE_MB > 0".into()); + return Err("UPLOAD_MAX_SIZE_MB must be greater than 0".into()); } Ok(Self { host, port, - database_url: env_var("DATABASE_URL", "sqlite:///data/db/rustpad.db?mode=rwc"), + database_url: env_var( + "DATABASE_URL", + "sqlite:///data/db/rustpad.db?mode=rwc", + ), database_max_connections, static_dir: env_var("STATIC_DIR", "static"), files_dir: env_var("FILES_DIR", "data/files"), upload_max_size_bytes: upload_max_size_mb .checked_mul(1024 * 1024) - .ok_or("UPLOAD_MAX_SIZE_MB to big")?, - asset_version: env::var("ASSET_VERSION") - .ok() - .filter(|value| !value.trim().is_empty()) - .unwrap_or_else(|| env!("CARGO_PKG_VERSION").to_owned()), + .ok_or("UPLOAD_MAX_SIZE_MB is too large")?, + asset_version: env!("CARGO_PKG_VERSION").to_owned(), }) } } diff --git a/static/home.html b/static/home.html index ef5368f..e0d733f 100644 --- a/static/home.html +++ b/static/home.html @@ -58,6 +58,6 @@ - +