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

WIP: image processing library (or libraries?) #12

Draft
schrottkatze wants to merge 15 commits from schrottkatze/iowo:proc-libs into main
pull from: schrottkatze/iowo:proc-libs
merge into: katzen-cafe:main
Conversation 3 Commits 15 Files changed 20 +10 -5
1 changed files with 10 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit 6d318aa7c9 - Show all commits

15
crates/app/src/config.rs
View file

@ -14,11 +14,16 @@ pub struct Config {
impl Config { impl Config {
/// Get the configs from all possible places (args, file, env...) /// Get the configs from all possible places (args, file, env...)
pub fn read(args: &CliConfigs) -> Self { pub fn read(args: &CliConfigs) -> Self {
let config = if let Some(config) = &args.config_path { // let config = if let Some(config) = &args.config_path {
Ok(config.clone()) // Ok(config.clone())
} else { // } else {
find_config_file() // find_config_file()
}; // };
let config = args
.config_path
.clone()
.ok_or(())
.or_else(|()| find_config_file());
// try to read a maybe existing config file // try to read a maybe existing config file
let config = config.ok().and_then(|path| { let config = config.ok().and_then(|path| {