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

birthday calendar, lots of refactoring

Browse Source
This commit is contained in:
Lennart
2025-01-12 16:04:38 +01:00
parent f031478786
commit b9af6c10a3
19 changed files with 284 additions and 210 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,6 +1,5 @@
use crate::{
calendar_object::resource::{CalendarObjectProp, CalendarObjectResource},
principal::PrincipalResource,
Error,
};
use actix_web::{
@@ -27,13 +26,12 @@ pub(crate) struct CalendarMultigetRequest {
pub async fn get_objects_calendar_multiget<C: CalendarStore + ?Sized>(
cal_query: &CalendarMultigetRequest,
principal_url: &str,
path: &str,
principal: &str,
cal_id: &str,
store: &C,
) -> Result<(Vec<CalendarObject>, Vec<String>), Error> {
let resource_def =
ResourceDef::prefix(principal_url).join(&ResourceDef::new("/{cal_id}/{object_id}"));
let resource_def = ResourceDef::prefix(path).join(&ResourceDef::new("/{object_id}"));
let mut result = vec![];
let mut not_found = vec![];
@@ -43,9 +41,6 @@ pub async fn get_objects_calendar_multiget<C: CalendarStore + ?Sized>(
if !resource_def.capture_match_info(&mut path) {
not_found.push(href.to_owned());
};
if path.get("cal_id").unwrap() != cal_id {
not_found.push(href.to_owned());
}
let object_id = path.get("object_id").unwrap();
match store.get_object(principal, cal_id, object_id).await {
Ok(object) => result.push(object),
@@ -66,9 +61,8 @@ pub async fn handle_calendar_multiget<C: CalendarStore + ?Sized>(
cal_store: &C,
) -> Result<MultistatusElement<EitherProp<CalendarObjectProp, CommonPropertiesProp>, String>, Error>
{
let principal_url = PrincipalResource::get_url(req.resource_map(), vec![principal]).unwrap();
let (objects, not_found) =
get_objects_calendar_multiget(&cal_multiget, &principal_url, principal, cal_id, cal_store)
get_objects_calendar_multiget(&cal_multiget, req.path(), principal, cal_id, cal_store)
.await?;
let props = match cal_multiget.prop {

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

@@ -110,8 +110,7 @@ impl CompFilterElement {
if self
.comp_filter
.iter()
.map(|filter| filter.matches(cal_object))
.all(|x| x)
.all(|filter| filter.matches(cal_object))
{
return true;
}
@@ -215,11 +214,7 @@ pub async fn handle_calendar_query<C: CalendarStore + ?Sized>(
let mut responses = Vec::new();
for object in objects {
let path = CalendarObjectResource::get_url(
req.resource_map(),
vec![principal, cal_id, object.get_id()],
)
.unwrap();
let path = format!("{}/{}", req.path().trim_end_matches('/'), object.get_id());
responses.push(
CalendarObjectResource {
object,

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

@@ -86,11 +86,7 @@ pub async fn handle_sync_collection<C: CalendarStore + ?Sized>(
let mut responses = Vec::new();
for object in new_objects {
let path = CalendarObjectResource::get_url(
req.resource_map(),
vec![principal, cal_id, &object.get_id()],
)
.unwrap();
let path = format!("{}/{}", req.path().trim_end_matches('/'), object.get_id());
responses.push(
CalendarObjectResource {
object,
@@ -101,11 +97,7 @@ pub async fn handle_sync_collection<C: CalendarStore + ?Sized>(
}
for object_id in deleted_objects {
let path = CalendarObjectResource::get_url(
req.resource_map(),
vec![principal, cal_id, &object_id],
)
.unwrap();
let path = format!("{}/{}", req.path().trim_end_matches('/'), object_id);
responses.push(ResponseElement {
href: path,
status: Some(StatusCode::NOT_FOUND),