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

Migrate calendar REPORT to event resource

Browse Source
This commit is contained in:
Lennart
2023-09-13 19:21:12 +02:00
parent 6e5b9028e0
commit 3c8839c4d2
1 changed files with 25 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

66
crates/dav/src/routes/calendar.rs
View File

@@ -1,17 +1,16 @@
use crate::namespace::Namespace; use crate::namespace::Namespace;
use crate::propfind::{generate_multistatus, write_propstat_response}; use crate::propfind::generate_multistatus;
use crate::proptypes::write_string_prop; use crate::resource::HandlePropfind;
use crate::resources::event::EventResource;
use crate::{CalDavContext, Error}; use crate::{CalDavContext, Error};
use actix_web::http::header::ContentType; use actix_web::http::header::ContentType;
use actix_web::http::StatusCode;
use actix_web::web::{Data, Path}; use actix_web::web::{Data, Path};
use actix_web::{HttpRequest, HttpResponse}; use actix_web::{HttpRequest, HttpResponse};
use anyhow::Result; use anyhow::Result;
use quick_xml::events::BytesText;
use roxmltree::{Node, NodeType}; use roxmltree::{Node, NodeType};
use rustical_auth::{AuthInfoExtractor, CheckAuthentication}; use rustical_auth::{AuthInfoExtractor, CheckAuthentication};
use rustical_store::calendar::{Calendar, CalendarStore, Event}; use rustical_store::calendar::{Calendar, CalendarStore, Event};
use std::collections::HashSet;
use std::ops::Deref;
use std::sync::Arc; use std::sync::Arc;
use tokio::sync::RwLock; use tokio::sync::RwLock;
@@ -34,52 +33,37 @@ async fn _parse_filter(filter_node: &Node<'_, '_>) {
} }
} }
async fn handle_report_calendar_query( async fn handle_report_calendar_query<C: CalendarStore>(
query_node: Node<'_, '_>, query_node: Node<'_, '_>,
request: HttpRequest, request: HttpRequest,
events: Vec<Event>, events: Vec<Event>,
cal_store: Arc<RwLock<C>>,
) -> Result<HttpResponse, Error> { ) -> Result<HttpResponse, Error> {
let prop_node = query_node let prop_node = query_node
.children() .children()
.find(|n| n.node_type() == NodeType::Element && n.tag_name().name() == "prop") .find(|n| n.node_type() == NodeType::Element && n.tag_name().name() == "prop")
.ok_or(Error::BadRequest)?; .ok_or(Error::BadRequest)?;
let props: Arc<HashSet<&str>> = Arc::new( let props: Vec<&str> = prop_node
prop_node .children()
.children() .map(|node| node.tag_name().name())
.map(|node| node.tag_name().name()) .collect();
.collect(),
);
let output = generate_multistatus(vec![Namespace::Dav, Namespace::CalDAV], |writer| { let output = generate_multistatus(vec![Namespace::Dav, Namespace::CalDAV], |writer| {
for event in events { for event in events {
write_propstat_response( let path = format!("{}/{}", request.path(), event.get_uid());
writer, let event_resource = EventResource {
&format!("{}/{}", request.path(), event.get_uid()), cal_store: cal_store.clone(),
StatusCode::OK, path: path.clone(),
|writer| { event,
for prop in props.deref() { };
match *prop { // TODO: proper error handling
"getetag" => { let propfind_result = event_resource
write_string_prop(writer, "getetag", &event.get_etag())?; .propfind(props.clone())
} .map_err(|_e| quick_xml::Error::TextNotFound)?;
"calendar-data" => {
write_string_prop(writer, "C:calendar-data", event.to_ics())?; writer.write_event(quick_xml::events::Event::Text(BytesText::from_escaped(
} propfind_result,
"getcontenttype" => { )))?;
write_string_prop(
writer,
"getcontenttype",
"text/calendar;charset=utf-8",
)?;
}
prop => {
dbg!(prop);
}
}
}
Ok(())
},
)?;
} }
Ok(()) Ok(())
}) })
@@ -112,7 +96,7 @@ pub async fn route_report_calendar<A: CheckAuthentication, C: CalendarStore>(
"calendar-multiget" => {} "calendar-multiget" => {}
_ => return Err(Error::BadRequest), _ => return Err(Error::BadRequest),
}; };
handle_report_calendar_query(query_node, request, events).await handle_report_calendar_query(query_node, request, events, context.store.clone()).await
} }
pub async fn handle_mkcol_calendar_set<C: CalendarStore>( pub async fn handle_mkcol_calendar_set<C: CalendarStore>(