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

calendar_query: sketch out the time-range filtering

Browse Source
This commit is contained in:
Lennart
2024-10-04 16:30:22 +02:00
parent 15d3050569
commit 12e4e42c7c
1 changed files with 17 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -4,7 +4,7 @@ use rustical_dav::{
resource::Resource, resource::Resource,
xml::{multistatus::PropstatWrapper, MultistatusElement}, xml::{multistatus::PropstatWrapper, MultistatusElement},
}; };
use rustical_store::{model::object::CalendarObject, CalendarStore}; use rustical_store::{model::object::CalendarObject, timestamp::CalDateTime, CalendarStore};
use serde::Deserialize; use serde::Deserialize;
use tokio::sync::RwLock; use tokio::sync::RwLock;
@@ -20,9 +20,9 @@ use crate::{
#[allow(dead_code)] #[allow(dead_code)]
struct TimeRangeElement { struct TimeRangeElement {
#[serde(rename = "@start")] #[serde(rename = "@start")]
start: Option<String>, start: Option<CalDateTime>,
#[serde(rename = "@end")] #[serde(rename = "@end")]
end: Option<String>, end: Option<CalDateTime>,
} }
#[derive(Deserialize, Clone, Debug)] #[derive(Deserialize, Clone, Debug)]
@@ -74,6 +74,7 @@ struct CompFilterElement {
} }
impl CompFilterElement { impl CompFilterElement {
// 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: // A CALDAV:comp-filter is said to match if:
// //
@@ -124,6 +125,7 @@ impl CompFilterElement {
false false
} }
// match the VEVENT/VTODO part
pub fn matches(&self, cal_object: &CalendarObject) -> bool { pub fn matches(&self, cal_object: &CalendarObject) -> bool {
// TODO: evaulate prop-filter, time-range // TODO: evaulate prop-filter, time-range
let component_name = cal_object.get_component_name(); let component_name = cal_object.get_component_name();
@@ -131,6 +133,18 @@ impl CompFilterElement {
if self.is_not_defined.is_some() { if self.is_not_defined.is_some() {
return self.name != component_name; return self.name != component_name;
} }
if let Some(time_range) = &self.time_range {
if let Some(start) = &time_range.start {
if let CalDateTime::Utc(utctime) = &start {
} else {
// RFC 4791: 'Both attributes MUST be specified as "date with UTC time" value.'
return false;
}
}
if let Some(end) = &time_range.end {}
}
self.name == component_name self.name == component_name
} }
} }