nikdoof/rustical
1
1
Fork 0
mirror of https://github.com/lennart-k/rustical.git synced 2025-12-13 19:22:26 +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

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())