app: better? config error handling

This commit is contained in:
Schrottkatze 2024-01-19 08:54:36 +01:00
parent 7c9dca0ae2
commit 6006f92d9c
Signed by: schrottkatze
GPG key ID: DFD0FD205943C14A
2 changed files with 30 additions and 11 deletions

View file

@ -3,7 +3,6 @@ use clap::Parser;
use self::{ use self::{
cli::Args, cli::Args,
config_file::{find_config_file, Configs}, config_file::{find_config_file, Configs},
error::ConfigError,
}; };
mod cli; mod cli;
@ -15,20 +14,40 @@ pub struct Config {
} }
impl Config { impl Config {
pub fn read() -> Result<Self, ConfigError> { pub fn read() -> Self {
let args = Args::parse(); let args = Args::parse();
let config_path = if let Some(config_path) = args.config_path { let config_path = if let Some(config_path) = args.config_path {
config_path Ok(config_path)
} else { } else {
find_config_file()? find_config_file()
}; };
let file_config = Configs::read(config_path)?;
Ok(Self { let file_config = if let Ok(config_path) = config_path {
// this is negated because to an outward api, the negative is more intuitive, let file_config = Configs::read(config_path);
// while in the source the other way around is more intuitive
startup_msg: !(args.no_startup_message || file_config.no_startup_message), match file_config {
}) Ok(c) => Some(c),
Err(e) => {
eprintln!("Config error: {e:?}");
eprintln!("Proceeding with defaults or cli args...");
None
}
}
} else {
None
};
if let Some(file_config) = file_config {
Self {
// this is negated because to an outward api, the negative is more intuitive,
// while in the source the other way around is more intuitive
startup_msg: !(args.no_startup_message || file_config.no_startup_message),
}
} else {
Self {
startup_msg: !args.no_startup_message,
}
}
} }
} }

View file

@ -9,7 +9,7 @@ mod welcome_msg;
fn main() { fn main() {
// TODO: proper error handling // TODO: proper error handling
let cfg = Config::read().unwrap(); let cfg = Config::read();
if cfg.startup_msg { if cfg.startup_msg {
print_startup_msg(); print_startup_msg();