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

Make prefix a parameter to decrease chaos

Browse Source
This commit is contained in:
Lennart
2024-05-25 22:19:38 +02:00
parent d0f652a951
commit 38f5338ceb
7 changed files with 24 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
crates/dav/src/dav_resource.rs
View File

@@ -17,7 +17,7 @@ pub trait Resource {
Self::PropType::VARIANTS
}
fn get_prop(&self, prop: Self::PropType) -> Result<Self::PropResponse>;
fn get_prop(&self, prefix: &str, prop: Self::PropType) -> Result<Self::PropResponse>;
fn get_path(&self) -> &str;
}
@@ -36,7 +36,6 @@ pub trait ResourceService: Sized {
req: HttpRequest,
auth_info: AuthInfo,
path_components: Self::PathComponents,
prefix: String,
) -> Result<Self, Error>;
async fn get_file(&self) -> Result<Self::File>;
@@ -73,13 +72,14 @@ enum PropstatType<T1: Serialize, T2: Serialize> {
#[async_trait(?Send)]
pub trait HandlePropfind {
async fn propfind(&self, props: Vec<&str>) -> Result<impl Serialize>;
async fn propfind(&self, prefix: &str, props: Vec<&str>) -> Result<impl Serialize>;
}
#[async_trait(?Send)]
impl<R: Resource> HandlePropfind for R {
async fn propfind(
&self,
prefix: &str,
props: Vec<&str>,
) -> Result<PropstatResponseElement<PropWrapper<Vec<R::PropResponse>>, TagList>> {
let mut props = props.into_iter().unique().collect_vec();
@@ -95,7 +95,7 @@ impl<R: Resource> HandlePropfind for R {
let mut prop_responses = Vec::new();
for prop in props {
if let Ok(valid_prop) = R::PropType::from_str(prop) {
match self.get_prop(valid_prop.clone()) {
match self.get_prop(prefix, valid_prop.clone()) {
Ok(response) => {
prop_responses.push(response);
}

6
crates/dav/src/propfind.rs
View File

@@ -87,15 +87,15 @@ pub async fn handle_propfind<
let prefix = prefix.0.to_owned();
let path_components = path.into_inner();
let resource_service = R::new(req, auth_info.clone(), path_components.clone(), prefix).await?;
let resource_service = R::new(req, auth_info.clone(), path_components.clone()).await?;
let resource = resource_service.get_file().await?;
let response = resource.propfind(props.clone()).await?;
let response = resource.propfind(&prefix, props.clone()).await?;
let mut member_responses = Vec::new();
if depth != Depth::Zero {
for member in resource_service.get_members(auth_info).await? {
member_responses.push(member.propfind(props.clone()).await?);
member_responses.push(member.propfind(&prefix, props.clone()).await?);
}
}