From 282149e2a25fafdff776b003f8010ea403ad3907 Mon Sep 17 00:00:00 2001 From: Amneesh Singh Date: Wed, 23 Nov 2022 23:43:30 +0530 Subject: [PATCH] add env_title for site title Signed-off-by: Amneesh Singh --- src/main.rs | 21 ++++++++++----------- 1 file changed, 10 insertions(+), 11 deletions(-) diff --git a/src/main.rs b/src/main.rs index 6aafb79..c1cc753 100644 --- a/src/main.rs +++ b/src/main.rs @@ -33,7 +33,8 @@ enum RData { #[post("/", data = "")] async fn post_file(mut upload: Form>) -> (Status, RData) { - if env_use_key() && env_key() != upload.key { + let key = env_key(); + if !key.is_empty() && key != upload.key { return ( Status::BadRequest, RData::Raw(String::from("key not found in the header")), @@ -96,7 +97,7 @@ fn index() -> RawHtml { - nattofiles + {title} @@ -126,7 +127,8 @@ fn index() -> RawHtml { "#, - user_url = env_user_url() + user_url = env_user_url(), + title = env_title() )) } @@ -134,15 +136,8 @@ fn env_root_dir() -> String { env::var("ROOT_DIR").unwrap_or(String::from("/var/files")) } -fn env_use_key() -> bool { - env::var("USE_KEY") - .unwrap_or(String::from("false")) - .parse::() - .unwrap_or(false) -} - fn env_key() -> String { - env::var("KEY").expect("KEY not set in the environment") + env::var("KEY").unwrap_or(String::new()) } fn env_user_url() -> String { @@ -154,6 +149,10 @@ fn env_user_url() -> String { )) } +fn env_title() -> String { + env::var("TITLE").unwrap_or(String::from("Simpler Filehost")) +} + fn env_cors() -> bool { env::var("USE_CORS") .unwrap_or(String::from("false"))