simon/brd
Archived
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Do not use log for errors

Browse source
This commit is contained in:
Simon Bruder 2020-06-26 13:43:54 +02:00
parent 5a77d86fe7
commit 7d7fe618f0
No known key found for this signature in database
GPG key ID: 6F03E0000CC5B62F
1 changed files with 3 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
src/main.rs
View file

@ -3,7 +3,7 @@ use std::path::PathBuf;
use anyhow::{anyhow, Result}; use anyhow::{anyhow, Result};
use clap::Clap; use clap::Clap;
use log::{debug, error, info, warn}; use log::{debug, info, warn};
use brd::converter; use brd::converter;
use brd::ddr::ssq::SSQ; use brd::ddr::ssq::SSQ;
@ -79,11 +79,6 @@ struct DDR2osu {
convert: converter::ddr2osu::Config, convert: converter::ddr2osu::Config,
} }
fn error(message: String) -> Result<()> {
error!("{}", message);
Err(anyhow!(message))
}
fn get_basename(path: &PathBuf) -> Option<&str> { fn get_basename(path: &PathBuf) -> Option<&str> {
match path.file_stem() { match path.file_stem() {
Some(stem) => stem.to_str(), Some(stem) => stem.to_str(),
@ -105,7 +100,7 @@ fn main() -> Result<()> {
let entries = match opts.single_entry { let entries = match opts.single_entry {
Some(name) => match wave_bank.sounds.get(&name) { Some(name) => match wave_bank.sounds.get(&name) {
Some(_) => vec![name], Some(_) => vec![name],
None => return error(format!("Entry {} not found in wave bank", name)), None => return Err(anyhow!("Entry “{}” not found in wave bank", name)),
}, },
None => wave_bank.sounds.keys().cloned().collect(), None => wave_bank.sounds.keys().cloned().collect(),
}; };
@ -157,7 +152,7 @@ fn main() -> Result<()> {
sounds.sort_unstable_by(|a, b| b.size.cmp(&a.size)); sounds.sort_unstable_by(|a, b| b.size.cmp(&a.size));
sounds[0].to_wav()? sounds[0].to_wav()?
} else { } else {
return error(format!( return Err(anyhow!(
"Could not find matching sound in wave bank (searched for {})", "Could not find matching sound in wave bank (searched for {})",
sound_name, sound_name,
)); ));