kiril/kovachev-bot-2
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

refactor: Use Result::or to simplify setup() control flow

Browse Source
This commit is contained in:
Kiril Kovachev 2025-05-08 01:50:35 +01:00
parent fa1e646f01
commit 874506a5de
1 changed files with 8 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/main.rs
View File

@ -42,7 +42,7 @@ enum Action {
} }
fn setup(args: SetupArgs) -> Result<(), std::io::Error> { fn setup(args: SetupArgs) -> Result<(), std::io::Error> {
if let Ok(config_template) = std::fs::read_to_string(CONFIG_TEMPLATE_PATH) { let config_template = std::fs::read_to_string(CONFIG_TEMPLATE_PATH).or(Err(std::io::Error::new(std::io::ErrorKind::NotFound, format!("Unable to find {}; did you execute the script from the same directory?", CONFIG_TEMPLATE_PATH))))?;
let filled_in_config = formatx!(config_template, args.api_url, args.rest_url, args.username, args.botpassword, args.oauth2_token).unwrap(); let filled_in_config = formatx!(config_template, args.api_url, args.rest_url, args.username, args.botpassword, args.oauth2_token).unwrap();
let path = shellexpand::tilde(BOT_CONFIG_PATH).into_owned(); let path = shellexpand::tilde(BOT_CONFIG_PATH).into_owned();
std::fs::write(&path, filled_in_config).unwrap(); std::fs::write(&path, filled_in_config).unwrap();
@ -51,9 +51,6 @@ fn setup(args: SetupArgs) -> Result<(), std::io::Error> {
std::fs::set_permissions(path, std::fs::Permissions::from_mode(0o600))?; std::fs::set_permissions(path, std::fs::Permissions::from_mode(0o600))?;
} }
Ok(()) Ok(())
} else {
Err(std::io::Error::new(std::io::ErrorKind::NotFound, format!("Unable to find {}; did you execute the script from the same directory?", CONFIG_TEMPLATE_PATH)))
}
} }
#[tokio::main] #[tokio::main]