matthiasbeyer/imag
1
0
Fork 0
Code Releases Activity

Move tag filtering to sub-function

Browse source
This commit is contained in:
Matthias Beyer 2015-12-05 11:05:50 +01:00
parent e8c7df4593
commit 80563cb340
1 changed files with 12 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -123,6 +123,17 @@ fn get_filtered_files_from_backend<'a>(module: &'a Module,
env: &CommandEnv) env: &CommandEnv)
-> Result<IntoIter<File<'a>>, ModuleError> -> Result<IntoIter<File<'a>>, ModuleError>
{ {
fn check_tags(tags: &Vec<String>, file: &File) -> bool {
if tags.len() != 0 {
debug!("Checking tags of: {:?}", file.id());
get_tags_from_header(&file.header())
.iter()
.any(|t| tags.contains(t))
} else {
true
}
}
let parser = Parser::new(JsonHeaderParser::new(None)); let parser = Parser::new(JsonHeaderParser::new(None));
let tags = get_tags(env.rt, env.matches); let tags = get_tags(env.rt, env.matches);
debug!("Tags: {:?}", tags); debug!("Tags: {:?}", tags);
@ -130,13 +141,7 @@ fn get_filtered_files_from_backend<'a>(module: &'a Module,
.map(|files| { .map(|files| {
let f = files.filter(|file| { let f = files.filter(|file| {
debug!("Backend returns file: {:?}", file); debug!("Backend returns file: {:?}", file);
if tags.len() != 0 { check_tags(&tags, file)
debug!("Checking tags of: {:?}", file.id());
get_tags_from_header(&file.header()).iter()
.any(|t| tags.contains(t))
} else {
true
}
}).filter(|file| { }).filter(|file| {
debug!("Checking matches of: {:?}", file.id()); debug!("Checking matches of: {:?}", file.id());
get_matcher(env.rt, env.matches) get_matcher(env.rt, env.matches)