From a1475e40fc3b50644047526dbb4b596292cf9766 Mon Sep 17 00:00:00 2001 From: dusk Date: Sat, 2 Nov 2024 13:12:37 +0300 Subject: [PATCH] refactor: minor get_conf improvement --- src/main.rs | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/src/main.rs b/src/main.rs index 4113a64..68966a9 100644 --- a/src/main.rs +++ b/src/main.rs @@ -21,7 +21,7 @@ mod error; #[tokio::main] async fn main() { - let arts_file_path = get_conf("ARTS_PATH").unwrap_or_else(|| "./utils/arts.txt".to_string()); + let arts_file_path = get_conf("ARTS_PATH", "./utils/arts.txt"); let arts = std::fs::read_to_string(&arts_file_path).unwrap(); let state = AppState::new(Data::parse(&arts).unwrap()); @@ -87,12 +87,10 @@ const BODY_STYLE: &str = const ABOUT_STYLE: &str = "font-size: 1vmax; color: #ffffff;"; fn get_page_head_common() -> PreEscaped { - let title = get_conf("SITE_TITLE").unwrap_or_else(|| "random project moon art".to_string()); - let embed_title = - get_conf("EMBED_TITLE").unwrap_or_else(|| "random project moon art".to_string()); - let embed_content = - get_conf("EMBED_DESC").unwrap_or_else(|| "random project moon art".to_string()); - let embed_color = get_conf("EMBED_COLOR").unwrap_or_else(|| "#ffffff".to_string()); + let title = get_conf("SITE_TITLE", "random project moon art"); + let embed_title = get_conf("EMBED_TITLE", "random project moon art"); + let embed_content = get_conf("EMBED_DESC", "random project moon art"); + let embed_color = get_conf("EMBED_COLOR", "#ffffff"); maud::html! { meta charset="utf8"; @@ -292,8 +290,8 @@ async fn _fetch_twitter_image_link(http: &reqwest::Client, url: &Uri) -> AppResu }) } -fn get_conf(name: &str) -> Option { - std::env::var(name).ok() +fn get_conf(name: &str, default: &str) -> String { + std::env::var(name).unwrap_or_else(|_| default.to_owned()) } struct InternalAppState {