matthiasbeyer/imag
1
0
Fork 0
Code Releases Activity

bm: remove_command: Refactor into sub-functions

Browse source
This commit is contained in:
Matthias Beyer 2015-12-05 11:00:40 +01:00
parent 75cedc1580
commit 166a0cf5dd
1 changed files with 14 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
src/module/bm/commands.rs
View file

@ -49,11 +49,7 @@ pub fn list_command(module: &Module, env: CommandEnv) -> CommandResult {
} }
pub fn remove_command(module: &Module, env: CommandEnv) -> CommandResult { pub fn remove_command(module: &Module, env: CommandEnv) -> CommandResult {
let checked : bool = run_removal_checking(&env); fn remove_by_id(module: &Module, env: CommandEnv, id: String, checked: bool) -> CommandResult {
debug!("Checked mode: {}", checked);
if let Some(id) = get_id(env.rt, env.matches) {
debug!("Remove by id: {}", id);
let parser = Parser::new(JsonHeaderParser::new(None)); let parser = Parser::new(JsonHeaderParser::new(None));
let file = env.bk let file = env.bk
.get_file_by_id(module, &id.into(), &parser) .get_file_by_id(module, &id.into(), &parser)
@ -73,9 +69,9 @@ pub fn remove_command(module: &Module, env: CommandEnv) -> CommandResult {
info!("Remove worked"); info!("Remove worked");
Ok(()) Ok(())
} }
} else { }
debug!("Remove more than one file");
fn remove_by_filtering(module: &Module, env: CommandEnv, checked: bool) -> CommandResult {
get_filtered_files_from_backend(module, &env).and_then(|files| { get_filtered_files_from_backend(module, &env).and_then(|files| {
let nfiles = files.len(); let nfiles = files.len();
info!("Removing {} Files", nfiles); info!("Removing {} Files", nfiles);
@ -106,6 +102,17 @@ pub fn remove_command(module: &Module, env: CommandEnv) -> CommandResult {
} }
}) })
} }
let checked : bool = run_removal_checking(&env);
debug!("Checked mode: {}", checked);
if let Some(id) = get_id(env.rt, env.matches) {
debug!("Remove by id: {}", id);
remove_by_id(module, env, id, checked)
} else {
debug!("Remove more than one file");
remove_by_filtering(module, env, checked)
}
} }
/* /*