katzen-cafe/iowo
2
4
Fork 1
Code Issues 4 Pull requests 2 Projects Releases Packages Wiki Activity

start working on a cli app #7

Merged
schrottkatze merged 12 commits from :app into main 2024-01-20 19:09:52 +00:00
Conversation 5 Commits 12 Files changed 12 +30 -11
2 changed files with 30 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit 6006f92d9c - Show all commits

39
crates/app/src/config.rs
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),
multisamplednight marked this conversation as resolved Outdated
multisamplednight commented 2024-01-12 15:07:04 +00:00
Outdated
Review
Copy link

For later, not now: Should use proper error handling.

For later, not now: Should use proper error handling.
schrottkatze commented 2024-01-12 19:36:26 +00:00
Outdated
Review
Copy link

put that on the non-existing todo list for when we have a proper error handling and reporting system

put that on the non-existing todo list for when we have a proper error handling and reporting system
}
} else {
Self {
startup_msg: !args.no_startup_message,
}
}
} }
} }

2
crates/app/src/main.rs
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 {
multisamplednight marked this conversation as resolved Outdated
multisamplednight commented 2024-01-12 15:05:31 +00:00
Outdated
Review
Copy link

Might want to streamline those two, in order to avoid accidentally checking only one of them in future.

The figment crate might be worth looking at in that case.

Might want to streamline those two, in order to avoid accidentally checking only one of them in future. The `figment` crate might be worth looking at in that case.
schrottkatze commented 2024-01-12 19:39:34 +00:00
Outdated
Review
Copy link

i'd prefer to try at least to some degree reduce dependencies, but i'll work on something like that then

i'd prefer to try at least to some degree reduce dependencies, but i'll work on something like that then
multisamplednight commented 2024-01-12 20:54:55 +00:00
Outdated
Review
Copy link

You don't need to use figment. Custom merge logic works fine, too.

You don't _need_ to use `figment`. Custom merge logic works fine, too.
print_startup_msg(); print_startup_msg();