nikdoof/rustical
1
1
Fork 0
mirror of https://github.com/lennart-k/rustical.git synced 2025-12-13 21:42:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

calendar-query refactoring

Browse Source
This commit is contained in:
Lennart
2025-01-15 19:32:30 +01:00
parent 3e0571bb72
commit 5cf3c08be1
1 changed files with 25 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

76
crates/caldav/src/calendar/methods/report/calendar_query.rs
View File

@@ -13,16 +13,12 @@ use crate::{
Error, Error,
}; };
// TODO: Implement all the other filters
#[derive(XmlDeserialize, Clone, Debug, PartialEq)] #[derive(XmlDeserialize, Clone, Debug, PartialEq)]
#[allow(dead_code)] #[allow(dead_code)]
pub(crate) struct TimeRangeElement { pub(crate) struct TimeRangeElement {
#[xml(ty = "attr")] #[xml(ty = "attr")]
#[xml(ns = "rustical_dav::namespace::NS_CALDAV")]
pub(crate) start: Option<UtcDateTime>, pub(crate) start: Option<UtcDateTime>,
#[xml(ty = "attr")] #[xml(ty = "attr")]
#[xml(ns = "rustical_dav::namespace::NS_CALDAV")]
pub(crate) end: Option<UtcDateTime>, pub(crate) end: Option<UtcDateTime>,
} }
@@ -42,10 +38,8 @@ struct ParamFilterElement {
#[allow(dead_code)] #[allow(dead_code)]
struct TextMatchElement { struct TextMatchElement {
#[xml(ty = "attr")] #[xml(ty = "attr")]
#[xml(ns = "rustical_dav::namespace::NS_CALDAV")]
collation: String, collation: String,
#[xml(ty = "attr")] #[xml(ty = "attr")]
#[xml(ns = "rustical_dav::namespace::NS_CALDAV")]
negate_collation: String, negate_collation: String,
} }
@@ -58,8 +52,7 @@ pub(crate) struct PropFilterElement {
time_range: Option<TimeRangeElement>, time_range: Option<TimeRangeElement>,
#[xml(ns = "rustical_dav::namespace::NS_CALDAV")] #[xml(ns = "rustical_dav::namespace::NS_CALDAV")]
text_match: Option<TextMatchElement>, text_match: Option<TextMatchElement>,
#[xml(flatten)] #[xml(ns = "rustical_dav::namespace::NS_CALDAV", flatten)]
#[xml(ns = "rustical_dav::namespace::NS_CALDAV")]
param_filter: Vec<ParamFilterElement>, param_filter: Vec<ParamFilterElement>,
} }
@@ -83,42 +76,23 @@ pub(crate) struct CompFilterElement {
impl CompFilterElement { impl CompFilterElement {
// match the VCALENDAR part // match the VCALENDAR part
pub fn matches_root(&self, cal_object: &CalendarObject) -> bool { pub fn matches_root(&self, cal_object: &CalendarObject) -> bool {
// A CALDAV:comp-filter is said to match if: let comp_vcal = self.name == "VCALENDAR";
// match (self.is_not_defined, comp_vcal) {
// * The CALDAV:comp-filter XML element is empty and the calendar // Client wants VCALENDAR to not exist but we are a VCALENDAR
// object or calendar component type specified by the "name" (Some(()), true) => return false,
// attribute exists in the current scope; // Client is asking for something different than a vcalendar
// (None, false) => return false,
// or: _ => {}
// };
// * The CALDAV:comp-filter XML element contains a CALDAV:is-not-
// defined XML element and the calendar object or calendar
// component type specified by the "name" attribute does not exist
// in the current scope;
let is_defined = self.name == "VCALENDAR"; if self.time_range.is_some() {
if self.is_not_defined.is_some() && is_defined { // <time-range> should be applied on VEVENT/VTODO but not on VCALENDAR
return false;
}
if !is_defined {
return false; return false;
} }
// // TODO: Implement prop-filter at some point
// or:
// // Apply sub-comp-filters on VEVENT/VTODO/VJOURNAL component
// * The CALDAV:comp-filter XML element contains a CALDAV:time-range
// XML element and at least one recurrence instance in the
// targeted calendar component is scheduled to overlap the
// specified time range, and all specified CALDAV:prop-filter and
// CALDAV:comp-filter child XML elements also match the targeted
// calendar component;
//
// or:
//
// * The CALDAV:comp-filter XML element only contains CALDAV:prop-
// filter and CALDAV:comp-filter child XML elements that all match
// the targeted calendar component.
if self if self
.comp_filter .comp_filter
.iter() .iter()
@@ -132,15 +106,16 @@ impl CompFilterElement {
// match the VEVENT/VTODO/VJOURNAL part // match the VEVENT/VTODO/VJOURNAL part
pub fn matches(&self, cal_object: &CalendarObject) -> bool { pub fn matches(&self, cal_object: &CalendarObject) -> bool {
// TODO: evaulate prop-filter let comp_name_matches = self.name == cal_object.get_component_name();
let component_name = cal_object.get_component_name(); match (self.is_not_defined, comp_name_matches) {
let is_defined = self.name == component_name; // Client wants VCALENDAR to not exist but we are a VCALENDAR
if self.is_not_defined.is_some() && is_defined { (Some(()), true) => return false,
return false; // Client is asking for something different than a vcalendar
} (None, false) => return false,
if !is_defined { _ => {}
return false; };
}
// TODO: Implement prop-filter (and comp-filter?) at some point
if let Some(time_range) = &self.time_range { if let Some(time_range) = &self.time_range {
if let Some(start) = &time_range.start { if let Some(start) = &time_range.start {
@@ -158,8 +133,7 @@ impl CompFilterElement {
}; };
} }
} }
true
self.name == component_name
} }
} }