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

caldav: refactor resource newtypes

Browse Source
This commit is contained in:
Lennart
2024-09-29 13:39:45 +02:00
parent 1b438ea98a
commit 7f164da438
7 changed files with 36 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
crates/caldav/Cargo.toml
View File

@@ -24,3 +24,4 @@ tokio = { version = "1.40", features = ["sync", "full"] }
async-trait = "0.1"
thiserror = "1.0"
strum = { version = "0.26", features = ["strum_macros", "derive"] }
derive_more = { version = "1.0", features = ["from", "into"] }

2
crates/caldav/src/calendar/methods/report/calendar_multiget.rs
View File

@@ -87,7 +87,7 @@ pub async fn handle_calendar_multiget<C: CalendarStore + ?Sized>(
for event in events {
let path = format!("{}/{}", req.path(), event.get_uid());
responses.push(
EventFile { event }
EventFile::from(event)
.propfind(prefix, path, props.clone())
.await?,
);

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

@@ -126,7 +126,7 @@ pub async fn handle_calendar_query<C: CalendarStore + ?Sized>(
for event in events {
let path = format!("{}/{}", req.path(), event.get_uid());
responses.push(
EventFile { event }
EventFile::from(event)
.propfind(prefix, path, props.clone())
.await?,
);

2
crates/caldav/src/calendar/methods/report/sync_collection.rs
View File

@@ -73,7 +73,7 @@ pub async fn handle_sync_collection<C: CalendarStore + ?Sized>(
for event in new_events {
let path = format!("{}/{}", req.path(), event.get_uid());
responses.push(
EventFile { event }
EventFile::from(event)
.propfind(prefix, path, props.clone())
.await?,
);

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

@@ -3,6 +3,7 @@ use crate::Error;
use actix_web::{web::Data, HttpRequest};
use anyhow::anyhow;
use async_trait::async_trait;
use derive_more::derive::{From, Into};
use rustical_auth::AuthInfo;
use rustical_dav::resource::{InvalidProperty, Resource, ResourceService};
use rustical_dav::xml::HrefElement;
@@ -87,10 +88,8 @@ impl InvalidProperty for CalendarProp {
}
}
#[derive(Clone, Debug)]
pub struct CalendarFile {
pub calendar: Calendar,
}
#[derive(Clone, Debug, From, Into)]
pub struct CalendarFile(Calendar);
impl Resource for CalendarFile {
type PropName = CalendarPropName;
@@ -101,26 +100,22 @@ impl Resource for CalendarFile {
Ok(match prop {
CalendarPropName::Resourcetype => CalendarProp::Resourcetype(Resourcetype::default()),
CalendarPropName::CurrentUserPrincipal => CalendarProp::CurrentUserPrincipal(
HrefElement::new(format!("{}/user/{}/", prefix, self.calendar.principal)),
HrefElement::new(format!("{}/user/{}/", prefix, self.0.principal)),
),
CalendarPropName::Owner => CalendarProp::Owner(HrefElement::new(format!(
"{}/user/{}/",
prefix, self.calendar.principal
prefix, self.0.principal
))),
CalendarPropName::Displayname => {
CalendarProp::Displayname(self.calendar.displayname.clone())
}
CalendarPropName::CalendarColor => {
CalendarProp::CalendarColor(self.calendar.color.clone())
}
CalendarPropName::Displayname => CalendarProp::Displayname(self.0.displayname.clone()),
CalendarPropName::CalendarColor => CalendarProp::CalendarColor(self.0.color.clone()),
CalendarPropName::CalendarDescription => {
CalendarProp::CalendarDescription(self.calendar.description.clone())
CalendarProp::CalendarDescription(self.0.description.clone())
}
CalendarPropName::CalendarTimezone => {
CalendarProp::CalendarTimezone(self.calendar.timezone.clone())
CalendarProp::CalendarTimezone(self.0.timezone.clone())
}
CalendarPropName::CalendarOrder => {
CalendarProp::CalendarOrder(format!("{}", self.calendar.order).into())
CalendarProp::CalendarOrder(format!("{}", self.0.order).into())
}
CalendarPropName::SupportedCalendarComponentSet => {
CalendarProp::SupportedCalendarComponentSet(SupportedCalendarComponentSet {
@@ -144,10 +139,8 @@ impl Resource for CalendarFile {
CalendarPropName::SupportedReportSet => {
CalendarProp::SupportedReportSet(SupportedReportSet::default())
}
CalendarPropName::SyncToken => {
CalendarProp::SyncToken(self.calendar.format_synctoken())
}
CalendarPropName::Getctag => CalendarProp::Getctag(self.calendar.format_synctoken()),
CalendarPropName::SyncToken => CalendarProp::SyncToken(self.0.format_synctoken()),
CalendarPropName::Getctag => CalendarProp::Getctag(self.0.format_synctoken()),
})
}
@@ -157,23 +150,23 @@ impl Resource for CalendarFile {
CalendarProp::CurrentUserPrincipal(_) => Err(rustical_dav::Error::PropReadOnly),
CalendarProp::Owner(_) => Err(rustical_dav::Error::PropReadOnly),
CalendarProp::Displayname(displayname) => {
self.calendar.displayname = displayname;
self.0.displayname = displayname;
Ok(())
}
CalendarProp::CalendarColor(color) => {
self.calendar.color = color;
self.0.color = color;
Ok(())
}
CalendarProp::CalendarDescription(description) => {
self.calendar.description = description;
self.0.description = description;
Ok(())
}
CalendarProp::CalendarTimezone(timezone) => {
self.calendar.timezone = timezone;
self.0.timezone = timezone;
Ok(())
}
CalendarProp::CalendarOrder(order) => {
self.calendar.order = match order {
self.0.order = match order {
Some(order) => order.parse().map_err(|_e| anyhow!("invalid order"))?,
None => 0,
};
@@ -199,23 +192,23 @@ impl Resource for CalendarFile {
CalendarPropName::CurrentUserPrincipal => Err(rustical_dav::Error::PropReadOnly),
CalendarPropName::Owner => Err(rustical_dav::Error::PropReadOnly),
CalendarPropName::Displayname => {
self.calendar.displayname = None;
self.0.displayname = None;
Ok(())
}
CalendarPropName::CalendarColor => {
self.calendar.color = None;
self.0.color = None;
Ok(())
}
CalendarPropName::CalendarDescription => {
self.calendar.description = None;
self.0.description = None;
Ok(())
}
CalendarPropName::CalendarTimezone => {
self.calendar.timezone = None;
self.0.timezone = None;
Ok(())
}
CalendarPropName::CalendarOrder => {
self.calendar.order = 0;
self.0.order = 0;
Ok(())
}
CalendarPropName::SupportedCalendarComponentSet => {
@@ -247,7 +240,7 @@ impl<C: CalendarStore + ?Sized> ResourceService for CalendarResource<C> {
.get_calendar(&self.principal, &self.calendar_id)
.await
.map_err(|_e| Error::NotFound)?;
Ok(CalendarFile { calendar })
Ok(calendar.into())
}
async fn get_members(
@@ -262,12 +255,7 @@ impl<C: CalendarStore + ?Sized> ResourceService for CalendarResource<C> {
.get_events(&self.principal, &self.calendar_id)
.await?
.into_iter()
.map(|event| {
(
format!("{}/{}", self.path, &event.get_uid()),
EventFile { event },
)
})
.map(|event| (format!("{}/{}", self.path, &event.get_uid()), event.into()))
.collect())
}
@@ -297,7 +285,7 @@ impl<C: CalendarStore + ?Sized> ResourceService for CalendarResource<C> {
.update_calendar(
self.principal.to_owned(),
self.calendar_id.to_owned(),
file.calendar,
file.into(),
)
.await?;
Ok(())

13
crates/caldav/src/event/resource.rs
View File

@@ -1,6 +1,7 @@
use crate::Error;
use actix_web::{web::Data, HttpRequest};
use async_trait::async_trait;
use derive_more::derive::{From, Into};
use rustical_auth::AuthInfo;
use rustical_dav::resource::{InvalidProperty, Resource, ResourceService};
use rustical_store::event::Event;
@@ -43,10 +44,8 @@ impl InvalidProperty for EventProp {
}
}
#[derive(Clone)]
pub struct EventFile {
pub event: Event,
}
#[derive(Clone, From, Into)]
pub struct EventFile(Event);
impl Resource for EventFile {
type PropName = EventPropName;
@@ -55,8 +54,8 @@ impl Resource for EventFile {
fn get_prop(&self, _prefix: &str, prop: Self::PropName) -> Result<Self::Prop, Self::Error> {
Ok(match prop {
EventPropName::Getetag => EventProp::Getetag(self.event.get_etag()),
EventPropName::CalendarData => EventProp::CalendarData(self.event.get_ics().to_owned()),
EventPropName::Getetag => EventProp::Getetag(self.0.get_etag()),
EventPropName::CalendarData => EventProp::CalendarData(self.0.get_ics().to_owned()),
EventPropName::Getcontenttype => {
EventProp::Getcontenttype("text/calendar;charset=utf-8".to_owned())
}
@@ -104,7 +103,7 @@ impl<C: CalendarStore + ?Sized> ResourceService for EventResource<C> {
.await
.get_event(&self.principal, &self.cid, &self.uid)
.await?;
Ok(EventFile { event })
Ok(event.into())
}
async fn save_file(&self, _file: Self::File) -> Result<(), Self::Error> {

7
crates/caldav/src/principal/mod.rs
View File

@@ -130,12 +130,7 @@ impl<C: CalendarStore + ?Sized> ResourceService for PrincipalResource<C> {
.await?;
Ok(calendars
.into_iter()
.map(|cal| {
(
format!("{}/{}", &self.path, &cal.id),
CalendarFile { calendar: cal },
)
})
.map(|cal| (format!("{}/{}", &self.path, &cal.id), cal.into()))
.collect())
}