diff --git a/Cargo.lock b/Cargo.lock index d7846b7..72f9dca 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -88,7 +88,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e01ed3140b2f8d422c68afa1ed2e85d996ea619c988ac834d255db32138655cb" dependencies = [ "quote", - "syn 2.0.29", + "syn 2.0.31", ] [[package]] @@ -194,14 +194,14 @@ dependencies = [ [[package]] name = "actix-web-codegen" -version = "4.2.1" +version = "4.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8cc9afd177d10afc1e7842eaf6b8b24a38f4d22088b197a2b9395b102c4413eb" +checksum = "eb1f50ebbb30eca122b188319a4398b3f7bb4a8cdf50ecfb73bfc6a3c3ce54f5" dependencies = [ "actix-router", "proc-macro2", "quote", - "syn 2.0.29", + "syn 2.0.31", ] [[package]] @@ -248,9 +248,9 @@ dependencies = [ [[package]] name = "aho-corasick" -version = "1.0.4" +version = "1.0.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6748e8def348ed4d14996fa801f4122cd763fff530258cdc03f64b25f89d3a5a" +checksum = "0c378d78423fdad8089616f827526ee33c19f2fddbd5de1629152c9593ba4783" dependencies = [ "memchr", ] @@ -374,7 +374,7 @@ checksum = "bc00ceb34980c03614e35a3a4e218276a0a824e911d07651cd0d858a51e8c0f0" dependencies = [ "proc-macro2", "quote", - "syn 2.0.29", + "syn 2.0.31", ] [[package]] @@ -493,9 +493,9 @@ checksum = "14c189c53d098945499cdfa7ecc63567cf3886b3332b312a5b4585d8d3a6a610" [[package]] name = "bytes" -version = "1.4.0" +version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "89b2fd2a0dcf38d7971e2194b6b6eebab45ae01067456a7fd93d5547a61b70be" +checksum = "a2bd12c1caf447e69cd4528f47f94d203fd2582878ecb9e9465484c4148a8223" [[package]] name = "bytestring" @@ -524,9 +524,9 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" [[package]] name = "chrono" -version = "0.4.27" +version = "0.4.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f56b4c72906975ca04becb8a30e102dfecddd0c06181e3e95ddc444be28881f8" +checksum = "defd4e7873dbddba6c7c91e199c7fcb946abc4a6a4ac3195400bcfb01b5de877" dependencies = [ "android-tzdata", "iana-time-zone", @@ -565,7 +565,7 @@ dependencies = [ "heck", "proc-macro2", "quote", - "syn 2.0.29", + "syn 2.0.31", ] [[package]] @@ -800,6 +800,12 @@ version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6999dc1837253364c2ebb0704ba97994bd874e8f195d665c50b7548f6ea92764" +[[package]] +name = "finl_unicode" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8fcfdc7a0362c9f4444381a9e697c79d435fe65b52a37466fc2c1184cee9edc6" + [[package]] name = "flate2" version = "1.0.27" @@ -889,7 +895,7 @@ checksum = "89ca545a94061b6365f2c7355b4b32bd20df3ff95f02da9329b34ccc3bd6ee72" dependencies = [ "proc-macro2", "quote", - "syn 2.0.29", + "syn 2.0.31", ] [[package]] @@ -1143,9 +1149,9 @@ dependencies = [ [[package]] name = "itertools" -version = "0.10.5" +version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b0fd2260e829bddf4cb6ea802289de2f86d6a7a690192fbe91b3f46e0f2c8473" +checksum = "b1c173a5686ce8bfa551b3563d0c2170bf24ca44da99c7ca4bfdab5418c3fe57" dependencies = [ "either", ] @@ -1263,9 +1269,9 @@ dependencies = [ [[package]] name = "memchr" -version = "2.5.0" +version = "2.6.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d" +checksum = "8f232d6ef707e1956a43342693d2a31e72989554d58299d7a88738cc95b0d35c" [[package]] name = "mime" @@ -1389,9 +1395,9 @@ dependencies = [ [[package]] name = "object" -version = "0.32.0" +version = "0.32.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "77ac5bbd07aea88c60a577a1ce218075ffd59208b2d7ca97adf9bfc5aeb21ebe" +checksum = "9cf5f9dd3933bd50a9e1f149ec995f39ae2c496d31fd772c1fd45ebc27e902b0" dependencies = [ "memchr", ] @@ -1486,7 +1492,7 @@ checksum = "4359fd9c9171ec6e8c62926d6faaf553a8dc3f64e1507e76da7911b4f6a04405" dependencies = [ "proc-macro2", "quote", - "syn 2.0.29", + "syn 2.0.31", ] [[package]] @@ -1603,9 +1609,9 @@ dependencies = [ [[package]] name = "regex" -version = "1.9.4" +version = "1.9.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "12de2eff854e5fa4b1295edd650e227e9d8fb0c9e90b12e7f36d6a6811791a29" +checksum = "697061221ea1b4a94a624f67d0ae2bfe4e22b8a17b6a192afb11046542cc8c47" dependencies = [ "aho-corasick", "memchr", @@ -1615,9 +1621,9 @@ dependencies = [ [[package]] name = "regex-automata" -version = "0.3.7" +version = "0.3.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49530408a136e16e5b486e883fbb6ba058e8e4e8ae6621a77b048b314336e629" +checksum = "c2f401f4955220693b56f8ec66ee9c78abffd8d1c4f23dc41a23839eb88f0795" dependencies = [ "aho-corasick", "memchr", @@ -1686,7 +1692,7 @@ dependencies = [ "env_logger", "rustical_api", "rustical_auth", - "rustical_dav", + "rustical_caldav", "rustical_frontend", "rustical_store", "serde", @@ -1720,12 +1726,13 @@ dependencies = [ ] [[package]] -name = "rustical_dav" +name = "rustical_caldav" version = "0.1.0" dependencies = [ "actix-web", "actix-web-httpauth", "anyhow", + "async-trait", "base64 0.21.3", "derive_more", "futures-util", @@ -1735,6 +1742,7 @@ dependencies = [ "rustical_store", "serde", "serde_json", + "thiserror", "tokio", ] @@ -1767,9 +1775,9 @@ dependencies = [ [[package]] name = "rustix" -version = "0.38.10" +version = "0.38.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ed6248e1caa625eb708e266e06159f135e8c26f2bb7ceb72dc4b2766d0340964" +checksum = "c0c3dde1fc030af041adc40e79c0e7fbcf431dd24870053d187d7c66e4b87453" dependencies = [ "bitflags 2.4.0", "errno", @@ -1813,7 +1821,7 @@ checksum = "4eca7ac642d82aa35b60049a6eccb4be6be75e599bd2e9adb5f875a737654af2" dependencies = [ "proc-macro2", "quote", - "syn 2.0.29", + "syn 2.0.31", ] [[package]] @@ -1941,9 +1949,9 @@ dependencies = [ [[package]] name = "sqlformat" -version = "0.2.1" +version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0c12bc9199d1db8234678b7051747c07f517cdcf019262d1847b94ec8b1aee3e" +checksum = "6b7b278788e7be4d0d29c0f39497a0eef3fba6bbc8e70d8bf7fde46edeaa9e85" dependencies = [ "itertools", "nom", @@ -2159,10 +2167,11 @@ dependencies = [ [[package]] name = "stringprep" -version = "0.1.3" +version = "0.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "db3737bde7edce97102e0e2b15365bf7a20bfdb5f60f4f9e8d7004258a51a8da" +checksum = "bb41d74e231a107a1b4ee36bd1214b11285b77768d2e3824aedafa988fd36ee6" dependencies = [ + "finl_unicode", "unicode-bidi", "unicode-normalization", ] @@ -2192,9 +2201,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.29" +version = "2.0.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c324c494eba9d92503e6f1ef2e6df781e78f6a7705a0202d9801b198807d518a" +checksum = "718fa2415bcb8d8bd775917a1bf12a7931b6dfa890753378538118181e0cb398" dependencies = [ "proc-macro2", "quote", @@ -2225,22 +2234,22 @@ dependencies = [ [[package]] name = "thiserror" -version = "1.0.47" +version = "1.0.48" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "97a802ec30afc17eee47b2855fc72e0c4cd62be9b4efe6591edde0ec5bd68d8f" +checksum = "9d6d7a740b8a666a7e828dd00da9c0dc290dff53154ea77ac109281de90589b7" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.47" +version = "1.0.48" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6bb623b56e39ab7dcd4b1b98bb6c8f8d907ed255b18de254088016b27a8ee19b" +checksum = "49922ecae66cc8a249b77e68d1d0623c1b2c514f0060c27cdc68bd62a1219d35" dependencies = [ "proc-macro2", "quote", - "syn 2.0.29", + "syn 2.0.31", ] [[package]] @@ -2314,7 +2323,7 @@ checksum = "630bdcf245f78637c13ec01ffae6187cca34625e8c63150d424b59e55af2675e" dependencies = [ "proc-macro2", "quote", - "syn 2.0.29", + "syn 2.0.31", ] [[package]] @@ -2344,9 +2353,9 @@ dependencies = [ [[package]] name = "toml" -version = "0.7.6" +version = "0.7.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c17e963a819c331dcacd7ab957d80bc2b9a9c1e71c804826d2f283dd65306542" +checksum = "dd79e69d3b627db300ff956027cc6c3798cef26d22526befdfcd12feeb6d2257" dependencies = [ "serde", "serde_spanned", @@ -2365,9 +2374,9 @@ dependencies = [ [[package]] name = "toml_edit" -version = "0.19.14" +version = "0.19.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f8123f27e969974a3dfba720fdb560be359f57b44302d280ba72e76a74480e8a" +checksum = "1b5bb770da30e5cbfde35a2d7b9b8a2c4b8ef89548a7a6aeab5c9a576e3e7421" dependencies = [ "indexmap 2.0.0", "serde", @@ -2397,7 +2406,7 @@ checksum = "5f4f31f56159e98206da9efd823404b79b6ef3143b4a7ab76e67b1751b25a4ab" dependencies = [ "proc-macro2", "quote", - "syn 2.0.29", + "syn 2.0.31", ] [[package]] @@ -2519,7 +2528,7 @@ dependencies = [ "once_cell", "proc-macro2", "quote", - "syn 2.0.29", + "syn 2.0.31", "wasm-bindgen-shared", ] @@ -2541,7 +2550,7 @@ checksum = "54681b18a46765f095758388f2d0cf16eb8d4169b639ab575a8f5693af210c7b" dependencies = [ "proc-macro2", "quote", - "syn 2.0.29", + "syn 2.0.31", "wasm-bindgen-backend", "wasm-bindgen-shared", ] diff --git a/Cargo.toml b/Cargo.toml index b3e648c..8170665 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -7,7 +7,7 @@ edition = "2021" rustical_store = { path = "./crates/store/" } rustical_auth = { path = "./crates/auth/" } rustical_api = { path = "./crates/api/" } -rustical_dav = { path = "./crates/dav/" } +rustical_caldav = { path = "./crates/caldav/" } rustical_frontend = { path = "./crates/frontend/" } serde = { version = "1.0.188", features = ["derive"] } tokio = { version = "1.32.0", features = [ diff --git a/crates/dav/Cargo.toml b/crates/caldav/Cargo.toml similarity index 96% rename from crates/dav/Cargo.toml rename to crates/caldav/Cargo.toml index 2e2194b..007d8b0 100644 --- a/crates/dav/Cargo.toml +++ b/crates/caldav/Cargo.toml @@ -1,5 +1,5 @@ [package] -name = "rustical_dav" +name = "rustical_caldav" version = "0.1.0" edition = "2021" diff --git a/crates/dav/src/depth_extractor.rs b/crates/caldav/src/depth_extractor.rs similarity index 100% rename from crates/dav/src/depth_extractor.rs rename to crates/caldav/src/depth_extractor.rs diff --git a/crates/dav/src/error.rs b/crates/caldav/src/error.rs similarity index 100% rename from crates/dav/src/error.rs rename to crates/caldav/src/error.rs diff --git a/crates/dav/src/lib.rs b/crates/caldav/src/lib.rs similarity index 100% rename from crates/dav/src/lib.rs rename to crates/caldav/src/lib.rs diff --git a/crates/dav/src/namespace.rs b/crates/caldav/src/namespace.rs similarity index 100% rename from crates/dav/src/namespace.rs rename to crates/caldav/src/namespace.rs diff --git a/crates/dav/src/proptypes.rs b/crates/caldav/src/proptypes.rs similarity index 100% rename from crates/dav/src/proptypes.rs rename to crates/caldav/src/proptypes.rs diff --git a/crates/dav/src/resource.rs b/crates/caldav/src/resource.rs similarity index 100% rename from crates/dav/src/resource.rs rename to crates/caldav/src/resource.rs diff --git a/crates/dav/src/resources/calendar.rs b/crates/caldav/src/resources/calendar.rs similarity index 100% rename from crates/dav/src/resources/calendar.rs rename to crates/caldav/src/resources/calendar.rs diff --git a/crates/dav/src/resources/event.rs b/crates/caldav/src/resources/event.rs similarity index 100% rename from crates/dav/src/resources/event.rs rename to crates/caldav/src/resources/event.rs diff --git a/crates/dav/src/resources/mod.rs b/crates/caldav/src/resources/mod.rs similarity index 100% rename from crates/dav/src/resources/mod.rs rename to crates/caldav/src/resources/mod.rs diff --git a/crates/dav/src/resources/principal.rs b/crates/caldav/src/resources/principal.rs similarity index 100% rename from crates/dav/src/resources/principal.rs rename to crates/caldav/src/resources/principal.rs diff --git a/crates/dav/src/resources/root.rs b/crates/caldav/src/resources/root.rs similarity index 100% rename from crates/dav/src/resources/root.rs rename to crates/caldav/src/resources/root.rs diff --git a/crates/dav/src/routes/calendar.rs b/crates/caldav/src/routes/calendar.rs similarity index 100% rename from crates/dav/src/routes/calendar.rs rename to crates/caldav/src/routes/calendar.rs diff --git a/crates/dav/src/routes/event.rs b/crates/caldav/src/routes/event.rs similarity index 100% rename from crates/dav/src/routes/event.rs rename to crates/caldav/src/routes/event.rs diff --git a/crates/dav/src/routes/mod.rs b/crates/caldav/src/routes/mod.rs similarity index 100% rename from crates/dav/src/routes/mod.rs rename to crates/caldav/src/routes/mod.rs diff --git a/crates/dav/src/routes/propfind.rs b/crates/caldav/src/routes/propfind.rs similarity index 100% rename from crates/dav/src/routes/propfind.rs rename to crates/caldav/src/routes/propfind.rs diff --git a/crates/dav/src/xml_snippets.rs b/crates/caldav/src/xml_snippets.rs similarity index 100% rename from crates/dav/src/xml_snippets.rs rename to crates/caldav/src/xml_snippets.rs diff --git a/src/main.rs b/src/main.rs index 0c97429..e0b7397 100644 --- a/src/main.rs +++ b/src/main.rs @@ -6,7 +6,7 @@ use clap::Parser; use config::{CalendarStoreConfig, TomlCalendarStoreConfig}; use rustical_api::configure_api; use rustical_auth::AuthProvider; -use rustical_dav::{configure_dav, configure_well_known}; +use rustical_caldav::{configure_dav, configure_well_known}; use rustical_frontend::configure_frontend; use rustical_store::toml_store::TomlCalendarStore; use std::fs;