version 0.11.6

carddav: Implement addressbook-query
caldav: Outsource text-match to rustical_dav
2025-12-27 23:09:12 +00:00 · 2025-12-27 14:23:56 +01:00 · 2025-12-27 14:22:23 +01:00 · 2025-12-27 13:45:26 +01:00 · 2025-12-21 16:16:48 +01:00 · 2025-12-20 14:30:26 +01:00
24 changed files with 738 additions and 92 deletions
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -26,6 +26,15 @@ dependencies = [
 "memchr",
 ]

+[[package]]
+name = "alloca"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e5a7d05ea6aea7e9e64d25b9156ba2fee3fdd659e34e41063cd2fc7cd020d7f4"
+dependencies = [
+ "cc",
+]
+
 [[package]]
 name = "allocator-api2"
 version = "0.2.21"
@@ -41,6 +50,12 @@ dependencies = [
 "libc",
 ]

+[[package]]
+name = "anes"
+version = "0.1.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4b46cbb362ab8752921c97e041f5e366ee6297bd428a31275b9fcf1e380f7299"
+
 [[package]]
 name = "anstream"
 version = "0.6.21"
@@ -541,10 +556,16 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b35204fbdc0b3f4446b89fc1ac2cf84a8a68971995d0bf2e925ec7cd960f9cb3"

 [[package]]
