Deuxfleurs/aerogramme
15
0
Fork 1
Code Issues 33 Pull requests 1 Projects 11 Releases 5 Wiki Activity

first full filter implementation

Browse source
This commit is contained in:
Quentin 2024-05-22 10:05:52 +02:00
parent 51ec1d7ff9
commit 194e34d4e1
Signed by: quentin
GPG key ID: E9602264D639FF68
1 changed files with 38 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

55
aero-proto/src/dav/controller.rs
View file

@ -353,25 +353,31 @@ fn apply_filter<'a>(
}; };
// Do checks // Do checks
//@FIXME VCalendar root component is hardcoded
let root_filter = &filter.0; let root_filter = &filter.0;
if root_filter.name != cal::Component::VCalendar {
return None;
}
let matcher = match &root_filter.additional_rules { // Find the component in the filter
None => return Some(Ok(single_node)), let maybe_comp = ics
Some(cal::CompFilterRules::IsNotDefined) => return None,
Some(cal::CompFilterRules::Matches(m)) => m,
};
let is_keep = ics
.components .components
.iter() .iter()
.any(|single_comp| is_component_match(single_comp, matcher)); .find(|candidate| candidate.name.as_str() == root_filter.name.as_str());
// Object has been kept // Apply additional rules
Some(Ok(single_node)) let is_keep = match (maybe_comp, &root_filter.additional_rules) {
(Some(_), None) => true,
(None, Some(cal::CompFilterRules::IsNotDefined)) => true,
(None, None) => false,
(None, Some(cal::CompFilterRules::Matches(_))) => false,
(Some(_), Some(cal::CompFilterRules::IsNotDefined)) => false,
(Some(inner_comp), Some(cal::CompFilterRules::Matches(filter))) => {
is_component_match(inner_comp, filter)
}
};
// Adjust return value according to filter
match is_keep {
true => Some(Ok(single_node)),
_ => None,
}
}) })
} }
@ -499,8 +505,23 @@ fn is_component_match(
return false; return false;
} }
//component.components.iter().any matcher.comp_filter.iter().all(|single_comp_filter| {
matcher.comp_filter.iter().any(|single_comp_filter| { // Find the component
true //@TODO find component, find let maybe_comp = component
.components
.iter()
.find(|candidate| candidate.name.as_str() == single_comp_filter.name.as_str());
// Filter according to rules
match (maybe_comp, &single_comp_filter.additional_rules) {
(Some(_), None) => true,
(None, Some(cal::CompFilterRules::IsNotDefined)) => true,
(None, None) => false,
(Some(_), Some(cal::CompFilterRules::IsNotDefined)) => false,
(None, Some(cal::CompFilterRules::Matches(_))) => false,
(Some(inner_comp), Some(cal::CompFilterRules::Matches(comp_match))) => {
is_component_match(inner_comp, comp_match)
}
}
}) })
} }