matthiasbeyer/imag
1
0
Fork 0
Code Releases Activity

Reimplement FieldIsType filter with FieldPredicate filter

Browse source
This commit is contained in:
Matthias Beyer 2016-03-12 15:05:09 +01:00
parent f86a8968a4
commit 564d8d84fe
1 changed files with 17 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
libimagentryfilter/src/builtin/header/field_istype.rs
View file

@ -1,6 +1,8 @@
use libimagstore::store::Entry;
use builtin::header::field_path::FieldPath;
use builtin::header::field_predicate::FieldPredicate;
use builtin::header::field_predicate::Predicate;
use filter::Filter;
use toml::Value;
@ -31,17 +33,27 @@ impl Type {
}
struct IsTypePred {
ty: Type
}
impl Predicate for IsTypePred {
fn evaluate(&self, v: Value) -> bool {
self.ty.matches(&v)
}
}
pub struct FieldIsType {
header_field_path: FieldPath,
expected_type: Type,
filter: FieldPredicate<IsTypePred>,
}
impl FieldIsType {
pub fn new(path: FieldPath, expected_type: Type) -> FieldIsType {
FieldIsType {
header_field_path: path,
expected_type: expected_type,
filter: FieldPredicate::new(path, Box::new(IsTypePred { ty: expected_type })),
}
}
@ -50,10 +62,7 @@ impl FieldIsType {
impl Filter for FieldIsType {
fn filter(&self, e: &Entry) -> bool {
e.get_header()
.read(&self.header_field_path[..])
.map(|val| val.map(|v| self.expected_type.matches(&v)).unwrap_or(false))
.unwrap_or(false)
self.filter.filter(e)
}
}