-name = "cc"
-version = "1.2.49"
+name = "cast"
+version = "0.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "90583009037521a116abf44494efecd645ba48b6622457080f080b85544e2215"
+checksum = "37b2a672a2cb129a2e41c10b1224bb368f9f37a2b16b612598138befd7b37eb5"
+
+[[package]]
+name = "cc"
+version = "1.2.50"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9f50d563227a1c37cc0a263f64eca3334388c01c5e4c4861a9def205c614383c"
 dependencies = [
 "find-msvc-tools",
 "shlex",
@@ -595,6 +616,33 @@ dependencies = [
 "phf",
 ]

+[[package]]
+name = "ciborium"
+version = "0.2.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "42e69ffd6f0917f5c029256a24d0161db17cea3997d185db0d35926308770f0e"
+dependencies = [
+ "ciborium-io",
+ "ciborium-ll",
+ "serde",
+]
+
+[[package]]
+name = "ciborium-io"
+version = "0.2.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "05afea1e0a06c9be33d539b876f1ce3692f4afea2cb41f740e7743225ed1c757"
+
+[[package]]
+name = "ciborium-ll"
+version = "0.2.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "57663b653d948a338bfb3eeba9bb2fd5fcfaecb9e199e87e1eda4d9e8b240fd9"
+dependencies = [
+ "ciborium-io",
+ "half",
+]
+
 [[package]]
 name = "clap"
 version = "4.5.53"
@@ -718,6 +766,61 @@ version = "2.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "19d374276b40fb8bbdee95aef7c7fa6b5316ec764510eb64b8dd0e2ed0d7e7f5"

+[[package]]
+name = "criterion"
+version = "0.8.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4d883447757bb0ee46f233e9dc22eb84d93a9508c9b868687b274fc431d886bf"
+dependencies = [
+ "alloca",
+ "anes",
+ "cast",
+ "ciborium",
+ "clap",
+ "criterion-plot",
+ "itertools 0.13.0",
+ "num-traits",
+ "oorandom",
+ "page_size",
+ "plotters",
+ "rayon",
+ "regex",
+ "serde",
+ "serde_json",
+ "tinytemplate",
+ "tokio",
+ "walkdir",
+]
+
+[[package]]
+name = "criterion-plot"
+version = "0.8.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ed943f81ea2faa8dcecbbfa50164acf95d555afec96a27871663b300e387b2e4"
+dependencies = [
+ "cast",
+ "itertools 0.13.0",
+]
+
+[[package]]
+name = "crossbeam-deque"
+version = "0.8.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9dd111b7b7f7d55b72c0a6ae361660ee5853c9af73f70c3c2ef6858b950e2e51"
+dependencies = [
+ "crossbeam-epoch",
+ "crossbeam-utils",
+]
+
+[[package]]
+name = "crossbeam-epoch"
+version = "0.9.18"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5b82ac4a3c2ca9c3460964f020e1402edd5753411d7737aa39c3714ad1b5420e"
+dependencies = [
+ "crossbeam-utils",
+]
+
 [[package]]
 name = "crossbeam-queue"
 version = "0.3.12"
@@ -733,6 +836,12 @@ version = "0.8.21"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d0a5c400df2834b80a4c3327b3aad3a4c4cd4de0629063962b03235697506a28"

+[[package]]
+name = "crunchy"
+version = "0.2.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "460fbee9c2c2f33933d720630a6a0bac33ba7053db5344fac858d4b8952d77d5"
+
 [[package]]
 name = "crypto-bigint"
 version = "0.5.5"
@@ -1382,6 +1491,17 @@ dependencies = [
 "tracing",
 ]

+[[package]]
+name = "half"
+version = "2.7.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6ea2d84b969582b4b1864a92dc5d27cd2b77b622a8d79306834f1be5ba20d84b"
+dependencies = [
+ "cfg-if",
+ "crunchy",
+ "zerocopy",
+]
+
 [[package]]
 name = "hashbrown"
 version = "0.12.3"
@@ -1641,14 +1761,13 @@ dependencies = [
 [[package]]
 name = "ical"
 version = "0.11.0"
-source = "git+https://github.com/lennart-k/ical-rs#8698980a24cbf5dbf711f3edbb8a3ea9540b89eb"
+source = "git+https://github.com/lennart-k/ical-rs#d384dd45495722d69c7f76d62a54a8d6481e90ee"
 dependencies = [
 "chrono",
 "chrono-tz",
 "itertools 0.14.0",
 "lazy_static",
 "regex",
- "serde",
 "thiserror 2.0.17",
 ]

@@ -1833,6 +1952,15 @@ dependencies = [
 "either",
 ]

+[[package]]
+name = "itertools"
+version = "0.13.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "413ee7dfc52ee1a4949ceeb7dbc8a33f2d6c088194d9f922fb8318faf1f01186"
+dependencies = [
+ "either",
+]
+
 [[package]]
 name = "itertools"
 version = "0.14.0"
@@ -2134,6 +2262,12 @@ version = "1.70.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "384b8ab6d37215f3c5301a95a4accb5d64aa607f1fcb26a11b5303878451b4fe"

+[[package]]
+name = "oorandom"
+version = "11.1.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d6790f58c7ff633d8771f42965289203411a5e5c68388703c06e14f24770b41e"
+
 [[package]]
 name = "openidconnect"
 version = "4.0.1"
@@ -2328,6 +2462,16 @@ dependencies = [
 "sha2",
 ]

+[[package]]
+name = "page_size"
+version = "0.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "30d5b2194ed13191c1999ae0704b7839fb18384fa22e49b57eeaa97d79ce40da"
+dependencies = [
+ "libc",
+ "winapi",
+]
+
 [[package]]
 name = "parking"
 version = "2.2.1"
@@ -2539,6 +2683,34 @@ version = "0.3.32"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7edddbd0b52d732b21ad9a5fab5c704c14cd949e5e9a1ec5929a24fded1b904c"

+[[package]]
+name = "plotters"
+version = "0.3.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5aeb6f403d7a4911efb1e33402027fc44f29b5bf6def3effcc22d7bb75f2b747"
+dependencies = [
+ "num-traits",
+ "plotters-backend",
+ "plotters-svg",
+ "wasm-bindgen",
+ "web-sys",
+]
+
+[[package]]
+name = "plotters-backend"
+version = "0.3.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "df42e13c12958a16b3f7f4386b9ab1f3e7933914ecea48da7139435263a4172a"
+
+[[package]]
+name = "plotters-svg"
+version = "0.3.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "51bae2ac328883f7acdfea3d66a7c35751187f870bc81f94563733a154d7a670"
+dependencies = [
+ "plotters-backend",
+]
+
 [[package]]
 name = "polling"
 version = "3.11.0"
@@ -2778,6 +2950,26 @@ dependencies = [
 "getrandom 0.3.4",
 ]

+[[package]]
+name = "rayon"
+version = "1.11.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "368f01d005bf8fd9b1206fb6fa653e6c4a81ceb1466406b81792d87c5677a58f"
+dependencies = [
+ "either",
+ "rayon-core",
+]
+
+[[package]]
+name = "rayon-core"
+version = "1.13.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "22e18b0f0062d30d4230b2e85ff77fdfe4326feb054b9783a3460d8435c8ab91"
+dependencies = [
+ "crossbeam-deque",
+ "crossbeam-utils",
+]
+
 [[package]]
 name = "redox_syscall"
 version = "0.5.18"
@@ -3069,7 +3261,7 @@ dependencies = [

 [[package]]
 name = "rustical"
-version = "0.11.4"
+version = "0.11.6"
 dependencies = [
 "anyhow",
 "argon2",
@@ -3114,7 +3306,7 @@ dependencies = [

 [[package]]
 name = "rustical_caldav"
-version = "0.11.4"
+version = "0.11.6"
 dependencies = [
 "async-std",
 "async-trait",
@@ -3156,7 +3348,7 @@ dependencies = [

 [[package]]
 name = "rustical_carddav"
-version = "0.11.4"
+version = "0.11.6"
 dependencies = [
 "async-trait",
 "axum",
@@ -3189,7 +3381,7 @@ dependencies = [

 [[package]]
 name = "rustical_dav"
-version = "0.11.4"
+version = "0.11.6"
 dependencies = [
 "async-trait",
 "axum",
@@ -3198,6 +3390,7 @@ dependencies = [
 "futures-util",
 "headers",
 "http",
+ "ical",
 "itertools 0.14.0",
 "log",
 "matchit 0.9.0",
@@ -3214,7 +3407,7 @@ dependencies = [

 [[package]]
 name = "rustical_dav_push"
-version = "0.11.4"
+version = "0.11.6"
 dependencies = [
 "async-trait",
 "axum",
@@ -3239,7 +3432,7 @@ dependencies = [

 [[package]]
 name = "rustical_frontend"
-version = "0.11.4"
+version = "0.11.6"
 dependencies = [
 "askama",
 "askama_web",
@@ -3275,7 +3468,7 @@ dependencies = [

 [[package]]
 name = "rustical_ical"
-version = "0.11.4"
+version = "0.11.6"
 dependencies = [
 "axum",
 "chrono",
@@ -3292,7 +3485,7 @@ dependencies = [

 [[package]]
 name = "rustical_oidc"
-version = "0.11.4"
+version = "0.11.6"
 dependencies = [
 "async-trait",
 "axum",
@@ -3308,7 +3501,7 @@ dependencies = [

 [[package]]
 name = "rustical_store"
-version = "0.11.4"
+version = "0.11.6"
 dependencies = [
 "anyhow",
 "async-trait",
@@ -3341,10 +3534,11 @@ dependencies = [

 [[package]]
 name = "rustical_store_sqlite"
-version = "0.11.4"
+version = "0.11.6"
 dependencies = [
 "async-trait",
 "chrono",
+ "criterion",
 "derive_more",
 "password-auth",
 "password-hash",
@@ -3363,7 +3557,7 @@ dependencies = [

 [[package]]
 name = "rustical_xml"
-version = "0.11.4"
+version = "0.11.6"
 dependencies = [
 "quick-xml",
 "thiserror 2.0.17",
@@ -4137,6 +4331,16 @@ dependencies = [
 "zerovec",
 ]

+[[package]]
+name = "tinytemplate"
+version = "1.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "be4d6b5f19ff7664e8c98d03e2139cb510db9b0a60b55f8e8709b689d939b6bc"
+dependencies = [
+ "serde",
+ "serde_json",
+]
+
 [[package]]
 name = "tinyvec"
 version = "1.10.0"
@@ -4831,6 +5035,22 @@ dependencies = [
 "wasite",
 ]

+[[package]]
+name = "winapi"
+version = "0.3.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419"
+dependencies = [
+ "winapi-i686-pc-windows-gnu",
+ "winapi-x86_64-pc-windows-gnu",
+]
+
+[[package]]
+name = "winapi-i686-pc-windows-gnu"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6"
+
 [[package]]
 name = "winapi-util"
 version = "0.1.11"
@@ -4840,6 +5060,12 @@ dependencies = [
 "windows-sys 0.61.2",
 ]

+[[package]]
+name = "winapi-x86_64-pc-windows-gnu"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
+
 [[package]]
 name = "windows-core"
 version = "0.62.2"
@@ -5153,7 +5379,7 @@ checksum = "9edde0db4769d2dc68579893f2306b26c6ecfbe0ef499b013d731b7b9247e0b9"

 [[package]]
 name = "xml_derive"
-version = "0.11.4"
+version = "0.11.6"
 dependencies = [
 "darling 0.23.0",
 "heck",
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -2,7 +2,7 @@
 members = ["crates/*"]

 [workspace.package]
-version = "0.11.4"
+version = "0.11.6"
 rust-version = "1.91"
 edition = "2024"
 description = "A CalDAV server"
@@ -32,12 +32,11 @@ opentelemetry = [
  "dep:tracing-opentelemetry",
 ]

-
 [profile.dev]
 debug = 0

 [workspace.dependencies]
-rustical_dav = { path = "./crates/dav/" }
+rustical_dav = { path = "./crates/dav/", features = ["ical"] }
 rustical_dav_push = { path = "./crates/dav_push/" }
 rustical_store = { path = "./crates/store/" }
 rustical_store_sqlite = { path = "./crates/store_sqlite/" }
@@ -109,7 +108,6 @@ strum_macros = "0.27"
 serde_json = { version = "1.0", features = ["raw_value"] }
 sqlx-sqlite = { version = "0.8", features = ["bundled"] }
 ical = { git = "https://github.com/lennart-k/ical-rs", features = [
-  "serde",
  "chrono-tz",
 ] }
 toml = "0.9"
@@ -149,6 +147,7 @@ openssl = { version = "0.10", features = ["vendored"] }
 async-std = { version = "1.13", features = ["attributes"] }
 similar-asserts = "1.7"
 insta = { version = "1.44", features = ["filters"] }
+criterion = { version = "0.8", features = ["async_tokio"] }

 [dev-dependencies]
 rstest.workspace = true
--- a/crates/caldav/Cargo.toml
+++ b/crates/caldav/Cargo.toml
@@ -29,7 +29,7 @@ base64.workspace = true
 serde.workspace = true
 tokio.workspace = true
 url.workspace = true
-rustical_dav.workspace = true
+rustical_dav = { workspace = true, features = ["ical"] }
 rustical_store.workspace = true
 chrono.workspace = true
 chrono-tz.workspace = true
--- a/crates/caldav/src/calendar/methods/report/calendar_query/comp_filter.rs
+++ b/crates/caldav/src/calendar/methods/report/calendar_query/comp_filter.rs
@@ -137,13 +137,11 @@ impl CompFilterable for CalendarObjectComponent {
 #[cfg(test)]
 mod tests {
    use chrono::{TimeZone, Utc};
+    use rustical_dav::xml::{NegateCondition, TextCollation, TextMatchElement};
    use rustical_ical::{CalendarObject, UtcDateTime};

    use crate::calendar::methods::report::calendar_query::{
-        CompFilterable, TextMatchElement, TimeRangeElement,
-        comp_filter::CompFilterElement,
-        prop_filter::PropFilterElement,
-        text_match::{NegateCondition, TextCollation},
+        CompFilterElement, CompFilterable, PropFilterElement, TimeRangeElement,
    };

    const ICS: &str = r"BEGIN:VCALENDAR
--- a/crates/caldav/src/calendar/methods/report/calendar_query/elements.rs
+++ b/crates/caldav/src/calendar/methods/report/calendar_query/elements.rs
@@ -1,11 +1,6 @@
-use crate::{
-    calendar::methods::report::calendar_query::{
-        TextMatchElement,
-        comp_filter::{CompFilterElement, CompFilterable},
-    },
-    calendar_object::CalendarObjectPropWrapperName,
-};
-use rustical_dav::xml::PropfindType;
+use super::comp_filter::{CompFilterElement, CompFilterable};
+use crate::calendar_object::CalendarObjectPropWrapperName;
+use rustical_dav::xml::{PropfindType, TextMatchElement};
 use rustical_ical::{CalendarObject, UtcDateTime};
 use rustical_store::calendar_store::CalendarQuery;
 use rustical_xml::XmlDeserialize;
--- a/crates/caldav/src/calendar/methods/report/calendar_query/mod.rs
+++ b/crates/caldav/src/calendar/methods/report/calendar_query/mod.rs
@@ -5,14 +5,11 @@ use rustical_store::CalendarStore;
 mod comp_filter;
 mod elements;
 mod prop_filter;
-pub mod text_match;
 #[allow(unused_imports)]
 pub use comp_filter::{CompFilterElement, CompFilterable};
 pub use elements::*;
 #[allow(unused_imports)]
 pub use prop_filter::{PropFilterElement, PropFilterable};
-#[allow(unused_imports)]
-pub use text_match::TextMatchElement;

 pub async fn get_objects_calendar_query<C: CalendarStore>(
    cal_query: &CalendarQueryRequest,
@@ -31,21 +28,16 @@ pub async fn get_objects_calendar_query<C: CalendarStore>(

 #[cfg(test)]
 mod tests {
-    use rustical_dav::xml::PropElement;
-    use rustical_xml::XmlDocument;
-
+    use super::{
+        CalendarQueryRequest, FilterElement, ParamFilterElement, comp_filter::CompFilterElement,
+        prop_filter::PropFilterElement,
+    };
    use crate::{
-        calendar::methods::report::{
-            ReportRequest,
-            calendar_query::{
-                CalendarQueryRequest, FilterElement, ParamFilterElement, TextMatchElement,
-                comp_filter::CompFilterElement,
-                prop_filter::PropFilterElement,
-                text_match::{NegateCondition, TextCollation},
-            },
-        },
+        calendar::methods::report::ReportRequest,
        calendar_object::{CalendarData, CalendarObjectPropName, CalendarObjectPropWrapperName},
    };
+    use rustical_dav::xml::{NegateCondition, PropElement, TextCollation, TextMatchElement};
+    use rustical_xml::XmlDocument;

    #[test]
    fn calendar_query_7_8_7() {
--- a/crates/caldav/src/calendar/methods/report/calendar_query/prop_filter.rs
+++ b/crates/caldav/src/calendar/methods/report/calendar_query/prop_filter.rs
@@ -1,5 +1,4 @@
-use std::collections::HashMap;
-
+use super::{ParamFilterElement, TimeRangeElement};
 use ical::{
    generator::{IcalCalendar, IcalEvent},
    parser::{
@@ -8,12 +7,10 @@ use ical::{
    },
    property::Property,
 };
+use rustical_dav::xml::TextMatchElement;
 use rustical_ical::{CalDateTime, CalendarObject, CalendarObjectComponent, UtcDateTime};
 use rustical_xml::XmlDeserialize;
-
-use crate::calendar::methods::report::calendar_query::{
-    ParamFilterElement, TextMatchElement, TimeRangeElement,
-};
+use std::collections::HashMap;

 #[derive(XmlDeserialize, Clone, Debug, PartialEq, Eq)]
 #[allow(dead_code)]
--- a/crates/caldav/src/calendar/prop.rs
+++ b/crates/caldav/src/calendar/prop.rs
@@ -1,10 +1,9 @@
 use derive_more::derive::{From, Into};
+use rustical_dav::xml::TextCollation;
 use rustical_ical::CalendarObjectType;
 use rustical_xml::{XmlDeserialize, XmlSerialize};
 use strum_macros::VariantArray;

-use crate::calendar::methods::report::calendar_query::text_match::TextCollation;
-
 #[derive(Debug, Clone, XmlSerialize, XmlDeserialize, PartialEq, Eq, From, Into)]
 pub struct SupportedCalendarComponent {
    #[xml(ty = "attr")]
--- a/crates/carddav/Cargo.toml
+++ b/crates/carddav/Cargo.toml
@@ -22,7 +22,7 @@ base64.workspace = true
 serde.workspace = true
 tokio.workspace = true
 url.workspace = true
-rustical_dav.workspace = true
+rustical_dav = { workspace = true, features = ["ical"] }
 rustical_store.workspace = true
 chrono.workspace = true
 rustical_xml.workspace = true
--- a/crates/carddav/src/addressbook/methods/report/addressbook_query/elements.rs
+++ b/crates/carddav/src/addressbook/methods/report/addressbook_query/elements.rs
@@ -0,0 +1,77 @@
+use crate::{
+    address_object::AddressObjectPropWrapperName,
+    addressbook::methods::report::addressbook_query::PropFilterElement,
+};
+use rustical_dav::xml::{PropfindType, TextMatchElement};
+use rustical_ical::{AddressObject, UtcDateTime};
+use rustical_xml::XmlDeserialize;
+
+#[derive(XmlDeserialize, Clone, Debug, PartialEq, Eq)]
+#[allow(dead_code)]
+pub struct TimeRangeElement {
+    #[xml(ty = "attr")]
+    pub(crate) start: Option<UtcDateTime>,
+    #[xml(ty = "attr")]
+    pub(crate) end: Option<UtcDateTime>,
+}
+
+#[derive(XmlDeserialize, Clone, Debug, PartialEq, Eq)]
+#[allow(dead_code)]
+// https://www.rfc-editor.org/rfc/rfc4791#section-9.7.3
+pub struct ParamFilterElement {
+    #[xml(ns = "rustical_dav::namespace::NS_CARDDAV")]
+    pub(crate) is_not_defined: Option<()>,
+    #[xml(ns = "rustical_dav::namespace::NS_CARDDAV")]
+    pub(crate) text_match: Option<TextMatchElement>,
+
+    #[xml(ty = "attr")]
+    pub(crate) name: String,
+}
+
+#[derive(XmlDeserialize, Clone, Debug, PartialEq, Eq)]
+#[allow(dead_code)]
+//  <!ELEMENT filter (prop-filter*)>
+//  <!ATTLIST filter test (anyof | allof) "anyof">
+//  <!-- test value:
+//              anyof logical OR for prop-filter matches
+//              allof logical AND for prop-filter matches -->
+pub struct FilterElement {
+    #[xml(ty = "attr")]
+    pub anyof: Option<String>,
+    #[xml(ty = "attr")]
+    pub allof: Option<String>,
+    #[xml(ns = "rustical_dav::namespace::NS_CARDDAV", flatten)]
+    pub(crate) prop_filter: Vec<PropFilterElement>,
+}
+
+impl FilterElement {
+    #[must_use]
+    pub fn matches(&self, addr_object: &AddressObject) -> bool {
+        let allof = match (self.allof.is_some(), self.anyof.is_some()) {
+            (true, false) => true,
+            (false, _) => false,
+            (true, true) => panic!("wat"),
+        };
+        let mut results = self
+            .prop_filter
+            .iter()
+            .map(|prop_filter| prop_filter.match_component(addr_object));
+        if allof {
+            results.all(|x| x)
+        } else {
+            results.any(|x| x)
+        }
+    }
+}
+
+#[derive(XmlDeserialize, Clone, Debug, PartialEq, Eq)]
+#[allow(dead_code)]
+//  <!ELEMENT addressbook-query ((DAV:allprop |
+//                                  DAV:propname |
+//                                  DAV:prop)?, filter, limit?)>
+pub struct AddressbookQueryRequest {
+    #[xml(ty = "untagged")]
+    pub prop: PropfindType<AddressObjectPropWrapperName>,
+    #[xml(ns = "rustical_dav::namespace::NS_CARDDAV")]
+    pub(crate) filter: FilterElement,
+}
--- a/crates/carddav/src/addressbook/methods/report/addressbook_query/mod.rs
+++ b/crates/carddav/src/addressbook/methods/report/addressbook_query/mod.rs
@@ -0,0 +1,19 @@
+use crate::Error;
+mod elements;
+mod prop_filter;
+pub use elements::*;
+#[allow(unused_imports)]
+pub use prop_filter::{PropFilterElement, PropFilterable};
+use rustical_ical::AddressObject;
+use rustical_store::AddressbookStore;
+
+pub async fn get_objects_addressbook_query<AS: AddressbookStore>(
+    addr_query: &AddressbookQueryRequest,
+    principal: &str,
+    addressbook_id: &str,
+    store: &AS,
+) -> Result<Vec<AddressObject>, Error> {
+    let mut objects = store.get_objects(principal, addressbook_id).await?;
+    objects.retain(|object| addr_query.filter.matches(object));
+    Ok(objects)
+}
--- a/crates/carddav/src/addressbook/methods/report/addressbook_query/prop_filter.rs
+++ b/crates/carddav/src/addressbook/methods/report/addressbook_query/prop_filter.rs
@@ -0,0 +1,75 @@
+use super::ParamFilterElement;
+use ical::{parser::Component, property::Property};
+use rustical_dav::xml::TextMatchElement;
+use rustical_ical::AddressObject;
+use rustical_xml::XmlDeserialize;
+
+#[derive(XmlDeserialize, Clone, Debug, PartialEq, Eq)]
+#[allow(dead_code)]
+//  <!ELEMENT prop-filter (is-not-defined |
+//                          (text-match*, param-filter*))>
+//
+//  <!ATTLIST prop-filter name CDATA #REQUIRED
+//                          test (anyof | allof) "anyof">
+//  <!-- name value: a vCard property name (e.g., "NICKNAME")
+//      test value:
+//          anyof logical OR for text-match/param-filter matches
+//          allof logical AND for text-match/param-filter matches -->
+pub struct PropFilterElement {
+    #[xml(ns = "rustical_dav::namespace::NS_CARDDAV")]
+    pub(crate) is_not_defined: Option<()>,
+    #[xml(ns = "rustical_dav::namespace::NS_CARDDAV", flatten)]
+    pub(crate) text_match: Vec<TextMatchElement>,
+    #[xml(ns = "rustical_dav::namespace::NS_CARDDAV", flatten)]
+    pub(crate) param_filter: Vec<ParamFilterElement>,
+
+    #[xml(ty = "attr")]
+    pub(crate) name: String,
+
+    #[xml(ty = "attr")]
+    pub anyof: Option<String>,
+    #[xml(ty = "attr")]
+    pub allof: Option<String>,
+}
+
+impl PropFilterElement {
+    pub fn match_component(&self, comp: &impl PropFilterable) -> bool {
+        let property = comp.get_property(&self.name);
+        let _property = match (self.is_not_defined.is_some(), property) {
+            // We are the component that's not supposed to be defined
+            (true, Some(_))
+            // We don't match
+            | (false, None) => return false,
+            // We shall not be and indeed we aren't
+            (true, None) => return true,
+            (false, Some(property)) => property
+        };
+
+        let _allof = match (self.allof.is_some(), self.anyof.is_some()) {
+            (true, false) => true,
+            (false, _) => false,
+            (true, true) => panic!("wat"),
+        };
+
+        // TODO: IMPLEMENT
+        // if let Some(text_match) = &self.text_match
+        //     && !text_match.match_property(property)
+        // {
+        //     return false;
+        // }
+
+        // TODO: param-filter
+
+        true
+    }
+}
+
+pub trait PropFilterable {
+    fn get_property(&self, name: &str) -> Option<&Property>;
+}
+
+impl PropFilterable for AddressObject {
+    fn get_property(&self, name: &str) -> Option<&Property> {
+        self.get_vcard().get_property(name)
+    }
+}
--- a/crates/carddav/src/addressbook/methods/report/mod.rs
+++ b/crates/carddav/src/addressbook/methods/report/mod.rs
@@ -1,6 +1,14 @@
 use crate::{
-    CardDavPrincipalUri, Error, address_object::AddressObjectPropWrapperName,
-    addressbook::AddressbookResourceService,
+    CardDavPrincipalUri, Error,
+    address_object::{
+        AddressObjectPropWrapper, AddressObjectPropWrapperName, resource::AddressObjectResource,
+    },
+    addressbook::{
+        AddressbookResourceService,
+        methods::report::addressbook_query::{
+            AddressbookQueryRequest, get_objects_addressbook_query,
+        },
+    },
 };
 use addressbook_multiget::{AddressbookMultigetRequest, handle_addressbook_multiget};
 use axum::{
@@ -8,19 +16,30 @@ use axum::{
    extract::{OriginalUri, Path, State},
    response::IntoResponse,
 };
-use rustical_dav::xml::{PropfindType, sync_collection::SyncCollectionRequest};
+use http::StatusCode;
+use rustical_dav::{
+    resource::{PrincipalUri, Resource},
+    xml::{
+        MultistatusElement, PropfindType, multistatus::ResponseElement,
+        sync_collection::SyncCollectionRequest,
+    },
+};
+use rustical_ical::AddressObject;
 use rustical_store::{AddressbookStore, SubscriptionStore, auth::Principal};
 use rustical_xml::{XmlDeserialize, XmlDocument};
 use sync_collection::handle_sync_collection;
 use tracing::instrument;

 mod addressbook_multiget;
+mod addressbook_query;
 mod sync_collection;

 #[derive(XmlDeserialize, XmlDocument, Clone, Debug, PartialEq)]
 pub(crate) enum ReportRequest {
    #[xml(ns = "rustical_dav::namespace::NS_CARDDAV")]
    AddressbookMultiget(AddressbookMultigetRequest),
+    #[xml(ns = "rustical_dav::namespace::NS_CARDDAV")]
+    AddressbookQuery(AddressbookQueryRequest),
    #[xml(ns = "rustical_dav::namespace::NS_DAV")]
    SyncCollection(SyncCollectionRequest<AddressObjectPropWrapperName>),
 }
@@ -29,11 +48,49 @@ impl ReportRequest {
    const fn props(&self) -> &PropfindType<AddressObjectPropWrapperName> {
        match self {
            Self::AddressbookMultiget(AddressbookMultigetRequest { prop, .. })
-            | Self::SyncCollection(SyncCollectionRequest { prop, .. }) => prop,
+            | Self::SyncCollection(SyncCollectionRequest { prop, .. })
+            | Self::AddressbookQuery(AddressbookQueryRequest { prop, .. }) => prop,
        }
    }
 }

+fn objects_response(
+    objects: Vec<AddressObject>,
+    not_found: Vec<String>,
+    path: &str,
+    principal: &str,
+    puri: &impl PrincipalUri,
+    user: &Principal,
+    prop: &PropfindType<AddressObjectPropWrapperName>,
+) -> Result<MultistatusElement<AddressObjectPropWrapper, String>, Error> {
+    let mut responses = Vec::new();
+    for object in objects {
+        let path = format!("{}/{}.vcf", path, object.get_id());
+        responses.push(
+            AddressObjectResource {
+                object,
+                principal: principal.to_owned(),
+            }
+            .propfind(&path, prop, None, puri, user)?,
+        );
+    }
+
+    let not_found_responses = not_found
+        .into_iter()
+        .map(|path| ResponseElement {
+            href: path,
+            status: Some(StatusCode::NOT_FOUND),
+            ..Default::default()
+        })
+        .collect();
+
+    Ok(MultistatusElement {
+        responses,
+        member_responses: not_found_responses,
+        ..Default::default()
+    })
+}
+
 #[instrument(skip(addr_store))]
 pub async fn route_report_addressbook<AS: AddressbookStore, S: SubscriptionStore>(
    Path((principal, addressbook_id)): Path<(String, String)>,
@@ -75,13 +132,34 @@ pub async fn route_report_addressbook<AS: AddressbookStore, S: SubscriptionStore
            )
            .await?
        }
+        ReportRequest::AddressbookQuery(addr_query) => {
+            let objects = get_objects_addressbook_query(
+                addr_query,
+                &principal,
+                &addressbook_id,
+                addr_store.as_ref(),
+            )
+            .await?;
+            objects_response(
+                objects,
+                vec![],
+                uri.path(),
+                &principal,
+                &puri,
+                &user,
+                &addr_query.prop,
+            )?
+        }
    })
 }

 #[cfg(test)]
 mod tests {
    use super::*;
-    use crate::address_object::AddressObjectPropName;
+    use crate::{
+        address_object::AddressObjectPropName,
+        addressbook::methods::report::addressbook_query::{FilterElement, PropFilterElement},
+    };
    use rustical_dav::xml::{PropElement, sync_collection::SyncLevel};

    #[test]
@@ -144,4 +222,46 @@ mod tests {
            })
        );
    }
+
+    #[test]
+    fn test_xml_addressbook_query() {
+        let report_request = ReportRequest::parse_str(
+            r#"
+            <?xml version="1.0" encoding="utf-8"?>
+                <card:addressbook-query xmlns:card="urn:ietf:params:xml:ns:carddav" xmlns:d="DAV:">
+                <d:prop>
+                    <d:getetag/>
+                </d:prop>
+                <card:filter>
+                    <card:prop-filter name="FN"/>
+                </card:filter>
+            </card:addressbook-query>
+        "#,
+        )
+        .unwrap();
+
+        assert_eq!(
+            report_request,
+            ReportRequest::AddressbookQuery(AddressbookQueryRequest {
+                prop: rustical_dav::xml::PropfindType::Prop(PropElement(
+                    vec![AddressObjectPropWrapperName::AddressObject(
+                        AddressObjectPropName::Getetag
+                    ),],
+                    vec![]
+                )),
+                filter: FilterElement {
+                    anyof: None,
+                    allof: None,
+                    prop_filter: vec![PropFilterElement {
+                        name: "FN".to_owned(),
+                        is_not_defined: None,
+                        text_match: vec![],
+                        param_filter: vec![],
+                        allof: None,
+                        anyof: None
+                    }]
+                }
+            })
+        );
+    }
 }
--- a/crates/dav/Cargo.toml
+++ b/crates/dav/Cargo.toml
@@ -28,3 +28,7 @@ headers.workspace = true
 strum.workspace = true
 matchit.workspace = true
 matchit-serde.workspace = true
+ical = { workspace = true, optional = true }
+
+[features]
+ical = ["dep:ical"]
--- a/crates/dav/src/xml/mod.rs
+++ b/crates/dav/src/xml/mod.rs
@@ -15,3 +15,7 @@ mod report_set;
 pub use report_set::SupportedReportSet;
 mod group;
 pub use group::*;
+#[cfg(feature = "ical")]
+mod text_match;
+#[cfg(feature = "ical")]
+pub use text_match::*;
--- a/crates/caldav/src/calendar/methods/report/calendar_query/text_match.rs
+++ b/crates/caldav/src/calendar/methods/report/calendar_query/text_match.rs
@@ -64,9 +64,9 @@ pub struct TextMatchElement {
    #[xml(ty = "attr", default = "Default::default")]
    pub collation: TextCollation,
    #[xml(ty = "attr", default = "Default::default")]
-    pub(crate) negate_condition: NegateCondition,
+    pub negate_condition: NegateCondition,
    #[xml(ty = "text")]
-    pub(crate) needle: String,
+    pub needle: String,
 }

 impl TextMatchElement {
@@ -90,7 +90,7 @@ impl TextMatchElement {

 #[cfg(test)]
 mod tests {
-    use crate::calendar::methods::report::calendar_query::text_match::TextCollation;
+    use super::TextCollation;

    #[test]
    fn test_collation() {
--- a/crates/ical/src/address_object.rs
+++ b/crates/ical/src/address_object.rs
@@ -179,4 +179,9 @@ END:VCALENDAR",
        }
        Ok(out)
    }
+
+    #[must_use]
+    pub fn get_vcard(&self) -> &VcardContact {
+        &self.vcard
+    }
 }
--- a/crates/store/src/calendar_store.rs
+++ b/crates/store/src/calendar_store.rs
@@ -77,13 +77,23 @@ pub trait CalendarStore: Send + Sync + 'static {
        object_id: &str,
        show_deleted: bool,
    ) -> Result<CalendarObject, Error>;
+    async fn put_objects(
+        &self,
+        principal: String,
+        cal_id: String,
+        objects: Vec<CalendarObject>,
+        overwrite: bool,
+    ) -> Result<(), Error>;
    async fn put_object(
        &self,
        principal: String,
        cal_id: String,
        object: CalendarObject,
        overwrite: bool,
-    ) -> Result<(), Error>;
+    ) -> Result<(), Error> {
+        self.put_objects(principal, cal_id, vec![object], overwrite)
+            .await
+    }
    async fn delete_object(
        &self,
        principal: &str,
--- a/crates/store/src/combined_calendar_store.rs
+++ b/crates/store/src/combined_calendar_store.rs
@@ -147,15 +147,15 @@ impl CalendarStore for CombinedCalendarStore {
            .await
    }

-    async fn put_object(
+    async fn put_objects(
        &self,
        principal: String,
        cal_id: String,
-        object: rustical_ical::CalendarObject,
+        objects: Vec<rustical_ical::CalendarObject>,
        overwrite: bool,
    ) -> Result<(), crate::Error> {
        self.store_for_id(&cal_id)
-            .put_object(principal, cal_id, object, overwrite)
+            .put_objects(principal, cal_id, objects, overwrite)
            .await
    }

--- a/crates/store_sqlite/Cargo.toml
+++ b/crates/store_sqlite/Cargo.toml
@@ -11,8 +11,13 @@ publish = false
 [features]
 test = ["dep:rstest"]

+[[bench]]
+name = "insert_calendar_object"
+harness = false
+
 [dev-dependencies]
 rstest.workspace = true
+criterion.workspace = true

 [dependencies]
 tokio.workspace = true
--- a/crates/store_sqlite/benches/ical_event.ics
+++ b/crates/store_sqlite/benches/ical_event.ics
@@ -0,0 +1,47 @@
+BEGIN:VCALENDAR
+CALSCALE:GREGORIAN
+PRODID:-//Ximian//NONSGML Evolution Calendar//EN
+VERSION:2.0
+
+BEGIN:VTIMEZONE
+TZID:Europe/Berlin
+X-LIC-LOCATION:Europe/Berlin
+BEGIN:DAYLIGHT
+TZNAME:CEST
+TZOFFSETFROM:+0100
+TZOFFSETTO:+0200
+DTSTART:19810329T020000
+RRULE:FREQ=YEARLY;UNTIL=20370329T010000Z;BYDAY=-1SU;BYMONTH=3
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:CET
+TZOFFSETFROM:+0200
+TZOFFSETTO:+0100
+DTSTART:19961027T030000
+RRULE:FREQ=YEARLY;UNTIL=20361026T010000Z;BYDAY=-1SU;BYMONTH=10
+END:STANDARD
+END:VTIMEZONE
+
+
+BEGIN:VEVENT
+UID:fa915b604e6e3f36772501ff869439e6a3c5cf67
+DTSTAMP:20250726T112617Z
+DTSTART;VALUE=DATE:20250806
+DTEND;VALUE=DATE:20250807
+SEQUENCE:2
+SUMMARY:all day event
+TRANSP:OPAQUE
+CLASS:PUBLIC
+CREATED:20250726T144426Z
+LAST-MODIFIED:20250726T144426Z
+BEGIN:VALARM
+TRIGGER:-PT30M
+REPEAT:2
+DURATION:PT15M
+ACTION:DISPLAY
+DESCRIPTION:Breakfast meeting with executive\n
+team at 8:30 AM EST.
+END:VALARM
+END:VEVENT
+
+END:VCALENDAR
--- a/crates/store_sqlite/benches/insert_calendar_object.rs
+++ b/crates/store_sqlite/benches/insert_calendar_object.rs
@@ -0,0 +1,70 @@
+use criterion::{Criterion, criterion_group, criterion_main};
+use rustical_ical::{CalendarObject, CalendarObjectType};
+use rustical_store::{Calendar, CalendarMetadata, CalendarStore};
+use rustical_store_sqlite::tests::get_test_calendar_store;
+
+fn benchmark(c: &mut Criterion) {
+    let runtime = tokio::runtime::Runtime::new().unwrap();
+    let cal_store = runtime.block_on(async {
+        let cal_store = get_test_calendar_store().await;
+
+        cal_store
+            .insert_calendar(Calendar {
+                meta: CalendarMetadata {
+                    displayname: Some("Yeet".to_owned()),
+                    order: 0,
+                    description: None,
+                    color: None,
+                },
+                principal: "user".to_owned(),
+                id: "okwow".to_owned(),
+                timezone_id: None,
+                deleted_at: None,
+                synctoken: 0,
+                subscription_url: None,
+                push_topic: "asd".to_owned(),
+                components: vec![
+                    CalendarObjectType::Event,
+                    CalendarObjectType::Todo,
+                    CalendarObjectType::Journal,
+                ],
+            })
+            .await
+            .unwrap();
+        cal_store
+    });
+
+    let object = CalendarObject::from_ics(include_str!("ical_event.ics").to_owned(), None).unwrap();
+
+    let batch_size = 1000;
+    let objects: Vec<_> = std::iter::repeat_n(object.clone(), batch_size).collect();
+
+    c.bench_function("put_batch", |b| {
+        b.to_async(&runtime).iter(async || {
+            // yeet
+            cal_store
+                .put_objects("user".to_owned(), "okwow".to_owned(), objects.clone(), true)
+                .await
+                .unwrap();
+        });
+    });
+
+    c.bench_function("put_single", |b| {
+        b.to_async(&runtime).iter(async || {
+            // yeet
+            for _ in 0..1000 {
+                cal_store
+                    .put_object("user".to_owned(), "okwow".to_owned(), object.clone(), true)
+                    .await
+                    .unwrap();
+            }
+        });
+    });
+
+    runtime
+        .block_on(cal_store.delete_calendar("user", "okwow", false))
+        .unwrap();
+}
+
+criterion_group!(benches, benchmark);
+criterion_main!(benches);
--- a/crates/store_sqlite/src/addressbook_store/birthday_calendar.rs
+++ b/crates/store_sqlite/src/addressbook_store/birthday_calendar.rs
@@ -394,11 +394,11 @@ impl CalendarStore for SqliteAddressbookStore {
    }

    #[instrument]
-    async fn put_object(
+    async fn put_objects(
        &self,
        _principal: String,
        _cal_id: String,
-        _object: CalendarObject,
+        _objects: Vec<CalendarObject>,
        _overwrite: bool,
    ) -> Result<(), Error> {
        Err(Error::ReadOnly)
--- a/crates/store_sqlite/src/calendar_store.rs
+++ b/crates/store_sqlite/src/calendar_store.rs
@@ -776,11 +776,11 @@ impl CalendarStore for SqliteCalendarStore {
    }

    #[instrument]
-    async fn put_object(
+    async fn put_objects(
        &self,
        principal: String,
        cal_id: String,
-        object: CalendarObject,
+        objects: Vec<CalendarObject>,
        overwrite: bool,
    ) -> Result<(), Error> {
        let mut tx = self
@@ -789,33 +789,37 @@ impl CalendarStore for SqliteCalendarStore {
            .await
            .map_err(crate::Error::from)?;

-        let object_id = object.get_id().to_owned();
-
        let calendar = Self::_get_calendar(&mut *tx, &principal, &cal_id, true).await?;
        if calendar.subscription_url.is_some() {
            // We cannot commit an object to a subscription calendar
            return Err(Error::ReadOnly);
        }

-        Self::_put_object(&mut *tx, &principal, &cal_id, &object, overwrite).await?;
-
-        let sync_token = Self::log_object_operation(
-            &mut tx,
-            &principal,
-            &cal_id,
-            &object_id,
-            ChangeOperation::Add,
-        )
-        .await?;
+        let mut sync_token = None;
+        for object in objects {
+            sync_token = Some(
+                Self::log_object_operation(
+                    &mut tx,
+                    &principal,
+                    &cal_id,
+                    object.get_id(),
+                    ChangeOperation::Add,
+                )
+                .await?,
+            );
+            Self::_put_object(&mut *tx, &principal, &cal_id, &object, overwrite).await?;
+        }

        tx.commit().await.map_err(crate::Error::from)?;

-        self.send_push_notification(
-            CollectionOperationInfo::Content { sync_token },
-            self.get_calendar(&principal, &cal_id, true)
-                .await?
-                .push_topic,
-        );
+        if let Some(sync_token) = sync_token {
+            self.send_push_notification(
+                CollectionOperationInfo::Content { sync_token },
+                self.get_calendar(&principal, &cal_id, true)
+                    .await?
+                    .push_topic,
+            );
+        }
        Ok(())
    }
Author	SHA1	Message	Date
Lennart	b65cca9d17	version 0.11.6	2025-12-27 14:23:56 +01:00
Lennart	55ecbdcd41	carddav: Implement addressbook-query	2025-12-27 14:22:23 +01:00
Lennart	89d3d3b7a4	caldav: Outsource text-match to rustical_dav	2025-12-27 13:45:26 +01:00
Lennart K	a74b74369c	version 0.11.5	2025-12-21 16:16:48 +01:00
Lennart K	85c49a0bdf	update ical-rs	2025-12-20 14:30:26 +01:00
Lennart K	f2e4e2c1a7	add a database benchmark	2025-12-20 11:48:30 +01:00
Lennart K	28c925301e	calendar store: Add method for bulk insert	2025-12-20 11:48:05 +01:00