diff --git a/crates/dav/src/lib.rs b/crates/dav/src/lib.rs index 7696099..202f6d3 100644 --- a/crates/dav/src/lib.rs +++ b/crates/dav/src/lib.rs @@ -17,11 +17,11 @@ use tokio::sync::RwLock; pub mod depth_extractor; pub mod error; pub mod namespace; -mod propfind; pub mod proptypes; pub mod resource; pub mod resources; pub mod routes; +mod xml_snippets; pub struct CalDavContext { pub prefix: String, diff --git a/crates/dav/src/resource.rs b/crates/dav/src/resource.rs index 223b888..0131644 100644 --- a/crates/dav/src/resource.rs +++ b/crates/dav/src/resource.rs @@ -6,7 +6,7 @@ use async_trait::async_trait; use quick_xml::Writer; use rustical_auth::AuthInfo; -use crate::propfind::{write_invalid_props_response, write_propstat_response}; +use crate::xml_snippets::{write_invalid_props_response, write_propstat_response}; // A resource is identified by a URI and has properties // A resource can also be a collection diff --git a/crates/dav/src/resources/calendar.rs b/crates/dav/src/resources/calendar.rs index fe0a54c..0a3c143 100644 --- a/crates/dav/src/resources/calendar.rs +++ b/crates/dav/src/resources/calendar.rs @@ -9,9 +9,9 @@ use rustical_store::calendar::{Calendar, CalendarStore}; use tokio::sync::RwLock; use crate::{ - propfind::write_resourcetype, proptypes::{write_href_prop, write_string_prop}, resource::Resource, + xml_snippets::write_resourcetype, }; pub struct CalendarResource { diff --git a/crates/dav/src/resources/principal.rs b/crates/dav/src/resources/principal.rs index 71c3a6c..5bca405 100644 --- a/crates/dav/src/resources/principal.rs +++ b/crates/dav/src/resources/principal.rs @@ -1,6 +1,6 @@ use std::sync::Arc; -use crate::{propfind::write_resourcetype, proptypes::write_href_prop, resource::Resource}; +use crate::{proptypes::write_href_prop, resource::Resource, xml_snippets::write_resourcetype}; use actix_web::{web::Data, HttpRequest}; use anyhow::{anyhow, Result}; use async_trait::async_trait; diff --git a/crates/dav/src/resources/root.rs b/crates/dav/src/resources/root.rs index a7878b2..294dead 100644 --- a/crates/dav/src/resources/root.rs +++ b/crates/dav/src/resources/root.rs @@ -1,4 +1,4 @@ -use crate::{propfind::write_resourcetype, resource::Resource}; +use crate::{resource::Resource, xml_snippets::write_resourcetype}; use actix_web::HttpRequest; use anyhow::{anyhow, Result}; use async_trait::async_trait; diff --git a/crates/dav/src/routes/calendar.rs b/crates/dav/src/routes/calendar.rs index 112a7c2..23e3362 100644 --- a/crates/dav/src/routes/calendar.rs +++ b/crates/dav/src/routes/calendar.rs @@ -1,7 +1,7 @@ use crate::namespace::Namespace; -use crate::propfind::generate_multistatus; use crate::resource::HandlePropfind; use crate::resources::event::EventResource; +use crate::xml_snippets::generate_multistatus; use crate::{CalDavContext, Error}; use actix_web::http::header::ContentType; use actix_web::web::{Data, Path}; diff --git a/crates/dav/src/routes/propfind.rs b/crates/dav/src/routes/propfind.rs index 4eae43e..a8a5c8c 100644 --- a/crates/dav/src/routes/propfind.rs +++ b/crates/dav/src/routes/propfind.rs @@ -1,8 +1,8 @@ use crate::depth_extractor::Depth; use crate::error::Error; use crate::namespace::Namespace; -use crate::propfind::generate_multistatus; use crate::resource::{HandlePropfind, Resource}; +use crate::xml_snippets::generate_multistatus; use crate::CalDavContext; use actix_web::http::header::ContentType; use actix_web::web::{Data, Path}; diff --git a/crates/dav/src/propfind.rs b/crates/dav/src/xml_snippets.rs similarity index 100% rename from crates/dav/src/propfind.rs rename to crates/dav/src/xml_snippets.rs