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

Replace this internal_props stuff with CommonPropertiesExtension

Browse Source
This commit is contained in:
Lennart
2025-01-18 22:59:02 +01:00
parent 1dda9dea8d
commit eb1a8578d7
19 changed files with 263 additions and 233 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,5 +1,5 @@
use crate::{
calendar_object::resource::{CalendarObjectProp, CalendarObjectResource},
calendar_object::resource::{CalendarObjectPropWrapper, CalendarObjectResource},
Error,
};
use actix_web::{
@@ -8,7 +8,7 @@ use actix_web::{
HttpRequest,
};
use rustical_dav::{
resource::{CommonPropertiesProp, EitherProp, Resource},
resource::Resource,
xml::{multistatus::ResponseElement, MultistatusElement, PropElement, PropfindType},
};
use rustical_store::{auth::User, CalendarObject, CalendarStore};
@@ -60,8 +60,7 @@ pub async fn handle_calendar_multiget<C: CalendarStore>(
principal: &str,
cal_id: &str,
cal_store: &C,
) -> Result<MultistatusElement<EitherProp<CalendarObjectProp, CommonPropertiesProp>, String>, Error>
{
) -> Result<MultistatusElement<CalendarObjectPropWrapper, String>, Error> {
let (objects, not_found) =
get_objects_calendar_multiget(&cal_multiget, req.path(), principal, cal_id, cal_store)
.await?;

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

@@ -2,14 +2,14 @@ use std::ops::Deref;
use actix_web::HttpRequest;
use rustical_dav::{
resource::{CommonPropertiesProp, EitherProp, Resource},
resource::Resource,
xml::{MultistatusElement, PropElement, PropfindType},
};
use rustical_store::{auth::User, calendar::UtcDateTime, CalendarObject, CalendarStore};
use rustical_xml::XmlDeserialize;
use crate::{
calendar_object::resource::{CalendarObjectProp, CalendarObjectResource},
calendar_object::resource::{CalendarObjectPropWrapper, CalendarObjectResource},
Error,
};
@@ -185,8 +185,7 @@ pub async fn handle_calendar_query<C: CalendarStore>(
principal: &str,
cal_id: &str,
cal_store: &C,
) -> Result<MultistatusElement<EitherProp<CalendarObjectProp, CommonPropertiesProp>, String>, Error>
{
) -> Result<MultistatusElement<CalendarObjectPropWrapper, String>, Error> {
let objects = get_objects_calendar_query(&cal_query, principal, cal_id, cal_store).await?;
let props = match cal_query.prop {

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

@@ -1,6 +1,6 @@
use actix_web::{http::StatusCode, HttpRequest};
use rustical_dav::{
resource::{CommonPropertiesProp, EitherProp, Resource},
resource::Resource,
xml::{
multistatus::ResponseElement, sync_collection::SyncCollectionRequest, MultistatusElement,
PropElement, PropfindType,
@@ -13,7 +13,7 @@ use rustical_store::{
};
use crate::{
calendar_object::resource::{CalendarObjectProp, CalendarObjectResource},
calendar_object::resource::{CalendarObjectPropWrapper, CalendarObjectResource},
Error,
};
@@ -24,8 +24,7 @@ pub async fn handle_sync_collection<C: CalendarStore>(
principal: &str,
cal_id: &str,
cal_store: &C,
) -> Result<MultistatusElement<EitherProp<CalendarObjectProp, CommonPropertiesProp>, String>, Error>
{
) -> Result<MultistatusElement<CalendarObjectPropWrapper, String>, Error> {
let props = match sync_collection.prop {
PropfindType::Allprop => {
vec!["allprop".to_owned()]