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

Avoid match for error handling where it makes sense

master
Simon Bruder 2020-07-04 20:53:21 +02:00
parent 446ddb10e5
commit 0ea4a20326
No known key found for this signature in database
GPG Key ID: 6F03E0000CC5B62F
2 changed files with 5 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/converter/ddr2osu.rs
View File

@ -284,10 +284,7 @@ impl ssq::Step {
}
}
ssq::Step::Shock { beats } => {
let columns = match shock_step_generator.next() {
Some(columns) => columns,
None => vec![],
};
let columns = shock_step_generator.next().unwrap_or_else(Vec::new);
for column in columns {
hit_objects.push(beatmap::HitObject::HitCircle {

12
src/main.rs
View File

@ -166,13 +166,6 @@ struct BatchDDR2osu {
convert: converter::ddr2osu::Config,
}
fn get_basename(path: &PathBuf) -> Option<&str> {
match path.file_stem() {
Some(stem) => stem.to_str(),
None => None,
}
}
fn read_musicdb(path: &PathBuf) -> Result<musicdb::MusicDB> {
let extension = path.extension().and_then(|ext| ext.to_str()).unwrap_or("");
@ -372,7 +365,10 @@ fn main() -> Result<()> {
}
SubCommand::DDR2osu(opts) => {
let basename = opts.basename.clone().unwrap_or(
get_basename(&opts.ssq_file)
opts.ssq_file
.file_stem()
.map(|stem| stem.to_str())
.flatten()
.map(|basename| basename.to_string())
.ok_or_else(|| {
anyhow!(