diff --git a/crates/caldav/Cargo.toml b/crates/caldav/Cargo.toml index 007d8b0..968b389 100644 --- a/crates/caldav/Cargo.toml +++ b/crates/caldav/Cargo.toml @@ -17,6 +17,7 @@ quick-xml = { version = "0.30.0", features = [ ] } roxmltree = "0.18.0" rustical_store = { path = "../store/" } +rustical_dav = { path = "../dav/" } rustical_auth = { path = "../auth/" } serde = { version = "1.0.188", features = ["serde_derive", "derive"] } serde_json = "1.0.105" diff --git a/crates/caldav/src/lib.rs b/crates/caldav/src/lib.rs index 202f6d3..fc178ed 100644 --- a/crates/caldav/src/lib.rs +++ b/crates/caldav/src/lib.rs @@ -16,7 +16,6 @@ use tokio::sync::RwLock; pub mod depth_extractor; pub mod error; -pub mod namespace; pub mod proptypes; pub mod resource; pub mod resources; diff --git a/crates/caldav/src/routes/calendar.rs b/crates/caldav/src/routes/calendar.rs index 23e3362..c31d8fd 100644 --- a/crates/caldav/src/routes/calendar.rs +++ b/crates/caldav/src/routes/calendar.rs @@ -1,4 +1,4 @@ -use crate::namespace::Namespace; +use rustical_dav::namespace::Namespace; use crate::resource::HandlePropfind; use crate::resources::event::EventResource; use crate::xml_snippets::generate_multistatus; diff --git a/crates/caldav/src/routes/propfind.rs b/crates/caldav/src/routes/propfind.rs index baf0e4b..5c99ab3 100644 --- a/crates/caldav/src/routes/propfind.rs +++ b/crates/caldav/src/routes/propfind.rs @@ -1,5 +1,4 @@ use crate::depth_extractor::Depth; -use crate::namespace::Namespace; use crate::resource::{HandlePropfind, Resource}; use crate::xml_snippets::generate_multistatus; use crate::CalDavContext; @@ -10,6 +9,7 @@ use actix_web::{HttpRequest, HttpResponse}; use anyhow::Result; use quick_xml::events::BytesText; use rustical_auth::{AuthInfoExtractor, CheckAuthentication}; +use rustical_dav::namespace::Namespace; use rustical_store::calendar::CalendarStore; use thiserror::Error; diff --git a/crates/dav/Cargo.toml b/crates/dav/Cargo.toml new file mode 100644 index 0000000..9d08dd2 --- /dev/null +++ b/crates/dav/Cargo.toml @@ -0,0 +1,7 @@ +[package] +name = "rustical_dav" +version = "0.1.0" +edition = "2021" + +[dependencies] +quick-xml = "0.30.0" diff --git a/crates/dav/src/lib.rs b/crates/dav/src/lib.rs new file mode 100644 index 0000000..a0cb07f --- /dev/null +++ b/crates/dav/src/lib.rs @@ -0,0 +1 @@ +pub mod namespace; diff --git a/crates/caldav/src/namespace.rs b/crates/dav/src/namespace.rs similarity index 100% rename from crates/caldav/src/namespace.rs rename to crates/dav/src/namespace.rs