Skip to content

Improve error when config file is missing #10

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
DanGould wants to merge 1 commit into
base: master
Choose a base branch
from
Draft

Improve error when config file is missing #10

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
44 changes: 38 additions & 6 deletions payjoin-cli/src/app/config.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -132,11 +132,23 @@ impl Config {

config = handle_subcommands(config, cli)?;

let mut config_file_found = false;
let mut config_file_paths = Vec::new();

if let Some(config_dir) = dirs::config_dir() {
let global_config_path = config_dir.join(CONFIG_DIR).join("config.toml");
if global_config_path.exists() {
config_file_found = true;
}
config_file_paths.push(global_config_path.display().to_string());
config = config.add_source(File::from(global_config_path).required(false));
}

let local_config_path = std::path::Path::new("config.toml");
if local_config_path.exists() {
config_file_found = true;
}
config_file_paths.push("config.toml (current directory)".to_string());
config = config.add_source(File::new("config.toml", FileFormat::Toml).required(false));
let built_config = config.build()?;

Expand Down Expand Up @@ -165,10 +177,20 @@ impl Config {

config.version = Some(VersionConfig::V1(v1))
}
Err(e) =>
Err(e) => {
let hint = if config_file_found {
String::new()
} else {
format!(
"\nNo config file found. Searched: {}. \
Create a config.toml or provide configuration via CLI arguments.",
config_file_paths.join(", ")
)
};
return Err(ConfigError::Message(format!(
"Valid V1 configuration is required for BIP78 mode: {e}"
))),
"Valid V1 configuration is required for BIP78 mode: {e}{hint}"
)));
}
}
}
#[cfg(not(feature = "v1"))]
Expand All @@ -181,10 +203,20 @@ impl Config {
{
match built_config.get::<V2Config>("v2") {
Ok(v2) => config.version = Some(VersionConfig::V2(v2)),
Err(e) =>
Err(e) => {
let hint = if config_file_found {
String::new()
} else {
format!(
"\nNo config file found. Searched: {}. \
Create a config.toml or provide configuration via CLI arguments.",
config_file_paths.join(", ")
)
};
return Err(ConfigError::Message(format!(
"Valid V2 configuration is required for BIP77 mode: {e}"
))),
"Valid V2 configuration is required for BIP77 mode: {e}{hint}"
)));
}
}
}
#[cfg(not(feature = "v2"))]
Expand Down
Loading