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

simple refactoring

Browse Source
This commit is contained in:
Lennart
2024-11-06 16:18:11 +01:00
parent c21993ab15
commit f56fd81d0e
8 changed files with 40 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -99,7 +99,7 @@ pub async fn handle_calendar_multiget<C: CalendarStore + ?Sized>(
.into_iter()
.map(|path| ResponseElement {
href: path,
status: Some(format!("HTTP/1.1 {}", StatusCode::NOT_FOUND)),
status: Some(StatusCode::NOT_FOUND),
..Default::default()
})
.collect();

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

@@ -88,7 +88,7 @@ pub async fn handle_sync_collection<C: CalendarStore + ?Sized>(
.unwrap();
responses.push(ResponseElement {
href: path,
status: Some(format!("HTTP/1.1 {}", StatusCode::NOT_FOUND)),
status: Some(StatusCode::NOT_FOUND),
..Default::default()
});
}

2
crates/carddav/src/addressbook/methods/report/addressbook_multiget.rs
View File

@@ -104,7 +104,7 @@ pub async fn handle_addressbook_multiget<AS: AddressbookStore + ?Sized>(
.into_iter()
.map(|path| ResponseElement {
href: path,
status: Some(format!("HTTP/1.1 {}", StatusCode::NOT_FOUND)),
status: Some(StatusCode::NOT_FOUND),
..Default::default()
})
.collect();

2
crates/carddav/src/addressbook/methods/report/sync_collection.rs
View File

@@ -86,7 +86,7 @@ pub async fn handle_sync_collection<AS: AddressbookStore + ?Sized>(
.unwrap();
responses.push(ResponseElement {
href: path,
status: Some(format!("HTTP/1.1 {}", StatusCode::NOT_FOUND)),
status: Some(StatusCode::NOT_FOUND),
..Default::default()
});
}

6
crates/dav/src/resource/methods/proppatch.rs
View File

@@ -135,15 +135,15 @@ pub(crate) async fn route_proppatch<R: ResourceService>(
propstat: vec![
PropstatWrapper::TagList(PropstatElement {
prop: TagList::from(props_ok),
status: format!("HTTP/1.1 {}", StatusCode::OK),
status: StatusCode::OK,
}),
PropstatWrapper::TagList(PropstatElement {
prop: TagList::from(props_not_found),
status: format!("HTTP/1.1 {}", StatusCode::NOT_FOUND),
status: StatusCode::NOT_FOUND,
}),
PropstatWrapper::TagList(PropstatElement {
prop: TagList::from(props_conflict),
status: format!("HTTP/1.1 {}", StatusCode::CONFLICT),
status: StatusCode::CONFLICT,
}),
],
..Default::default()

21
crates/dav/src/resource/mod.rs
View File

@@ -158,20 +158,21 @@ pub trait Resource: Clone + 'static {
Error::BadRequest("propname MUST be the only queried prop".to_owned()).into(),
);
}
let props: Vec<String> = Self::list_props()
.iter()
.map(|&prop| prop.to_string())
.collect();
let props = Self::list_props()
.into_iter()
.map(str::to_owned)
.collect_vec();
return Ok(ResponseElement {
href: path.to_owned(),
propstat: vec![PropstatWrapper::TagList(PropstatElement {
prop: TagList::from(props),
status: format!("HTTP/1.1 {}", StatusCode::OK),
status: StatusCode::OK,
})],
..Default::default()
});
}
if props.contains(&"allprop") {
if props.len() != 1 {
// allprop MUST be the only queried prop per spec
@@ -198,10 +199,8 @@ pub trait Resource: Clone + 'static {
let internal_prop_responses: Vec<_> = internal_props
.into_iter()
.map(|prop| self.get_internal_prop(rmap, user, &prop))
.collect::<Result<Vec<CommonPropertiesProp>, Self::Error>>()?
.into_iter()
.map(EitherProp::Right)
.collect();
.map_ok(EitherProp::Right)
.collect::<Result<_, Self::Error>>()?;
let mut prop_responses = valid_props
.into_iter()
@@ -211,14 +210,14 @@ pub trait Resource: Clone + 'static {
prop_responses.extend(internal_prop_responses);
let mut propstats = vec![PropstatWrapper::Normal(PropstatElement {
status: format!("HTTP/1.1 {}", StatusCode::OK),
status: StatusCode::OK,
prop: PropTagWrapper {
prop: prop_responses,
},
})];
if !invalid_props.is_empty() {
propstats.push(PropstatWrapper::TagList(PropstatElement {
status: format!("HTTP/1.1 {}", StatusCode::NOT_FOUND),
status: StatusCode::NOT_FOUND,
prop: invalid_props
.into_iter()
.map(|s| s.to_owned())

25
crates/dav/src/xml/multistatus.rs
View File

@@ -1,8 +1,10 @@
use crate::{namespace::Namespace, xml::TagList};
use actix_web::{
body::BoxBody, http::header::ContentType, HttpRequest, HttpResponse, Responder, ResponseError,
body::BoxBody,
http::{header::ContentType, StatusCode},
HttpRequest, HttpResponse, Responder, ResponseError,
};
use serde::Serialize;
use serde::{Serialize, Serializer};
// Intermediate struct because of a serde limitation, see following article:
// https://stackoverflow.com/questions/78444158/unsupportedcannot-serialize-enum-newtype-variant-exampledata
@@ -18,7 +20,12 @@ pub struct PropTagWrapper<T: Serialize> {
#[serde(rename_all = "kebab-case")]
pub struct PropstatElement<PropType: Serialize> {
pub prop: PropType,
pub status: String,
#[serde(serialize_with = "serialize_status")]
pub status: StatusCode,
}
fn serialize_status<S: Serializer>(status: &StatusCode, serializer: S) -> Result<S::Ok, S::Error> {
format!("HTTP/1.1 {}", status).serialize(serializer)
}
#[derive(Serialize)]
@@ -36,10 +43,20 @@ pub enum PropstatWrapper<T: Serialize> {
pub struct ResponseElement<PropstatType: Serialize> {
pub href: String,
#[serde(skip_serializing_if = "Option::is_none")]
pub status: Option<String>,
#[serde(serialize_with = "serialize_optional_status")]
pub status: Option<StatusCode>,
pub propstat: Vec<PropstatWrapper<PropstatType>>,
}
fn serialize_optional_status<S: Serializer>(
status_option: &Option<StatusCode>,
serializer: S,
) -> Result<S::Ok, S::Error> {
status_option
.map(|status| format!("HTTP/1.1 {}", status))
.serialize(serializer)
}
impl<PT: Serialize> Default for ResponseElement<PT> {
fn default() -> Self {
Self {

9
crates/dav/src/xml/tag_list.rs
View File

@@ -1,3 +1,4 @@
use derive_more::derive::From;
use serde::ser::SerializeMap;
use serde::{
@@ -5,7 +6,7 @@ use serde::{
Deserialize, Serialize,
};
#[derive(Clone, Debug, PartialEq)]
#[derive(Clone, Debug, PartialEq, From)]
pub struct TagList(Vec<String>);
struct TagListVisitor;
@@ -59,9 +60,3 @@ impl TagList {
self.0
}
}
impl From<Vec<String>> for TagList {
fn from(value: Vec<String>) -> Self {
Self(value)
}
}