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

some refactoring

Browse Source
This commit is contained in:
Lennart
2025-01-01 15:22:51 +01:00
parent 646919587e
commit 40c8624703
6 changed files with 49 additions and 65 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
crates/caldav/src/calendar/prop.rs
View File

@@ -1,9 +1,10 @@
use derive_more::derive::From;
use rustical_xml::{XmlDeserialize, XmlSerialize};
#[derive(Debug, Clone, XmlDeserialize, XmlSerialize, PartialEq)]
#[derive(Debug, Clone, XmlDeserialize, XmlSerialize, PartialEq, From)]
pub struct SupportedCalendarComponent {
#[xml(ty = "attr")]
pub name: String,
pub name: &'static str,
}
#[derive(Debug, Clone, XmlDeserialize, XmlSerialize, PartialEq)]
@@ -12,6 +13,14 @@ pub struct SupportedCalendarComponentSet {
pub comp: Vec<SupportedCalendarComponent>,
}
impl Default for SupportedCalendarComponentSet {
fn default() -> Self {
Self {
comp: vec!["VEVENT".into(), "VTODO".into(), "VJOURNAL".into()],
}
}
}
#[derive(Debug, Clone, XmlSerialize, PartialEq)]
pub struct CalendarData {
#[xml(ty = "attr")]

26
crates/caldav/src/calendar/resource.rs
View File

@@ -41,8 +41,8 @@ pub enum CalendarProp {
// WebDAV (RFC 2518)
#[xml(ns = "rustical_dav::namespace::NS_DAV")]
Displayname(Option<String>),
#[xml(ns = "rustical_dav::namespace::NS_DAV")]
Getcontenttype(String),
#[xml(ns = "rustical_dav::namespace::NS_DAV", skip_deserializing)]
Getcontenttype(&'static str),
// WebDav Push
// NOTE: Here we implement an older version of the spec since the new property name is not reflected
@@ -62,11 +62,9 @@ pub enum CalendarProp {
CalendarTimezone(Option<String>),
#[xml(ns = "rustical_dav::namespace::NS_ICAL")]
CalendarOrder(Option<i64>),
// TODO: Re-add
#[xml(ns = "rustical_dav::namespace::NS_CALDAV")]
#[xml(ns = "rustical_dav::namespace::NS_CALDAV", skip_deserializing)]
SupportedCalendarComponentSet(SupportedCalendarComponentSet),
#[xml(skip_deserializing)]
#[xml(ns = "rustical_dav::namespace::NS_CALDAV")]
#[xml(ns = "rustical_dav::namespace::NS_CALDAV", skip_deserializing)]
SupportedCalendarData(SupportedCalendarData),
#[xml(ns = "rustical_dav::namespace::NS_DAV")]
MaxResourceSize(i64),
@@ -119,25 +117,13 @@ impl Resource for CalendarResource {
}
CalendarPropName::CalendarOrder => CalendarProp::CalendarOrder(Some(self.0.order)),
CalendarPropName::SupportedCalendarComponentSet => {
CalendarProp::SupportedCalendarComponentSet(SupportedCalendarComponentSet {
comp: vec![
SupportedCalendarComponent {
name: "VEVENT".to_owned(),
},
SupportedCalendarComponent {
name: "VTODO".to_owned(),
},
SupportedCalendarComponent {
name: "VJOURNAL".to_owned(),
},
],
})
CalendarProp::SupportedCalendarComponentSet(SupportedCalendarComponentSet::default())
}
CalendarPropName::SupportedCalendarData => {
CalendarProp::SupportedCalendarData(SupportedCalendarData::default())
}
CalendarPropName::Getcontenttype => {
CalendarProp::Getcontenttype("text/calendar;charset=utf-8".to_owned())
CalendarProp::Getcontenttype("text/calendar;charset=utf-8")
}
CalendarPropName::Transports => CalendarProp::Transports(Default::default()),
CalendarPropName::Topic => {