grenade/cull-gmail
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

🐛 fix(cli): load config file only if it exists

Browse Source 
- only load config file if it exists
- prevents error when config file is not present
This commit is contained in:
Jeremiah Russell
2025-10-22 17:30:57 +01:00
committed by Jeremiah Russell
parent 2af6df145f
commit c1f7cf859a
1 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/cli/main.rs
View File

@@ -428,17 +428,19 @@ fn get_config() -> Result<(Config, ClientConfig)> {
let path = home_dir.join(".cull-gmail/cull-gmail.toml"); let path = home_dir.join(".cull-gmail/cull-gmail.toml");
log::info!("Loading config from {}", path.display()); log::info!("Loading config from {}", path.display());
let config_file = config::File::with_name(path.to_path_buf().to_str().unwrap()); let mut config_builder = config::Config::builder()
// let config_file = config_file.required(false);
log::info!("Optional Config file {config_file:?}");
let configurations = config::Config::builder()
.set_default("credential_file", "credential.json")? .set_default("credential_file", "credential.json")?
.set_default("config_root", "h:.cull-gmail")? .set_default("config_root", "h:.cull-gmail")?
.set_default("rules", "rules.toml")? .set_default("rules", "rules.toml")?
.set_default("execute", true)? .set_default("execute", true)?
.set_default("token_cache_env", "CULL_GMAIL_TOKEN_CACHE")? .set_default("token_cache_env", "CULL_GMAIL_TOKEN_CACHE")?;
.add_source(config_file)
if path.exists() {
let config_file = config::File::with_name(path.to_path_buf().to_str().unwrap());
log::info!("Config file {config_file:?}");
config_builder = config_builder.add_source(config_file);
}
let configurations = config_builder
.add_source(config::Environment::with_prefix("APP")) .add_source(config::Environment::with_prefix("APP"))
.build()?; .build()?;