Skip to content

Commit

Permalink
Simplify
Browse files Browse the repository at this point in the history
  • Loading branch information
ryuichiueda committed Jan 11, 2025
1 parent c7101cc commit f92a8e1
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 6 deletions.
13 changes: 8 additions & 5 deletions src/core/database.rs
Original file line number Diff line number Diff line change
Expand Up @@ -174,6 +174,13 @@ impl DataBase {
self.params[layer].get_mut(name).unwrap().set_as_single(val)
}

fn get_target_layer(&mut self, name: &str, layer: Option<usize>) -> usize {
match layer {
Some(n) => n,
None => self.solve_layer(name),
}
}

fn solve_layer(&mut self, name: &str) -> usize {
self.get_layer_pos(name).unwrap_or(0)
}
Expand Down Expand Up @@ -235,11 +242,7 @@ impl DataBase {
}

pub fn set_array(&mut self, name: &str, v: Vec<String>, layer: Option<usize>) -> Result<(), String> {
let layer = match layer {
Some(n) => n,
None => self.solve_layer(name),
};

let layer = self.get_target_layer(name, layer);
setter::array(self, name, v, layer)
}

Expand Down
2 changes: 1 addition & 1 deletion src/core/database/setter.rs
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,6 @@ pub fn flag(db: &mut DataBase, name: &str, flag: char) {

pub fn array(db: &mut DataBase, name: &str, v: Vec<String>, layer: usize) -> Result<(), String> {
db.write_check(name)?;
db.params[layer].insert( name.to_string(), Box::new(ArrayData::from(v)));
db.params[layer].insert(name.to_string(), Box::new(ArrayData::from(v)));
Ok(())
}

0 comments on commit f92a8e1

Please sign in to comment.