Outsource lots of stuff to ical library

crates/caldav/src/calendar/methods/get.rs

@@ -6,10 +6,10 @@ use axum::{extract::Path, response::Response};
 use headers::{ContentType, HeaderMapExt};
 use http::{HeaderValue, Method, StatusCode, header};
 use ical::builder::calendar::IcalCalendarBuilder;
+use ical::component::CalendarInnerData;
 use ical::generator::Emitter;
 use ical::property::Property;
 use percent_encoding::{CONTROLS, utf8_percent_encode};
-use rustical_ical::{CalendarObjectComponent, EventObject};
 use rustical_store::{CalendarStore, SubscriptionStore, auth::Principal};
 use std::collections::HashMap;
 use std::str::FromStr;
@@ -62,21 +62,21 @@ pub async fn route_get<C: CalendarStore, S: SubscriptionStore>(
     }
 
     for object in &objects {
-        vtimezones.extend(object.get_vtimezones());
-        match object.get_data() {
-            CalendarObjectComponent::Event(EventObject { event, .. }, overrides) => {
+        vtimezones.extend(object.get_inner().get_vtimezones());
+        match object.get_inner().get_inner() {
+            CalendarInnerData::Event(main, overrides) => {
                 ical_calendar_builder = ical_calendar_builder
-                    .add_event(event.clone())
-                    .add_events(overrides.iter().map(|ev| ev.event.clone()));
+                    .add_event(main.clone())
+                    .add_events(overrides.iter().cloned());
             }
-            CalendarObjectComponent::Todo(todo, overrides) => {
+            CalendarInnerData::Todo(main, overrides) => {
                 ical_calendar_builder = ical_calendar_builder
-                    .add_todo(todo.clone())
+                    .add_todo(main.clone())
                     .add_todos(overrides.iter().cloned());
             }
-            CalendarObjectComponent::Journal(journal, overrides) => {
+            CalendarInnerData::Journal(main, overrides) => {
                 ical_calendar_builder = ical_calendar_builder
-                    .add_journal(journal.clone())
+                    .add_journal(main.clone())
                     .add_journals(overrides.iter().cloned());
             }
         }

crates/caldav/src/calendar/methods/report/calendar_query/comp_filter.rs

@@ -2,8 +2,8 @@ use crate::calendar::methods::report::calendar_query::{
     TimeRangeElement,
     prop_filter::{PropFilterElement, PropFilterable},
 };
-use ical::parser::ical::component::IcalTimeZone;
-use rustical_ical::{CalendarObject, CalendarObjectComponent, CalendarObjectType};
+use ical::{component::IcalCalendarObject, parser::ical::component::IcalTimeZone};
+use rustical_ical::{CalendarObject, CalendarObjectType};
 use rustical_xml::XmlDeserialize;
 
 #[derive(XmlDeserialize, Clone, Debug, PartialEq)]
@@ -80,10 +80,11 @@ impl CompFilterable for CalendarObject {
 
     fn match_subcomponents(&self, comp_filter: &CompFilterElement) -> bool {
         let mut matches = self
+            .get_inner()
             .get_vtimezones()
             .values()
             .map(|tz| tz.matches(comp_filter))
-            .chain([self.get_data().matches(comp_filter)]);
+            .chain([self.matches(comp_filter)]);
 
         if comp_filter.is_not_defined.is_some() {
             matches.all(|x| x)
@@ -107,7 +108,7 @@ impl CompFilterable for IcalTimeZone {
     }
 }
 
-impl CompFilterable for CalendarObjectComponent {
+impl CompFilterable for IcalCalendarObject {
     fn get_comp_name(&self) -> &'static str {
         CalendarObjectType::from(self).as_str()
     }
@@ -120,7 +121,7 @@ impl CompFilterable for CalendarObjectComponent {
             return false;
         }
         if let Some(end) = &time_range.end
-            && let Some(first_occurence) = self.get_first_occurence().unwrap_or(None)
+            && let Some(first_occurence) = self.get_dtstart().unwrap_or(None)
             && **end < first_occurence.utc()
         {
             return false;

crates/caldav/src/calendar/methods/report/calendar_query/prop_filter.rs

@@ -1,14 +1,16 @@
 use super::{ParamFilterElement, TimeRangeElement};
 use ical::{
+    component::{CalendarInnerData, IcalCalendarObject},
     generator::{IcalCalendar, IcalEvent},
     parser::{
         Component,
         ical::component::{IcalJournal, IcalTimeZone, IcalTodo},
     },
     property::Property,
+    types::CalDateTime,
 };
 use rustical_dav::xml::TextMatchElement;
-use rustical_ical::{CalDateTime, CalendarObject, CalendarObjectComponent, UtcDateTime};
+use rustical_ical::{CalendarObject, UtcDateTime};
 use rustical_xml::XmlDeserialize;
 use std::collections::HashMap;
 
@@ -79,7 +81,7 @@ pub trait PropFilterable {
 
 impl PropFilterable for CalendarObject {
     fn get_property(&self, name: &str) -> Option<&Property> {
-        Self::get_property(self, name)
+        self.get_property(name)
     }
 }
 
@@ -113,12 +115,12 @@ impl PropFilterable for IcalTimeZone {
     }
 }
 
-impl PropFilterable for CalendarObjectComponent {
+impl PropFilterable for IcalCalendarObject {
     fn get_property(&self, name: &str) -> Option<&Property> {
-        match self {
-            Self::Event(event, _) => PropFilterable::get_property(&event.event, name),
-            Self::Todo(todo, _) => PropFilterable::get_property(todo, name),
-            Self::Journal(journal, _) => PropFilterable::get_property(journal, name),
+        match self.get_inner() {
+            CalendarInnerData::Event(event, _) => PropFilterable::get_property(event, name),
+            CalendarInnerData::Todo(todo, _) => PropFilterable::get_property(todo, name),
+            CalendarInnerData::Journal(journal, _) => PropFilterable::get_property(journal, name),
         }
     }
 }

crates/caldav/src/calendar/resource.rs

@@ -4,6 +4,7 @@ use crate::calendar::prop::{ReportMethod, SupportedCollationSet};
 use chrono::{DateTime, Utc};
 use derive_more::derive::{From, Into};
 use ical::IcalParser;
+use ical::types::CalDateTime;
 use rustical_dav::extensions::{
     CommonPropertiesExtension, CommonPropertiesProp, SyncTokenExtension, SyncTokenExtensionProp,
 };
@@ -11,7 +12,6 @@ use rustical_dav::privileges::UserPrivilegeSet;
 use rustical_dav::resource::{PrincipalUri, Resource, ResourceName};
 use rustical_dav::xml::{HrefElement, Resourcetype, ResourcetypeInner, SupportedReportSet};
 use rustical_dav_push::{DavPushExtension, DavPushExtensionProp};
-use rustical_ical::CalDateTime;
 use rustical_store::Calendar;
 use rustical_store::auth::Principal;
 use rustical_xml::{EnumVariants, PropName};

crates/caldav/src/calendar_object/resource.rs

@@ -4,6 +4,7 @@ use super::prop::{
 };
 use crate::Error;
 use derive_more::derive::{From, Into};
+use ical::generator::Emitter;
 use rustical_dav::{
     extensions::CommonPropertiesExtension,
     privileges::UserPrivilegeSet,
@@ -52,10 +53,14 @@ impl Resource for CalendarObjectResource {
                     }
                     CalendarObjectPropName::CalendarData(CalendarData { expand, .. }) => {
                         CalendarObjectProp::CalendarData(if let Some(expand) = expand.as_ref() {
-                            self.object.expand_recurrence(
-                                Some(expand.start.to_utc()),
-                                Some(expand.end.to_utc()),
-                            )?
+                            self.object
+                                .get_inner()
+                                .expand_recurrence(
+                                    Some(expand.start.to_utc()),
+                                    Some(expand.end.to_utc()),
+                                )
+                                .map_err(rustical_ical::Error::ParserError)?
+                                .generate()
                         } else {
                             self.object.get_ics().to_owned()
                         })