version 0.12.2

Fix a typo about anniversary

.github/workflows/docker-publish.yml

@@ -2,7 +2,10 @@ name: Docker
 
 on:
   push:
-    branches: ["main", "dev"]
+    branches:
+      - main
+      - dev
+      - feat/*
   release:
     types: ["published"]
 
@@ -45,7 +48,8 @@ jobs:
         with:
           images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}
           tags: |
-            type=ref,event=branch
+            ${{ github.ref_name == 'main' && 'type=ref,event=branch' || '' }}
+            type=ref,event=branch,prefix=br-
             type=ref,event=pr
             type=semver,pattern={{version}}
             type=semver,pattern={{major}}.{{minor}}

.gitignore

@@ -16,3 +16,5 @@ site
 # Frontend
 **/node_modules
 **/.vite
+
+**/*.snap.new

.sqlx/query-146e23ae4e0eaae4d65ac7563c67d4f295ccc2534dcc4b3bd710de773ed137f9.json

@@ -0,0 +1,12 @@
+{
+  "db_name": "SQLite",
+  "query": "DELETE FROM calendarobjectchangelog WHERE (principal, cal_id, object_id) = (?, ?, ?);",
+  "describe": {
+    "columns": [],
+    "parameters": {
+      "Right": 3
+    },
+    "nullable": []
+  },
+  "hash": "146e23ae4e0eaae4d65ac7563c67d4f295ccc2534dcc4b3bd710de773ed137f9"
+}

.sqlx/query-354decac84758c88280f60fbf0f93dddc6c7ff92ac7b8ba44049d31df3c680e3.json

@@ -0,0 +1,12 @@
+{
+  "db_name": "SQLite",
+  "query": "UPDATE calendarobjects SET ics = ? WHERE (principal, cal_id, id) = (?, ?, ?);",
+  "describe": {
+    "columns": [],
+    "parameters": {
+      "Right": 4
+    },
+    "nullable": []
+  },
+  "hash": "354decac84758c88280f60fbf0f93dddc6c7ff92ac7b8ba44049d31df3c680e3"
+}

.sqlx/query-bdaa4bee8b01d0e3773e34672ed4805d1e71d24888f2227045afd90bf080fc23.json

@@ -0,0 +1,38 @@
+{
+  "db_name": "SQLite",
+  "query": "SELECT principal, cal_id, id, ics FROM calendarobjects WHERE ics LIKE '%VERSION:4.0%';",
+  "describe": {
+    "columns": [
+      {
+        "name": "principal",
+        "ordinal": 0,
+        "type_info": "Text"
+      },
+      {
+        "name": "cal_id",
+        "ordinal": 1,
+        "type_info": "Text"
+      },
+      {
+        "name": "id",
+        "ordinal": 2,
+        "type_info": "Text"
+      },
+      {
+        "name": "ics",
+        "ordinal": 3,
+        "type_info": "Text"
+      }
+    ],
+    "parameters": {
+      "Right": 0
+    },
+    "nullable": [
+      false,
+      false,
+      false,
+      false
+    ]
+  },
+  "hash": "bdaa4bee8b01d0e3773e34672ed4805d1e71d24888f2227045afd90bf080fc23"
+}

Cargo.lock

@@ -181,9 +181,9 @@ dependencies = [
 
 [[package]]
 name = "askama_web"
-version = "0.15.0"
+version = "0.15.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c0d6576f8e59513752a3e2673ca602fb403be7d0d0aacba5cd8b219838ab58fe"
+checksum = "5911a65ac3916ef133167a855d52978f9fbf54680a093e0ef29e20b7e94a4523"
 dependencies = [
  "askama",
  "askama_web_derive",
@@ -477,9 +477,9 @@ checksum = "72b3254f16251a8381aa12e40e3c4d2f0199f8c6508fbecb9d91f575e0fbb8c6"
 
 [[package]]
 name = "base64ct"
-version = "1.8.2"
+version = "1.8.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7d809780667f4410e7c41b07f52439b94d2bdf8528eeedc287fa38d3b7f95d82"
+checksum = "2af50177e190e07a26ab74f8b1efbfe2ef87da2116221318cb1c2e82baf7de06"
 
 [[package]]
 name = "basic-toml"
@@ -565,6 +565,24 @@ version = "1.11.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b35204fbdc0b3f4446b89fc1ac2cf84a8a68971995d0bf2e925ec7cd960f9cb3"
 
+[[package]]
+name = "caldata"
+version = "0.13.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5549ae654c8e80ff922297ad06c49be64668cf947cb6ce45a2069985d21a2135"
+dependencies = [
+ "chrono",
+ "chrono-tz",
+ "derive_more",
+ "itertools 0.14.0",
+ "lazy_static",
+ "phf 0.13.1",
+ "regex",
+ "rrule",
+ "thiserror 2.0.18",
+ "vtimezones-rs",
+]
+
 [[package]]
 name = "cast"
 version = "0.3.0"
@@ -573,9 +591,9 @@ checksum = "37b2a672a2cb129a2e41c10b1224bb368f9f37a2b16b612598138befd7b37eb5"
 
 [[package]]
 name = "cc"
-version = "1.2.52"
+version = "1.2.54"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cd4932aefd12402b36c60956a4fe0035421f544799057659ff86f923657aada3"
+checksum = "6354c81bbfd62d9cfa9cb3c773c2b7b2a3a482d569de977fd0e961f6e7c00583"
 dependencies = [
  "find-msvc-tools",
  "shlex",
@@ -595,9 +613,9 @@ checksum = "613afe47fcd5fac7ccf1db93babcb082c5994d996f20b8b159f2ad1658eb5724"
 
 [[package]]
 name = "chrono"
-version = "0.4.42"
+version = "0.4.43"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "145052bdd345b87320e369255277e3fb5152762ad123a901ef5c262dd38fe8d2"
+checksum = "fac4744fb15ae8337dc853fee7fb3f4e48c0fbaa23d0afe49c447b4fab126118"
 dependencies = [
  "iana-time-zone",
  "js-sys",
@@ -689,9 +707,9 @@ dependencies = [
 
 [[package]]
 name = "clap_lex"
-version = "0.7.6"
+version = "0.7.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a1d728cc89cf3aee9ff92b05e62b19ee65a02b5702cff7d5a377e32c6ae29d8d"
+checksum = "c3e64b0cc0439b12df2fa678eae89a1c56a529fd067a9115f7827f1fffd22b32"
 
 [[package]]
 name = "colorchoice"
@@ -1241,9 +1259,9 @@ dependencies = [
 
 [[package]]
 name = "find-msvc-tools"
-version = "0.1.7"
+version = "0.1.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f449e6c6c08c865631d4890cfacf252b3d396c9bcc83adb6623cdb02a8336c41"
+checksum = "8591b0bcc8a98a64310a2fae1bb3e9b8564dd10e381e6e28010fde8e8e8568db"
 
 [[package]]
 name = "flume"
@@ -1422,9 +1440,9 @@ dependencies = [
 
 [[package]]
 name = "getrandom"
-version = "0.2.16"
+version = "0.2.17"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "335ff9f135e4384c8150d6f27c6daed433577f86b4750418338c01a1a2528592"
+checksum = "ff2abc00be7fca6ebc474524697ae276ad847ad0a6b3faa4bcb027e9a4614ad0"
 dependencies = [
  "cfg-if",
  "js-sys",
@@ -1768,37 +1786,6 @@ dependencies = [
  "cc",
 ]
 
-[[package]]
-name = "ical"
-version = "0.11.0"
-source = "git+https://github.com/lennart-k/ical-rs?branch=dev#b1edcdf2bb7db5a302a5df3650218a9a16aefe0c"
-dependencies = [
- "chrono",
- "chrono-tz",
- "derive_more",
- "itertools 0.14.0",
- "lazy_static",
- "phf 0.13.1",
- "regex",
- "rrule",
- "thiserror 2.0.17",
-]
-
-[[package]]
-name = "ical"
-version = "0.11.0"
-source = "git+https://github.com/lennart-k/ical-rs#dcd3b106758a054f46a5172103abb17972ad032d"
-dependencies = [
- "chrono",
- "chrono-tz",
- "derive_more",
- "itertools 0.14.0",
- "lazy_static",
- "regex",
- "rrule",
- "thiserror 2.0.17",
-]
-
 [[package]]
 name = "icu_collections"
 version = "2.1.1"
@@ -1938,9 +1925,9 @@ checksum = "c8fae54786f62fb2918dcfae3d568594e50eb9b5c25bf04371af6fe7516452fb"
 
 [[package]]
 name = "insta"
-version = "1.46.0"
+version = "1.46.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1b66886d14d18d420ab5052cbff544fc5d34d0b2cdd35eb5976aaa10a4a472e5"
+checksum = "248b42847813a1550dafd15296fd9748c651d0c32194559dbc05d804d54b21e8"
 dependencies = [
  "console",
  "once_cell",
@@ -2006,9 +1993,9 @@ checksum = "92ecc6618181def0457392ccd0ee51198e065e016d1d527a7ac1b6dc7c1f09d2"
 
 [[package]]
 name = "js-sys"
-version = "0.3.83"
+version = "0.3.85"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "464a3709c7f55f1f721e5389aa6ea4e3bc6aba669353300af094b29ffbdde1d8"
+checksum = "8c942ebf8e95485ca0d52d97da7c5a2c387d0e7f0ba4c35e93bfcaee045955b3"
 dependencies = [
  "once_cell",
  "wasm-bindgen",
@@ -2040,9 +2027,9 @@ checksum = "bcc35a38544a891a5f7c865aca548a982ccb3b8650a5b06d0fd33a10283c56fc"
 
 [[package]]
 name = "libm"
-version = "0.2.15"
+version = "0.2.16"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f9fbbcab51052fe104eb5e5d351cf728d30a5be1fe14d9be8a3b097481fb97de"
+checksum = "b6d2cec3eae94f9f509c767b45932f1ada8350c4bdb85af2fcab4a3c14807981"
 
 [[package]]
 name = "libredox"
@@ -2133,7 +2120,7 @@ dependencies = [
  "matchit 0.9.1",
  "percent-encoding",
  "serde",
- "thiserror 2.0.17",
+ "thiserror 2.0.18",
 ]
 
 [[package]]
@@ -2215,9 +2202,9 @@ dependencies = [
 
 [[package]]
 name = "num-conv"
-version = "0.1.0"
+version = "0.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "51d515d32fb182ee37cda2ccdcb92950d6a3c2893aa280e540671c2cd0f3b1d9"
+checksum = "cf97ec579c3c42f953ef76dbf8d55ac91fb219dde70e49aa4a6b7d74e9919050"
 
 [[package]]
 name = "num-integer"
@@ -2257,7 +2244,7 @@ checksum = "51e219e79014df21a225b1860a479e2dcd7cbd9130f4defd4bd0e191ea31d67d"
 dependencies = [
  "base64 0.22.1",
  "chrono",
- "getrandom 0.2.16",
+ "getrandom 0.2.17",
  "http",
  "rand 0.8.5",
  "reqwest",
@@ -2385,7 +2372,7 @@ dependencies = [
  "futures-sink",
  "js-sys",
  "pin-project-lite",
- "thiserror 2.0.17",
+ "thiserror 2.0.18",
  "tracing",
 ]
 
@@ -2415,7 +2402,7 @@ dependencies = [
  "opentelemetry_sdk",
  "prost",
  "reqwest",
- "thiserror 2.0.17",
+ "thiserror 2.0.18",
  "tokio",
  "tonic",
  "tracing",
@@ -2452,7 +2439,7 @@ dependencies = [
  "opentelemetry",
  "percent-encoding",
  "rand 0.9.2",
- "thiserror 2.0.17",
+ "thiserror 2.0.18",
  "tokio",
  "tokio-stream",
 ]
@@ -2536,7 +2523,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1a2a4764cc1f8d961d802af27193c6f4f0124bd0e76e8393cf818e18880f0524"
 dependencies = [
  "argon2",
- "getrandom 0.2.16",
+ "getrandom 0.2.17",
  "password-hash",
  "pbkdf2",
  "rand_core 0.6.4",
@@ -2625,22 +2612,12 @@ dependencies = [
 
 [[package]]
 name = "phf_codegen"
-version = "0.12.1"
+version = "0.13.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "efbdcb6f01d193b17f0b9c3360fa7e0e620991b193ff08702f78b3ce365d7e61"
+checksum = "49aa7f9d80421bca176ca8dbfebe668cc7a2684708594ec9f3c0db0805d5d6e1"
 dependencies = [
- "phf_generator 0.12.1",
+ "phf_generator",
- "phf_shared 0.12.1",
+ "phf_shared 0.13.1",
-]
-
-[[package]]
-name = "phf_generator"
-version = "0.12.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2cbb1126afed61dd6368748dae63b1ee7dc480191c6262a3b4ff1e29d86a6c5b"
-dependencies = [
- "fastrand",
- "phf_shared 0.12.1",
 ]
 
 [[package]]
@@ -2659,7 +2636,7 @@ version = "0.13.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "812f032b54b1e759ccd5f8b6677695d5268c588701effba24601f6932f8269ef"
 dependencies = [
- "phf_generator 0.13.1",
+ "phf_generator",
  "phf_shared 0.13.1",
  "proc-macro2",
  "quote",
@@ -2840,9 +2817,9 @@ dependencies = [
 
 [[package]]
 name = "proc-macro2"
-version = "1.0.105"
+version = "1.0.106"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "535d180e0ecab6268a3e718bb9fd44db66bbbc256257165fc699dadf70d16fe7"
+checksum = "8fd00f0bb2e90d81d1044c2b32617f68fcb9fa3bb7640c23e9c748e53fb30934"
 dependencies = [
  "unicode-ident",
 ]
@@ -2862,9 +2839,9 @@ dependencies = [
 
 [[package]]
 name = "prost"
-version = "0.14.1"
+version = "0.14.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7231bd9b3d3d33c86b58adbac74b5ec0ad9f496b19d22801d773636feaa95f3d"
+checksum = "d2ea70524a2f82d518bce41317d0fae74151505651af45faf1ffbd6fd33f0568"
 dependencies = [
  "bytes",
  "prost-derive",
@@ -2872,9 +2849,9 @@ dependencies = [
 
 [[package]]
 name = "prost-derive"
-version = "0.14.1"
+version = "0.14.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9120690fafc389a67ba3803df527d0ec9cbbc9cc45e4cc20b332996dfb672425"
+checksum = "27c6023962132f4b30eb4c172c91ce92d933da334c59c23cddee82358ddafb0b"
 dependencies = [
  "anyhow",
  "itertools 0.14.0",
@@ -2885,9 +2862,9 @@ dependencies = [
 
 [[package]]
 name = "quick-xml"
-version = "0.38.4"
+version = "0.39.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b66c2058c55a409d601666cffe35f04333cf1013010882cec174a7467cd4e21c"
+checksum = "f2e3bf4aa9d243beeb01a7b3bc30b77cfe2c44e24ec02d751a7104a53c2c49a1"
 dependencies = [
  "memchr",
 ]
@@ -2906,7 +2883,7 @@ dependencies = [
  "rustc-hash",
  "rustls",
  "socket2",
- "thiserror 2.0.17",
+ "thiserror 2.0.18",
  "tokio",
  "tracing",
  "web-time",
@@ -2927,7 +2904,7 @@ dependencies = [
  "rustls",
  "rustls-pki-types",
  "slab",
- "thiserror 2.0.17",
+ "thiserror 2.0.18",
  "tinyvec",
  "tracing",
  "web-time",
@@ -2949,9 +2926,9 @@ dependencies = [
 
 [[package]]
 name = "quote"
-version = "1.0.43"
+version = "1.0.44"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dc74d9a594b72ae6656596548f56f667211f8a97b3d4c3d467150794690dc40a"
+checksum = "21b2ebcf727b7760c461f091f9f0f539b77b8e87f2fd88131e7f1b433b3cece4"
 dependencies = [
  "proc-macro2",
 ]
@@ -2980,7 +2957,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6db2770f06117d490610c7488547d543617b21bfa07796d7a12f6f1bd53850d1"
 dependencies = [
  "rand_chacha 0.9.0",
- "rand_core 0.9.3",
+ "rand_core 0.9.5",
 ]
 
 [[package]]
@@ -3000,7 +2977,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d3022b5f1df60f26e1ffddd6c66e8aa15de382ae63b3a0c1bfc0e4d3e3f325cb"
 dependencies = [
  "ppv-lite86",
- "rand_core 0.9.3",
+ "rand_core 0.9.5",
 ]
 
 [[package]]
@@ -3009,14 +2986,14 @@ version = "0.6.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c"
 dependencies = [
- "getrandom 0.2.16",
+ "getrandom 0.2.17",
 ]
 
 [[package]]
 name = "rand_core"
-version = "0.9.3"
+version = "0.9.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "99d9a13982dcf210057a8a78572b2217b667c3beacbf3a0d8b454f6f82837d38"
+checksum = "76afc826de14238e6e8c374ddcc1fa19e374fd8dd986b0d2af0d02377261d83c"
 dependencies = [
  "getrandom 0.3.4",
 ]
@@ -3175,7 +3152,7 @@ checksum = "a4689e6c2294d81e88dc6261c768b63bc4fcdb852be6d1352498b114f61383b7"
 dependencies = [
  "cc",
  "cfg-if",
- "getrandom 0.2.16",
+ "getrandom 0.2.17",
  "libc",
  "untrusted",
  "windows-sys 0.52.0",
@@ -3202,7 +3179,7 @@ dependencies = [
  "chrono-tz",
  "log",
  "regex",
- "thiserror 2.0.17",
+ "thiserror 2.0.18",
 ]
 
 [[package]]
@@ -3277,9 +3254,9 @@ dependencies = [
 
 [[package]]
 name = "rust-embed"
-version = "8.9.0"
+version = "8.11.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "947d7f3fad52b283d261c4c99a084937e2fe492248cb9a68a8435a861b8798ca"
+checksum = "04113cb9355a377d83f06ef1f0a45b8ab8cd7d8b1288160717d66df5c7988d27"
 dependencies = [
  "rust-embed-impl",
  "rust-embed-utils",
@@ -3288,9 +3265,9 @@ dependencies = [
 
 [[package]]
 name = "rust-embed-impl"
-version = "8.9.0"
+version = "8.11.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5fa2c8c9e8711e10f9c4fd2d64317ef13feaab820a4c51541f1a8c8e2e851ab2"
+checksum = "da0902e4c7c8e997159ab384e6d0fc91c221375f6894346ae107f47dd0f3ccaa"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -3301,9 +3278,9 @@ dependencies = [
 
 [[package]]
 name = "rust-embed-utils"
-version = "8.9.0"
+version = "8.11.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "60b161f275cb337fe0a44d924a5f4df0ed69c2c39519858f931ce61c779d3475"
+checksum = "5bcdef0be6fe7f6fa333b1073c949729274b05f123a0ad7efcb8efd878e5c3b1"
 dependencies = [
  "sha2",
  "walkdir",
@@ -3311,9 +3288,9 @@ dependencies = [
 
 [[package]]
 name = "rustc-demangle"
-version = "0.1.26"
+version = "0.1.27"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "56f7d92ca342cea22a06f2121d944b4fd82af56988c270852495420f961d4ace"
+checksum = "b50b8869d9fc858ce7266cce0194bd74df58b9d0e3f6df3a9fc8eb470d95c09d"
 
 [[package]]
 name = "rustc-hash"
@@ -3332,18 +3309,18 @@ dependencies = [
 
 [[package]]
 name = "rustical"
-version = "0.11.11"
+version = "0.12.2"
 dependencies = [
  "anyhow",
  "argon2",
  "async-trait",
  "axum",
  "axum-extra",
+ "caldata",
  "clap",
  "figment",
  "headers",
  "http",
- "ical 0.11.0 (git+https://github.com/lennart-k/ical-rs?branch=dev)",
  "insta",
  "opentelemetry",
  "opentelemetry-otlp",
@@ -3364,6 +3341,7 @@ dependencies = [
  "rustical_store",
  "rustical_store_sqlite",
  "serde",
+ "similar-asserts",
  "sqlx",
  "tokio",
  "toml 0.9.11+spec-1.1.0",
@@ -3378,20 +3356,20 @@ dependencies = [
 
 [[package]]
 name = "rustical_caldav"
-version = "0.11.11"
+version = "0.12.2"
 dependencies = [
  "async-std",
  "async-trait",
  "axum",
  "axum-extra",
  "base64 0.22.1",
+ "caldata",
  "chrono",
  "chrono-tz",
  "derive_more",
  "futures-util",
  "headers",
  "http",
- "ical 0.11.0 (git+https://github.com/lennart-k/ical-rs)",
  "insta",
  "percent-encoding",
  "quick-xml",
@@ -3408,7 +3386,7 @@ dependencies = [
  "similar-asserts",
  "strum",
  "strum_macros",
- "thiserror 2.0.17",
+ "thiserror 2.0.18",
  "tokio",
  "tower",
  "tower-http",
@@ -3420,17 +3398,17 @@ dependencies = [
 
 [[package]]
 name = "rustical_carddav"
-version = "0.11.11"
+version = "0.12.2"
 dependencies = [
  "async-trait",
  "axum",
  "axum-extra",
  "base64 0.22.1",
+ "caldata",
  "chrono",
  "derive_more",
  "futures-util",
  "http",
- "ical 0.11.0 (git+https://github.com/lennart-k/ical-rs)",
  "insta",
  "percent-encoding",
  "quick-xml",
@@ -3443,7 +3421,7 @@ dependencies = [
  "serde",
  "strum",
  "strum_macros",
- "thiserror 2.0.17",
+ "thiserror 2.0.18",
  "tokio",
  "tower",
  "tower-http",
@@ -3454,16 +3432,16 @@ dependencies = [
 
 [[package]]
 name = "rustical_dav"
-version = "0.11.11"
+version = "0.12.2"
 dependencies = [
  "async-trait",
  "axum",
  "axum-extra",
+ "caldata",
  "derive_more",
  "futures-util",
  "headers",
  "http",
- "ical 0.11.0 (git+https://github.com/lennart-k/ical-rs)",
  "itertools 0.14.0",
  "log",
  "matchit 0.9.1",
@@ -3472,7 +3450,7 @@ dependencies = [
  "rustical_xml",
  "serde",
  "strum",
- "thiserror 2.0.17",
+ "thiserror 2.0.18",
  "tokio",
  "tower",
  "tracing",
@@ -3480,7 +3458,7 @@ dependencies = [
 
 [[package]]
 name = "rustical_dav_push"
-version = "0.11.11"
+version = "0.12.2"
 dependencies = [
  "async-trait",
  "axum",
@@ -3498,14 +3476,14 @@ dependencies = [
  "rustical_store",
  "rustical_xml",
  "serde",
- "thiserror 2.0.17",
+ "thiserror 2.0.18",
  "tokio",
  "tracing",
 ]
 
 [[package]]
 name = "rustical_frontend"
-version = "0.11.11"
+version = "0.12.2"
 dependencies = [
  "askama",
  "askama_web",
@@ -3528,7 +3506,7 @@ dependencies = [
  "rustical_store",
  "serde",
  "serde_json",
- "thiserror 2.0.17",
+ "thiserror 2.0.18",
  "tokio",
  "tower",
  "tower-http",
@@ -3541,13 +3519,13 @@ dependencies = [
 
 [[package]]
 name = "rustical_ical"
-version = "0.11.11"
+version = "0.12.2"
 dependencies = [
  "axum",
+ "caldata",
  "chrono",
  "chrono-tz",
  "derive_more",
- "ical 0.11.0 (git+https://github.com/lennart-k/ical-rs)",
  "regex",
  "rrule",
  "rstest",
@@ -3555,12 +3533,12 @@ dependencies = [
  "serde",
  "sha2",
  "similar-asserts",
- "thiserror 2.0.17",
+ "thiserror 2.0.18",
 ]
 
 [[package]]
 name = "rustical_oidc"
-version = "0.11.11"
+version = "0.12.2"
 dependencies = [
  "async-trait",
  "axum",
@@ -3569,18 +3547,19 @@ dependencies = [
  "openidconnect",
  "reqwest",
  "serde",
- "thiserror 2.0.17",
+ "thiserror 2.0.18",
  "tower-sessions",
  "tracing",
 ]
 
 [[package]]
 name = "rustical_store"
-version = "0.11.11"
+version = "0.12.2"
 dependencies = [
  "anyhow",
  "async-trait",
  "axum",
+ "caldata",
  "chrono",
  "chrono-tz",
  "clap",
@@ -3588,7 +3567,6 @@ dependencies = [
  "futures-core",
  "headers",
  "http",
- "ical 0.11.0 (git+https://github.com/lennart-k/ical-rs)",
  "regex",
  "rrule",
  "rstest",
@@ -3599,7 +3577,7 @@ dependencies = [
  "rustical_xml",
  "serde",
  "sha2",
- "thiserror 2.0.17",
+ "thiserror 2.0.18",
  "tokio",
  "tower",
  "tower-sessions",
@@ -3609,22 +3587,24 @@ dependencies = [
 
 [[package]]
 name = "rustical_store_sqlite"
-version = "0.11.11"
+version = "0.12.2"
 dependencies = [
  "async-trait",
+ "caldata",
  "chrono",
  "criterion",
  "derive_more",
  "password-auth",
  "password-hash",
  "pbkdf2",
+ "regex",
  "rstest",
  "rustical_ical",
  "rustical_store",
  "serde",
  "sha2",
  "sqlx",
- "thiserror 2.0.17",
+ "thiserror 2.0.18",
  "tokio",
  "tracing",
  "uuid",
@@ -3632,10 +3612,10 @@ dependencies = [
 
 [[package]]
 name = "rustical_xml"
-version = "0.11.11"
+version = "0.12.2"
 dependencies = [
  "quick-xml",
- "thiserror 2.0.17",
+ "thiserror 2.0.18",
  "xml_derive",
 ]
 
@@ -3668,9 +3648,9 @@ dependencies = [
 
 [[package]]
 name = "rustls-pki-types"
-version = "1.13.2"
+version = "1.14.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "21e6f2ab2928ca4291b86736a8bd920a277a399bba1589409d72154ff87c1282"
+checksum = "be040f8b0a225e40375822a563fa9524378b9d63112f53e19ffff34df5d33fdd"
 dependencies = [
  "web-time",
  "zeroize",
@@ -3678,9 +3658,9 @@ dependencies = [
 
 [[package]]
 name = "rustls-webpki"
-version = "0.103.8"
+version = "0.103.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2ffdfa2f5286e2247234e03f680868ac2815974dc39e00ea15adc445d0aafe52"
+checksum = "d7df23109aa6c1567d1c575b9952556388da57401e4ace1d15f79eedad0d8f53"
 dependencies = [
  "ring",
  "rustls-pki-types",
@@ -3992,9 +3972,9 @@ dependencies = [
 
 [[package]]
 name = "socket2"
-version = "0.6.1"
+version = "0.6.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "17129e116933cf371d018bb80ae557e889637989d8638274fb25622827b03881"
+checksum = "86f4aa3ad99f2088c990dfa82d367e19cb29268ed67c574d10d0a4bfe71f07e0"
 dependencies = [
  "libc",
  "windows-sys 0.60.2",
@@ -4060,7 +4040,7 @@ dependencies = [
  "serde_json",
  "sha2",
  "smallvec",
- "thiserror 2.0.17",
+ "thiserror 2.0.18",
  "tokio",
  "tokio-stream",
  "tracing",
@@ -4144,7 +4124,7 @@ dependencies = [
  "smallvec",
  "sqlx-core",
  "stringprep",
- "thiserror 2.0.17",
+ "thiserror 2.0.18",
  "tracing",
  "uuid",
  "whoami",
@@ -4183,7 +4163,7 @@ dependencies = [
  "smallvec",
  "sqlx-core",
  "stringprep",
- "thiserror 2.0.17",
+ "thiserror 2.0.18",
  "tracing",
  "uuid",
  "whoami",
@@ -4209,7 +4189,7 @@ dependencies = [
  "serde",
  "serde_urlencoded",
  "sqlx-core",
- "thiserror 2.0.17",
+ "thiserror 2.0.18",
  "tracing",
  "url",
  "uuid",
@@ -4328,11 +4308,11 @@ dependencies = [
 
 [[package]]
 name = "thiserror"
-version = "2.0.17"
+version = "2.0.18"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f63587ca0f12b72a0600bcba1d40081f830876000bb46dd2337a3051618f4fc8"
+checksum = "4288b5bcbc7920c07a1149a35cf9590a2aa808e0bc1eafaade0b80947865fbc4"
 dependencies = [
- "thiserror-impl 2.0.17",
+ "thiserror-impl 2.0.18",
 ]
 
 [[package]]
@@ -4348,9 +4328,9 @@ dependencies = [
 
 [[package]]
 name = "thiserror-impl"
-version = "2.0.17"
+version = "2.0.18"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3ff15c8ecd7de3849db632e14d18d2571fa09dfc5ed93479bc4485c7a517c913"
+checksum = "ebc4ee7f67670e9b64d05fa4253e753e016c6c95ff35b89b7941d6b856dec1d5"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -4368,30 +4348,30 @@ dependencies = [
 
 [[package]]
 name = "time"
-version = "0.3.44"
+version = "0.3.46"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "91e7d9e3bb61134e77bde20dd4825b97c010155709965fedf0f49bb138e52a9d"
+checksum = "9da98b7d9b7dad93488a84b8248efc35352b0b2657397d4167e7ad67e5d535e5"
 dependencies = [
  "deranged",
  "itoa",
  "num-conv",
  "powerfmt",
- "serde",
+ "serde_core",
  "time-core",
  "time-macros",
 ]
 
 [[package]]
 name = "time-core"
-version = "0.1.6"
+version = "0.1.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "40868e7c1d2f0b8d73e4a8c7f0ff63af4f6d19be117e90bd73eb1d62cf831c6b"
+checksum = "7694e1cfe791f8d31026952abf09c69ca6f6fa4e1a1229e18988f06a04a12dca"
 
 [[package]]
 name = "time-macros"
-version = "0.2.24"
+version = "0.2.26"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "30cfb0125f12d9c277f35663a0a33f8c30190f4e4574868a330595412d34ebf3"
+checksum = "78cc610bac2dcee56805c99642447d4c5dbde4d01f752ffea0199aee1f601dc4"
 dependencies = [
  "num-conv",
  "time-core",
@@ -4626,9 +4606,9 @@ dependencies = [
 
 [[package]]
 name = "tower"
-version = "0.5.2"
+version = "0.5.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d039ad9159c98b70ecfd540b2573b97f7f52c3e8d9f8ad57a24b916a536975f9"
+checksum = "ebe5ef63511595f1344e2d5cfa636d973292adc0eec1f0ad45fae9f0851ab1d4"
 dependencies = [
  "futures-core",
  "futures-util",
@@ -4732,7 +4712,7 @@ dependencies = [
  "rand 0.8.5",
  "serde",
  "serde_json",
- "thiserror 2.0.17",
+ "thiserror 2.0.18",
  "time",
  "tokio",
  "tracing",
@@ -4796,16 +4776,13 @@ dependencies = [
 
 [[package]]
 name = "tracing-opentelemetry"
-version = "0.32.0"
+version = "0.32.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1e6e5658463dd88089aba75c7791e1d3120633b1bfde22478b28f625a9bb1b8e"
+checksum = "1ac28f2d093c6c477eaa76b23525478f38de514fa9aeb1285738d4b97a9552fc"
 dependencies = [
  "js-sys",
  "opentelemetry",
- "opentelemetry_sdk",
- "rustversion",
  "smallvec",
- "thiserror 2.0.17",
  "tracing",
  "tracing-core",
  "tracing-log",
@@ -4966,12 +4943,12 @@ checksum = "0b928f33d975fc6ad9f86c8f283853ad26bdd5b10b7f1542aa2fa15e2289105a"
 
 [[package]]
 name = "vtimezones-rs"
-version = "0.2.0"
+version = "0.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f6728de8767c8dea44f41b88115a205ed23adc3302e1b4342be59d922934dae5"
+checksum = "1e4e9cf6888a927b6cec4aa2416f379885b92dd2aa4476bc83718fe58051f67e"
 dependencies = [
  "glob",
- "phf 0.12.1",
+ "phf 0.13.1",
  "phf_codegen",
 ]
 
@@ -5002,9 +4979,9 @@ checksum = "ccf3ec651a847eb01de73ccad15eb7d99f80485de043efb2f370cd654f4ea44b"
 
 [[package]]
 name = "wasip2"
-version = "1.0.1+wasi-0.2.4"
+version = "1.0.2+wasi-0.2.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0562428422c63773dad2c345a1882263bbf4d65cf3f42e90921f787ef5ad58e7"
+checksum = "9517f9239f02c069db75e65f174b3da828fe5f5b945c4dd26bd25d89c03ebcf5"
 dependencies = [
  "wit-bindgen",
 ]
@@ -5017,9 +4994,9 @@ checksum = "b8dad83b4f25e74f184f64c43b150b91efe7647395b42289f38e50566d82855b"
 
 [[package]]
 name = "wasm-bindgen"
-version = "0.2.106"
+version = "0.2.108"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0d759f433fa64a2d763d1340820e46e111a7a5ab75f993d1852d70b03dbb80fd"
+checksum = "64024a30ec1e37399cf85a7ffefebdb72205ca1c972291c51512360d90bd8566"
 dependencies = [
  "cfg-if",
  "once_cell",
@@ -5030,11 +5007,12 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-futures"
-version = "0.4.56"
+version = "0.4.58"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "836d9622d604feee9e5de25ac10e3ea5f2d65b41eac0d9ce72eb5deae707ce7c"
+checksum = "70a6e77fd0ae8029c9ea0063f87c46fde723e7d887703d74ad2616d792e51e6f"
 dependencies = [
  "cfg-if",
+ "futures-util",
  "js-sys",
  "once_cell",
  "wasm-bindgen",
@@ -5043,9 +5021,9 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-macro"
-version = "0.2.106"
+version = "0.2.108"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "48cb0d2638f8baedbc542ed444afc0644a29166f1595371af4fecf8ce1e7eeb3"
+checksum = "008b239d9c740232e71bd39e8ef6429d27097518b6b30bdf9086833bd5b6d608"
 dependencies = [
  "quote",
  "wasm-bindgen-macro-support",
@@ -5053,9 +5031,9 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-macro-support"
-version = "0.2.106"
+version = "0.2.108"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cefb59d5cd5f92d9dcf80e4683949f15ca4b511f4ac0a6e14d4e1ac60c6ecd40"
+checksum = "5256bae2d58f54820e6490f9839c49780dff84c65aeab9e772f15d5f0e913a55"
 dependencies = [
  "bumpalo",
  "proc-macro2",
@@ -5066,18 +5044,18 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-shared"
-version = "0.2.106"
+version = "0.2.108"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cbc538057e648b67f72a982e708d485b2efa771e1ac05fec311f9f63e5800db4"
+checksum = "1f01b580c9ac74c8d8f0c0e4afb04eeef2acf145458e52c03845ee9cd23e3d12"
 dependencies = [
  "unicode-ident",
 ]
 
 [[package]]
 name = "web-sys"
-version = "0.3.83"
+version = "0.3.85"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9b32828d774c412041098d182a8b38b16ea816958e07cf40eec2bc080ae137ac"
+checksum = "312e32e551d92129218ea9a2452120f4aabc03529ef03e4d0d82fb2780608598"
 dependencies = [
  "js-sys",
  "wasm-bindgen",
@@ -5444,9 +5422,9 @@ dependencies = [
 
 [[package]]
 name = "wit-bindgen"
-version = "0.46.0"
+version = "0.51.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f17a85883d4e6d00e8a97c586de764dabcc06133f7f1d55dce5cdc070ad7fe59"
+checksum = "d7249219f66ced02969388cf2bb044a09756a083d0fab1e566056b04d9fbcaa5"
 
 [[package]]
 name = "writeable"
@@ -5456,7 +5434,7 @@ checksum = "9edde0db4769d2dc68579893f2306b26c6ecfbe0ef499b013d731b7b9247e0b9"
 
 [[package]]
 name = "xml_derive"
-version = "0.11.11"
+version = "0.12.2"
 dependencies = [
  "darling 0.23.0",
  "heck",
@@ -5577,6 +5555,6 @@ dependencies = [
 
 [[package]]
 name = "zmij"
-version = "1.0.12"
+version = "1.0.16"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2fc5a66a20078bf1251bde995aa2fdcc4b800c70b5d92dd2c62abc5c60f679f8"
+checksum = "dfcd145825aace48cff44a8844de64bf75feec3080e0aa5cdbde72961ae51a65"

Cargo.toml

@@ -2,7 +2,7 @@
 members = ["crates/*"]
 
 [workspace.package]
-version = "0.11.11"
+version = "0.12.2"
 rust-version = "1.92"
 edition = "2024"
 description = "A CalDAV server"
@@ -73,7 +73,7 @@ tokio = { version = "1.48", features = [
 url = "2.5"
 base64 = "0.22"
 thiserror = "2.0"
-quick-xml = { version = "0.38" }
+quick-xml = { version = "0.39" }
 rust-embed = "8.9"
 tower-sessions = "0.14"
 futures-core = "0.3"
@@ -107,9 +107,7 @@ strum = "0.27"
 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 = [
+caldata = { version = "0.13.0", features = ["chrono-tz", "vtimezones-rs"] }
-  "chrono-tz",
-] }
 toml = "0.9"
 tower = "0.5"
 tower-http = { version = "0.6", features = [
@@ -139,7 +137,7 @@ reqwest = { version = "0.12", features = [
 openidconnect = "4.0"
 clap = { version = "4.5", features = ["derive", "env"] }
 matchit-serde = { git = "https://github.com/lennart-k/matchit-serde", rev = "e18e65d7" }
-vtimezones-rs = "0.2"
+vtimezones-rs = "0.3"
 ece = { version = "2.3", default-features = false, features = [
   "backend-openssl",
 ] }
@@ -153,6 +151,7 @@ criterion = { version = "0.8", features = ["async_tokio"] }
 rstest.workspace = true
 rustical_store_sqlite = { workspace = true, features = ["test"] }
 insta.workspace = true
+similar-asserts.workspace = true
 
 [dependencies]
 rustical_store.workspace = true
@@ -160,6 +159,7 @@ rustical_store_sqlite.workspace = true
 rustical_caldav.workspace = true
 rustical_carddav.workspace = true
 rustical_frontend.workspace = true
+caldata.workspace = true
 toml.workspace = true
 serde.workspace = true
 tokio.workspace = true
@@ -201,7 +201,3 @@ tower-http.workspace = true
 axum-extra.workspace = true
 headers.workspace = true
 http.workspace = true
-# TODO: Remove in next major release
-ical_dev = { package = "ical", git = "https://github.com/lennart-k/ical-rs", branch = "dev", features = [
-  "chrono-tz",
-] }

Dockerfile

@@ -36,7 +36,7 @@ COPY --from=planner /rustical/recipe.json recipe.json
 RUN cargo chef cook --release --target "$(cat /tmp/rust_target)"
 
 COPY . .
-RUN cargo install --target "$(cat /tmp/rust_target)" --path .
+RUN cargo install --locked --target "$(cat /tmp/rust_target)" --path .
 
 FROM scratch
 COPY --from=builder /usr/local/cargo/bin/rustical /usr/local/bin/rustical

crates/caldav/Cargo.toml

@@ -34,7 +34,7 @@ rustical_store.workspace = true
 chrono.workspace = true
 chrono-tz.workspace = true
 sha2.workspace = true
-ical.workspace = true
+caldata.workspace = true
 percent-encoding.workspace = true
 rustical_xml.workspace = true
 uuid.workspace = true

crates/caldav/src/calendar/methods/get.rs

@@ -3,15 +3,13 @@ use crate::calendar::CalendarResourceService;
 use axum::body::Body;
 use axum::extract::State;
 use axum::{extract::Path, response::Response};
+use caldata::component::IcalCalendar;
+use caldata::generator::Emitter;
+use caldata::parser::ContentLine;
 use headers::{ContentType, HeaderMapExt};
 use http::{HeaderValue, Method, StatusCode, header};
-use ical::builder::calendar::IcalCalendarBuilder;
-use ical::generator::Emitter;
-use ical::property::Property;
 use percent_encoding::{CONTROLS, utf8_percent_encode};
-use rustical_ical::{CalendarObjectComponent, EventObject};
 use rustical_store::{CalendarStore, SubscriptionStore, auth::Principal};
-use std::collections::HashMap;
 use std::str::FromStr;
 use tracing::instrument;
 
@@ -33,60 +31,45 @@ pub async fn route_get<C: CalendarStore, S: SubscriptionStore>(
         return Err(crate::Error::Unauthorized);
     }
 
-    let mut vtimezones = HashMap::new();
+    let objects = cal_store
-    let objects = cal_store.get_objects(&principal, &calendar_id).await?;
+        .get_objects(&principal, &calendar_id)
+        .await?
+        .into_iter()
+        .map(|(_, object)| object.into())
+        .collect();
+
+    let mut props = vec![];
 
-    let mut ical_calendar_builder = IcalCalendarBuilder::version("2.0")
-        .gregorian()
-        .prodid("RustiCal");
     if let Some(displayname) = calendar.meta.displayname {
-        ical_calendar_builder = ical_calendar_builder.set(Property {
+        props.push(ContentLine {
             name: "X-WR-CALNAME".to_owned(),
             value: Some(displayname),
-            params: vec![],
+            params: vec![].into(),
         });
     }
     if let Some(description) = calendar.meta.description {
-        ical_calendar_builder = ical_calendar_builder.set(Property {
+        props.push(ContentLine {
             name: "X-WR-CALDESC".to_owned(),
             value: Some(description),
-            params: vec![],
+            params: vec![].into(),
+        });
+    }
+    if let Some(color) = calendar.meta.color {
+        props.push(ContentLine {
+            name: "X-WR-CALCOLOR".to_owned(),
+            value: Some(color),
+            params: vec![].into(),
         });
     }
     if let Some(timezone_id) = calendar.timezone_id {
-        ical_calendar_builder = ical_calendar_builder.set(Property {
+        props.push(ContentLine {
             name: "X-WR-TIMEZONE".to_owned(),
             value: Some(timezone_id),
-            params: vec![],
+            params: vec![].into(),
         });
     }
 
-    for object in &objects {
+    let export_calendar = IcalCalendar::from_objects("RustiCal Export".to_owned(), objects, props);
-        vtimezones.extend(object.get_vtimezones());
-        match object.get_data() {
-            CalendarObjectComponent::Event(EventObject { event, .. }, overrides) => {
-                ical_calendar_builder = ical_calendar_builder
-                    .add_event(event.clone())
-                    .add_events(overrides.iter().map(|ev| ev.event.clone()));
-            }
-            CalendarObjectComponent::Todo(todo, overrides) => {
-                ical_calendar_builder = ical_calendar_builder
-                    .add_todo(todo.clone())
-                    .add_todos(overrides.iter().cloned());
-            }
-            CalendarObjectComponent::Journal(journal, overrides) => {
-                ical_calendar_builder = ical_calendar_builder
-                    .add_journal(journal.clone())
-                    .add_journals(overrides.iter().cloned());
-            }
-        }
-    }
-
-    ical_calendar_builder = ical_calendar_builder.add_timezones(vtimezones.into_values().cloned());
-
-    let ical_calendar = ical_calendar_builder
-        .build()
-        .map_err(|parser_error| Error::IcalError(parser_error.into()))?;
 
     let mut resp = Response::builder().status(StatusCode::OK);
     let hdrs = resp.headers_mut().unwrap();
@@ -104,6 +87,6 @@ pub async fn route_get<C: CalendarStore, S: SubscriptionStore>(
     if matches!(method, Method::HEAD) {
         Ok(resp.body(Body::empty()).unwrap())
     } else {
-        Ok(resp.body(Body::new(ical_calendar.generate())).unwrap())
+        Ok(resp.body(Body::new(export_calendar.generate())).unwrap())
     }
 }

crates/caldav/src/calendar/methods/import.rs

@@ -4,17 +4,14 @@ use axum::{
     extract::{Path, State},
     response::{IntoResponse, Response},
 };
+use caldata::IcalParser;
+use caldata::component::{Component, ComponentMut};
 use http::StatusCode;
-use ical::{
-    generator::Emitter,
-    parser::{Component, ComponentMut},
-};
 use rustical_dav::header::Overwrite;
-use rustical_ical::{CalendarObject, CalendarObjectType};
+use rustical_ical::CalendarObjectType;
 use rustical_store::{
     Calendar, CalendarMetadata, CalendarStore, SubscriptionStore, auth::Principal,
 };
-use std::io::BufReader;
 use tracing::instrument;
 
 #[instrument(skip(resource_service))]
@@ -29,18 +26,11 @@ pub async fn route_import<C: CalendarStore, S: SubscriptionStore>(
         return Err(Error::Unauthorized);
     }
 
-    let mut parser = ical::IcalParser::new(BufReader::new(body.as_bytes()));
+    let parser = IcalParser::from_slice(body.as_bytes());
-    let mut cal = parser
+    let mut cal = match parser.expect_one() {
-        .next()
+        Ok(cal) => cal.mutable(),
-        .expect("input must contain calendar")
+        Err(err) => return Ok((StatusCode::BAD_REQUEST, err.to_string()).into_response()),
-        .unwrap()
+    };
-        .mutable();
-    if parser.next().is_some() {
-        return Err(rustical_ical::Error::InvalidData(
-            "multiple calendars, only one allowed".to_owned(),
-        )
-        .into());
-    }
 
     // Extract calendar metadata
     let displayname = cal
@@ -49,14 +39,19 @@ pub async fn route_import<C: CalendarStore, S: SubscriptionStore>(
     let description = cal
         .get_property("X-WR-CALDESC")
         .and_then(|prop| prop.value.clone());
+    let color = cal
+        .get_property("X-WR-CALCOLOR")
+        .and_then(|prop| prop.value.clone());
     let timezone_id = cal
         .get_property("X-WR-TIMEZONE")
         .and_then(|prop| prop.value.clone());
     // These properties should not appear in the expanded calendar objects
     cal.remove_property("X-WR-CALNAME");
     cal.remove_property("X-WR-CALDESC");
+    cal.remove_property("X-WR-CALCOLOR");
     cal.remove_property("X-WR-TIMEZONE");
-    let cal = cal.verify().unwrap();
+    let cal = cal.build(None).unwrap();
+
     // Make sure timezone is valid
     if let Some(timezone_id) = timezone_id.as_ref() {
         assert!(
@@ -64,8 +59,7 @@ pub async fn route_import<C: CalendarStore, S: SubscriptionStore>(
             "Invalid calendar timezone id"
         );
     }
-
+    // // Extract necessary component types
-    // Extract necessary component types
     let mut cal_components = vec![];
     if !cal.events.is_empty() {
         cal_components.push(CalendarObjectType::Event);
@@ -77,13 +71,10 @@ pub async fn route_import<C: CalendarStore, S: SubscriptionStore>(
         cal_components.push(CalendarObjectType::Todo);
     }
 
-    let expanded_cals = cal.expand_calendar();
+    let objects = match cal.into_objects() {
-    // Janky way to convert between IcalCalendar and CalendarObject
+        Ok(objects) => objects.into_iter().map(Into::into).collect(),
-    let objects = expanded_cals
+        Err(err) => return Ok((StatusCode::BAD_REQUEST, err.to_string()).into_response()),
-        .into_iter()
+    };
-        .map(|cal| cal.generate())
-        .map(|ics| CalendarObject::from_ics(ics, None))
-        .collect::<Result<Vec<_>, _>>()?;
     let new_cal = Calendar {
         principal,
         id: cal_id,
@@ -91,7 +82,7 @@ pub async fn route_import<C: CalendarStore, S: SubscriptionStore>(
             displayname,
             order: 0,
             description,
-            color: None,
+            color,
         },
         timezone_id,
         deleted_at: None,

crates/caldav/src/calendar/methods/mkcalendar.rs

@@ -1,10 +1,13 @@
+use std::str::FromStr;
+
 use crate::Error;
 use crate::calendar::CalendarResourceService;
 use crate::calendar::prop::SupportedCalendarComponentSet;
+use crate::error::Precondition;
 use axum::extract::{Path, State};
 use axum::response::{IntoResponse, Response};
+use caldata::IcalParser;
 use http::{Method, StatusCode};
-use ical::IcalParser;
 use rustical_dav::xml::HrefElement;
 use rustical_ical::CalendarObjectType;
 use rustical_store::auth::Principal;
@@ -84,20 +87,33 @@ pub async fn route_mkcalendar<C: CalendarStore, S: SubscriptionStore>(
     }
 
     let timezone_id = if let Some(tzid) = request.calendar_timezone_id {
+        if chrono_tz::Tz::from_str(&tzid).is_err() {
+            return Err(Error::PreconditionFailed(Precondition::CalendarTimezone(
+                "Invalid timezone ID in calendar-timezone-id",
+            )));
+        }
         Some(tzid)
     } else if let Some(tz) = request.calendar_timezone {
-        // TODO: Proper error (calendar-timezone precondition)
+        let calendar = IcalParser::from_slice(tz.as_bytes())
-        let calendar = IcalParser::new(tz.as_bytes())
             .next()
-            .ok_or_else(|| rustical_dav::Error::BadRequest("No timezone data provided".to_owned()))?
+            .ok_or(Error::PreconditionFailed(Precondition::CalendarTimezone(
-            .map_err(|_| rustical_dav::Error::BadRequest("Error parsing timezone".to_owned()))?;
+                "No timezone data provided",
+            )))?
+            .map_err(|_| {
+                Error::PreconditionFailed(Precondition::CalendarTimezone("Error parsing timezone"))
+            })?;
 
-        let timezone = calendar.timezones.first().ok_or_else(|| {
+        let timezone = calendar
-            rustical_dav::Error::BadRequest("No timezone data provided".to_owned())
+            .vtimezones
-        })?;
+            .values()
-        let timezone: chrono_tz::Tz = timezone.try_into().map_err(|_| {
+            .next()
-            rustical_dav::Error::BadRequest("Cannot translate VTIMEZONE into IANA TZID".to_owned())
+            .ok_or(Error::PreconditionFailed(Precondition::CalendarTimezone(
-        })?;
+                "No timezone data provided",
+            )))?;
+        let timezone: Option<chrono_tz::Tz> = timezone.into();
+        let timezone = timezone.ok_or(Error::PreconditionFailed(
+            Precondition::CalendarTimezone("No timezone data provided"),
+        ))?;
 
         Some(timezone.name().to_owned())
     } else {

crates/caldav/src/calendar/methods/report/calendar_multiget.rs

@@ -21,7 +21,7 @@ pub async fn get_objects_calendar_multiget<C: CalendarStore>(
     principal: &str,
     cal_id: &str,
     store: &C,
-) -> Result<(Vec<CalendarObject>, Vec<String>), Error> {
+) -> Result<(Vec<(String, CalendarObject)>, Vec<String>), Error> {
     let mut result = vec![];
     let mut not_found = vec![];
 
@@ -32,7 +32,7 @@ pub async fn get_objects_calendar_multiget<C: CalendarStore>(
             let filename = filename.trim_start_matches('/');
             if let Some(object_id) = filename.strip_suffix(".ics") {
                 match store.get_object(principal, cal_id, object_id, false).await {
-                    Ok(object) => result.push(object),
+                    Ok(object) => result.push((object_id.to_owned(), object)),
                     Err(rustical_store::Error::NotFound) => not_found.push(href.to_string()),
                     Err(err) => return Err(err.into()),
                 }

crates/caldav/src/calendar/methods/report/calendar_query/comp_filter.rs

@@ -2,8 +2,13 @@ use crate::calendar::methods::report::calendar_query::{
     TimeRangeElement,
     prop_filter::{PropFilterElement, PropFilterable},
 };
-use ical::parser::ical::component::IcalTimeZone;
+use caldata::{
-use rustical_ical::{CalendarObject, CalendarObjectComponent, CalendarObjectType};
+    component::{
+        CalendarInnerData, Component, IcalAlarm, IcalCalendarObject, IcalEvent, IcalTimeZone,
+        IcalTodo,
+    },
+    parser::ContentLine,
+};
 use rustical_xml::XmlDeserialize;
 
 #[derive(XmlDeserialize, Clone, Debug, PartialEq)]
@@ -68,9 +73,92 @@ pub trait CompFilterable: PropFilterable + Sized {
     }
 }
 
-impl CompFilterable for CalendarObject {
+impl CompFilterable for CalendarInnerData {
     fn get_comp_name(&self) -> &'static str {
-        "VCALENDAR"
+        match self {
+            Self::Event(main, _) => main.get_comp_name(),
+            Self::Journal(main, _) => main.get_comp_name(),
+            Self::Todo(main, _) => main.get_comp_name(),
+        }
+    }
+
+    fn match_time_range(&self, time_range: &TimeRangeElement) -> bool {
+        if let Some(start) = &time_range.start
+            && let Some(last_end) = self.get_last_occurence()
+            && start.to_utc() > last_end.utc()
+        {
+            return false;
+        }
+        if let Some(end) = &time_range.end
+            && let Some(first_start) = self.get_first_occurence()
+            && end.to_utc() < first_start.utc()
+        {
+            return false;
+        }
+        true
+    }
+
+    fn match_subcomponents(&self, comp_filter: &CompFilterElement) -> bool {
+        match self {
+            Self::Event(main, overrides) => std::iter::once(main)
+                .chain(overrides.iter())
+                .flat_map(IcalEvent::get_alarms)
+                .any(|alarm| alarm.matches(comp_filter)),
+            Self::Todo(main, overrides) => std::iter::once(main)
+                .chain(overrides.iter())
+                .flat_map(IcalTodo::get_alarms)
+                .any(|alarm| alarm.matches(comp_filter)),
+            // VJOURNAL has no subcomponents
+            Self::Journal(_, _) => comp_filter.is_not_defined.is_some(),
+        }
+    }
+}
+
+impl PropFilterable for IcalAlarm {
+    fn get_named_properties<'a>(&'a self, name: &'a str) -> impl Iterator<Item = &'a ContentLine> {
+        Component::get_named_properties(self, name)
+    }
+}
+
+impl CompFilterable for IcalAlarm {
+    fn get_comp_name(&self) -> &'static str {
+        Component::get_comp_name(self)
+    }
+
+    fn match_time_range(&self, _time_range: &TimeRangeElement) -> bool {
+        true
+    }
+
+    fn match_subcomponents(&self, comp_filter: &CompFilterElement) -> bool {
+        comp_filter.is_not_defined.is_some()
+    }
+}
+
+impl PropFilterable for CalendarInnerData {
+    #[allow(refining_impl_trait)]
+    fn get_named_properties<'a>(
+        &'a self,
+        name: &'a str,
+    ) -> Box<dyn Iterator<Item = &'a ContentLine> + 'a> {
+        // TODO: If we were pedantic, we would have to do recurrence expansion first
+        // and take into account the overrides :(
+        match self {
+            Self::Event(main, _) => Box::new(main.get_named_properties(name)),
+            Self::Todo(main, _) => Box::new(main.get_named_properties(name)),
+            Self::Journal(main, _) => Box::new(main.get_named_properties(name)),
+        }
+    }
+}
+
+impl PropFilterable for IcalCalendarObject {
+    fn get_named_properties<'a>(&'a self, name: &'a str) -> impl Iterator<Item = &'a ContentLine> {
+        Component::get_named_properties(self, name)
+    }
+}
+
+impl CompFilterable for IcalCalendarObject {
+    fn get_comp_name(&self) -> &'static str {
+        Component::get_comp_name(self)
     }
 
     fn match_time_range(&self, _time_range: &TimeRangeElement) -> bool {
@@ -83,54 +171,33 @@ impl CompFilterable for CalendarObject {
             .get_vtimezones()
             .values()
             .map(|tz| tz.matches(comp_filter))
-            .chain([self.get_data().matches(comp_filter)]);
+            .chain([self.get_inner().matches(comp_filter)]);
 
         if comp_filter.is_not_defined.is_some() {
-            matches.all(|x| x)
+            matches.all(|x| !x)
         } else {
             matches.any(|x| x)
         }
     }
 }
 
+impl PropFilterable for IcalTimeZone {
+    fn get_named_properties<'a>(&'a self, name: &'a str) -> impl Iterator<Item = &'a ContentLine> {
+        Component::get_named_properties(self, name)
+    }
+}
+
 impl CompFilterable for IcalTimeZone {
     fn get_comp_name(&self) -> &'static str {
-        "VTIMEZONE"
+        Component::get_comp_name(self)
     }
-
     fn match_time_range(&self, _time_range: &TimeRangeElement) -> bool {
         false
     }
 
-    fn match_subcomponents(&self, _comp_filter: &CompFilterElement) -> bool {
+    fn match_subcomponents(&self, comp_filter: &CompFilterElement) -> bool {
-        true
+        // VTIMEZONE has no subcomponents
-    }
+        comp_filter.is_not_defined.is_some()
-}
-
-impl CompFilterable for CalendarObjectComponent {
-    fn get_comp_name(&self) -> &'static str {
-        CalendarObjectType::from(self).as_str()
-    }
-
-    fn match_time_range(&self, time_range: &TimeRangeElement) -> bool {
-        if let Some(start) = &time_range.start
-            && let Some(last_occurence) = self.get_last_occurence().unwrap_or(None)
-            && **start > last_occurence.utc()
-        {
-            return false;
-        }
-        if let Some(end) = &time_range.end
-            && let Some(first_occurence) = self.get_first_occurence().unwrap_or(None)
-            && **end < first_occurence.utc()
-        {
-            return false;
-        }
-        true
-    }
-
-    fn match_subcomponents(&self, _comp_filter: &CompFilterElement) -> bool {
-        // TODO: Properly check subcomponents
-        true
     }
 }
 
@@ -147,6 +214,7 @@ mod tests {
     const ICS: &str = r"BEGIN:VCALENDAR
 CALSCALE:GREGORIAN
 VERSION:2.0
+PRODID:me
 BEGIN:VTIMEZONE
 TZID:Europe/Berlin
 X-LIC-LOCATION:Europe/Berlin
@@ -166,7 +234,7 @@ END:VCALENDAR";
 
     #[test]
     fn test_comp_filter_matching() {
-        let object = CalendarObject::from_ics(ICS.to_string(), None).unwrap();
+        let object = CalendarObject::from_ics(ICS.to_string()).unwrap();
 
         let comp_filter = CompFilterElement {
             is_not_defined: Some(()),
@@ -175,7 +243,10 @@ END:VCALENDAR";
             prop_filter: vec![],
             comp_filter: vec![],
         };
-        assert!(!object.matches(&comp_filter), "filter: wants no VCALENDAR");
+        assert!(
+            !object.get_inner().matches(&comp_filter),
+            "filter: wants no VCALENDAR"
+        );
 
         let comp_filter = CompFilterElement {
             is_not_defined: None,
@@ -190,7 +261,10 @@ END:VCALENDAR";
                 comp_filter: vec![],
             }],
         };
-        assert!(!object.matches(&comp_filter), "filter matches VTODO");
+        assert!(
+            !object.get_inner().matches(&comp_filter),
+            "filter matches VTODO"
+        );
 
         let comp_filter = CompFilterElement {
             is_not_defined: None,
@@ -205,7 +279,10 @@ END:VCALENDAR";
                 comp_filter: vec![],
             }],
         };
-        assert!(object.matches(&comp_filter), "filter matches VEVENT");
+        assert!(
+            object.get_inner().matches(&comp_filter),
+            "filter matches VEVENT"
+        );
 
         let comp_filter = CompFilterElement {
             is_not_defined: None,
@@ -252,13 +329,13 @@ END:VCALENDAR";
             }],
         };
         assert!(
-            object.matches(&comp_filter),
+            object.get_inner().matches(&comp_filter),
             "Some prop filters on VCALENDAR and VEVENT"
         );
     }
     #[test]
     fn test_comp_filter_time_range() {
-        let object = CalendarObject::from_ics(ICS.to_string(), None).unwrap();
+        let object = CalendarObject::from_ics(ICS.to_string()).unwrap();
 
         let comp_filter = CompFilterElement {
             is_not_defined: None,
@@ -281,7 +358,7 @@ END:VCALENDAR";
             }],
         };
         assert!(
-            object.matches(&comp_filter),
+            object.get_inner().matches(&comp_filter),
             "event should lie in time range"
         );
 
@@ -306,14 +383,14 @@ END:VCALENDAR";
             }],
         };
         assert!(
-            !object.matches(&comp_filter),
+            !object.get_inner().matches(&comp_filter),
             "event should not lie in time range"
         );
     }
 
     #[test]
     fn test_match_timezone() {
-        let object = CalendarObject::from_ics(ICS.to_string(), None).unwrap();
+        let object = CalendarObject::from_ics(ICS.to_string()).unwrap();
 
         let comp_filter = CompFilterElement {
             is_not_defined: None,
@@ -340,7 +417,7 @@ END:VCALENDAR";
             }],
         };
         assert!(
-            object.matches(&comp_filter),
+            object.get_inner().matches(&comp_filter),
             "Timezone should be Europe/Berlin"
         );
     }

crates/caldav/src/calendar/methods/report/calendar_query/elements.rs

@@ -1,8 +1,8 @@
 use super::comp_filter::{CompFilterElement, CompFilterable};
 use crate::calendar_object::CalendarObjectPropWrapperName;
-use ical::property::Property;
+use caldata::{component::IcalCalendarObject, parser::ContentLine};
 use rustical_dav::xml::{PropfindType, TextMatchElement};
-use rustical_ical::{CalendarObject, UtcDateTime};
+use rustical_ical::UtcDateTime;
 use rustical_store::calendar_store::CalendarQuery;
 use rustical_xml::{XmlDeserialize, XmlRootTag};
 
@@ -30,8 +30,8 @@ pub struct ParamFilterElement {
 
 impl ParamFilterElement {
     #[must_use]
-    pub fn match_property(&self, prop: &Property) -> bool {
+    pub fn match_property(&self, prop: &ContentLine) -> bool {
-        let Some(param) = prop.get_param(&self.name) else {
+        let Some(param) = prop.params.get_param(&self.name) else {
             return self.is_not_defined.is_some();
         };
         if self.is_not_defined.is_some() {
@@ -57,7 +57,7 @@ pub struct FilterElement {
 
 impl FilterElement {
     #[must_use]
-    pub fn matches(&self, cal_object: &CalendarObject) -> bool {
+    pub fn matches(&self, cal_object: &IcalCalendarObject) -> bool {
         cal_object.matches(&self.comp_filter)
     }
 }

crates/caldav/src/calendar/methods/report/calendar_query/mod.rs

@@ -11,19 +11,19 @@ mod tests;
 pub use comp_filter::{CompFilterElement, CompFilterable};
 pub use elements::*;
 #[allow(unused_imports)]
-pub use prop_filter::{PropFilterElement, PropFilterable};
+pub use prop_filter::PropFilterElement;
 
 pub async fn get_objects_calendar_query<C: CalendarStore>(
     cal_query: &CalendarQueryRequest,
     principal: &str,
     cal_id: &str,
     store: &C,
-) -> Result<Vec<CalendarObject>, Error> {
+) -> Result<Vec<(String, CalendarObject)>, Error> {
     let mut objects = store
         .calendar_query(principal, cal_id, cal_query.into())
         .await?;
     if let Some(filter) = &cal_query.filter {
-        objects.retain(|object| filter.matches(object));
+        objects.retain(|(_id, object)| filter.matches(object.get_inner()));
     }
     Ok(objects)
 }

crates/caldav/src/calendar/methods/report/calendar_query/prop_filter.rs

@@ -1,16 +1,8 @@
 use super::{ParamFilterElement, TimeRangeElement};
-use ical::{
+use caldata::{parser::ContentLine, types::CalDateTime};
-    generator::{IcalCalendar, IcalEvent},
-    parser::{
-        Component,
-        ical::component::{IcalJournal, IcalTimeZone, IcalTodo},
-    },
-    property::Property,
-};
 use rustical_dav::xml::TextMatchElement;
-use rustical_ical::{CalDateTime, CalendarObject, CalendarObjectComponent, UtcDateTime};
+use rustical_ical::UtcDateTime;
 use rustical_xml::XmlDeserialize;
-use std::collections::HashMap;
 
 #[derive(XmlDeserialize, Clone, Debug, PartialEq, Eq)]
 #[allow(dead_code)]
@@ -29,12 +21,16 @@ pub struct PropFilterElement {
     pub(crate) name: String,
 }
 
+pub trait PropFilterable {
+    fn get_named_properties<'a>(&'a self, name: &'a str) -> impl Iterator<Item = &'a ContentLine>;
+}
+
 impl PropFilterElement {
     #[must_use]
-    pub fn match_property(&self, property: &Property) -> bool {
+    pub fn match_property(&self, property: &ContentLine) -> bool {
         if let Some(TimeRangeElement { start, end }) = &self.time_range {
             // TODO: Respect timezones
-            let Ok(timestamp) = CalDateTime::parse_prop(property, &HashMap::default()) else {
+            let Ok(timestamp) = CalDateTime::parse_prop(property, None) else {
                 return false;
             };
             let timestamp = timestamp.utc();
@@ -69,63 +65,13 @@ impl PropFilterElement {
     }
 
     pub fn match_component(&self, comp: &impl PropFilterable) -> bool {
-        let properties = comp.get_named_properties(&self.name);
+        let mut properties = comp.get_named_properties(&self.name);
         if self.is_not_defined.is_some() {
-            return properties.is_empty();
+            return properties.next().is_none();
         }
 
         // The filter matches when one property instance matches
         // Example where this matters: We have multiple attendees and want to match one
-        properties.iter().any(|prop| self.match_property(prop))
+        properties.any(|prop| self.match_property(prop))
-    }
-}
-
-pub trait PropFilterable {
-    fn get_named_properties(&self, name: &str) -> Vec<&Property>;
-}
-
-impl PropFilterable for CalendarObject {
-    fn get_named_properties(&self, name: &str) -> Vec<&Property> {
-        Self::get_named_properties(self, name)
-    }
-}
-
-impl PropFilterable for IcalEvent {
-    fn get_named_properties(&self, name: &str) -> Vec<&Property> {
-        Component::get_named_properties(self, name)
-    }
-}
-
-impl PropFilterable for IcalTodo {
-    fn get_named_properties(&self, name: &str) -> Vec<&Property> {
-        Component::get_named_properties(self, name)
-    }
-}
-
-impl PropFilterable for IcalJournal {
-    fn get_named_properties(&self, name: &str) -> Vec<&Property> {
-        Component::get_named_properties(self, name)
-    }
-}
-
-impl PropFilterable for IcalCalendar {
-    fn get_named_properties(&self, name: &str) -> Vec<&Property> {
-        Component::get_named_properties(self, name)
-    }
-}
-
-impl PropFilterable for IcalTimeZone {
-    fn get_named_properties(&self, name: &str) -> Vec<&Property> {
-        Component::get_named_properties(self, name)
-    }
-}
-
-impl PropFilterable for CalendarObjectComponent {
-    fn get_named_properties(&self, name: &str) -> Vec<&Property> {
-        match self {
-            Self::Event(event, _) => PropFilterable::get_named_properties(&event.event, name),
-            Self::Todo(todo, _) => PropFilterable::get_named_properties(todo, name),
-            Self::Journal(journal, _) => PropFilterable::get_named_properties(journal, name),
-        }
     }
 }

crates/caldav/src/calendar/methods/report/calendar_query/tests.rs

@@ -77,7 +77,7 @@ const FILTER_2: &str = r#"
 #[case(ICS_1, FILTER_1, true)]
 #[case(ICS_1, FILTER_2, false)]
 fn yeet(#[case] ics: &str, #[case] filter: &str, #[case] matches: bool) {
-    let obj = CalendarObject::from_ics(ics.to_owned(), None).unwrap();
+    let obj = CalendarObject::from_ics(ics.to_owned()).unwrap();
     let filter = FilterElement::parse_str(filter).unwrap();
-    assert_eq!(matches, filter.matches(&obj));
+    assert_eq!(matches, filter.matches(obj.get_inner()));
 }

crates/caldav/src/calendar/methods/report/mod.rs

@@ -51,7 +51,7 @@ impl ReportRequest {
 }
 
 fn objects_response(
-    objects: Vec<CalendarObject>,
+    objects: Vec<(String, CalendarObject)>,
     not_found: Vec<String>,
     path: &str,
     principal: &str,
@@ -60,11 +60,12 @@ fn objects_response(
     prop: &PropfindType<CalendarObjectPropWrapperName>,
 ) -> Result<MultistatusElement<CalendarObjectPropWrapper, String>, Error> {
     let mut responses = Vec::new();
-    for object in objects {
+    for (object_id, object) in objects {
-        let path = format!("{}/{}.ics", path, object.get_id());
+        let path = format!("{path}/{object_id}.ics");
         responses.push(
             CalendarObjectResource {
                 object,
+                object_id,
                 principal: principal.to_owned(),
             }
             .propfind(&path, prop, None, puri, user)?,

crates/caldav/src/calendar/methods/report/sync_collection.rs

@@ -32,11 +32,12 @@ pub async fn handle_sync_collection<C: CalendarStore>(
         .await?;
 
     let mut responses = Vec::new();
-    for object in new_objects {
+    for (object_id, object) in new_objects {
-        let path = format!("{}/{}.ics", path, object.get_id());
+        let path = format!("{}/{}.ics", path, &object_id);
         responses.push(
             CalendarObjectResource {
                 object,
+                object_id,
                 principal: principal.to_owned(),
             }
             .propfind(&path, &sync_collection.prop, None, puri, user)?,

crates/caldav/src/calendar/resource.rs

@@ -1,9 +1,10 @@
 use super::prop::{SupportedCalendarComponentSet, SupportedCalendarData};
 use crate::Error;
 use crate::calendar::prop::{ReportMethod, SupportedCollationSet};
+use caldata::IcalParser;
+use caldata::types::CalDateTime;
 use chrono::{DateTime, Utc};
 use derive_more::derive::{From, Into};
-use ical::IcalParser;
 use rustical_dav::extensions::{
     CommonPropertiesExtension, CommonPropertiesProp, SyncTokenExtension, SyncTokenExtensionProp,
 };
@@ -11,7 +12,6 @@ use rustical_dav::privileges::UserPrivilegeSet;
 use rustical_dav::resource::{PrincipalUri, Resource, ResourceName};
 use rustical_dav::xml::{HrefElement, Resourcetype, ResourcetypeInner, SupportedReportSet};
 use rustical_dav_push::{DavPushExtension, DavPushExtensionProp};
-use rustical_ical::CalDateTime;
 use rustical_store::Calendar;
 use rustical_store::auth::Principal;
 use rustical_xml::{EnumVariants, PropName};
@@ -202,7 +202,7 @@ impl Resource for CalendarResource {
                 CalendarProp::CalendarTimezone(timezone) => {
                     if let Some(tz) = timezone {
                         // TODO: Proper error (calendar-timezone precondition)
-                        let calendar = IcalParser::new(tz.as_bytes())
+                        let calendar = IcalParser::from_slice(tz.as_bytes())
                             .next()
                             .ok_or_else(|| {
                                 rustical_dav::Error::BadRequest(
@@ -215,13 +215,13 @@ impl Resource for CalendarResource {
                                 )
                             })?;
 
-                        let timezone = calendar.timezones.first().ok_or_else(|| {
+                        let timezone = calendar.vtimezones.values().next().ok_or_else(|| {
                             rustical_dav::Error::BadRequest("No timezone data provided".to_owned())
                         })?;
-                        let timezone: chrono_tz::Tz = timezone.try_into().map_err(|_| {
+                        let timezone: Option<chrono_tz::Tz> = timezone.into();
+                        let timezone = timezone.ok_or_else(|| {
                             rustical_dav::Error::BadRequest("No timezone data provided".to_owned())
                         })?;
-
                         self.cal.timezone_id = Some(timezone.name().to_owned());
                     }
                     Ok(())

crates/caldav/src/calendar/service.rs

@@ -6,7 +6,7 @@ use crate::calendar::methods::report::route_report_calendar;
 use crate::calendar::resource::CalendarResource;
 use crate::calendar_object::CalendarObjectResourceService;
 use crate::calendar_object::resource::CalendarObjectResource;
-use crate::{CalDavPrincipalUri, Error};
+use crate::{CalDavConfig, CalDavPrincipalUri, Error};
 use async_trait::async_trait;
 use axum::Router;
 use axum::extract::Request;
@@ -23,6 +23,7 @@ use tower::Service;
 pub struct CalendarResourceService<C: CalendarStore, S: SubscriptionStore> {
     pub(crate) cal_store: Arc<C>,
     pub(crate) sub_store: Arc<S>,
+    pub(crate) config: Arc<CalDavConfig>,
 }
 
 impl<C: CalendarStore, S: SubscriptionStore> Clone for CalendarResourceService<C, S> {
@@ -30,15 +31,17 @@ impl<C: CalendarStore, S: SubscriptionStore> Clone for CalendarResourceService<C
         Self {
             cal_store: self.cal_store.clone(),
             sub_store: self.sub_store.clone(),
+            config: self.config.clone(),
         }
     }
 }
 
 impl<C: CalendarStore, S: SubscriptionStore> CalendarResourceService<C, S> {
-    pub const fn new(cal_store: Arc<C>, sub_store: Arc<S>) -> Self {
+    pub const fn new(cal_store: Arc<C>, sub_store: Arc<S>, config: Arc<CalDavConfig>) -> Self {
         Self {
             cal_store,
             sub_store,
+            config,
         }
     }
 }
@@ -78,8 +81,9 @@ impl<C: CalendarStore, S: SubscriptionStore> ResourceService for CalendarResourc
             .get_objects(principal, cal_id)
             .await?
             .into_iter()
-            .map(|object| CalendarObjectResource {
+            .map(|(object_id, object)| CalendarObjectResource {
                 object,
+                object_id,
                 principal: principal.to_owned(),
             })
             .collect())
@@ -91,7 +95,7 @@ impl<C: CalendarStore, S: SubscriptionStore> ResourceService for CalendarResourc
         file: Self::Resource,
     ) -> Result<(), Self::Error> {
         self.cal_store
-            .update_calendar(principal.to_owned(), cal_id.to_owned(), file.into())
+            .update_calendar(principal, cal_id, file.into())
             .await?;
         Ok(())
     }
@@ -111,7 +115,8 @@ impl<C: CalendarStore, S: SubscriptionStore> ResourceService for CalendarResourc
         Router::new()
             .nest(
                 "/{object_id}",
-                CalendarObjectResourceService::new(self.cal_store.clone()).axum_router(),
+                CalendarObjectResourceService::new(self.cal_store.clone(), self.config.clone())
+                    .axum_router(),
             )
             .route_service("/", self.axum_service())
     }

crates/caldav/src/calendar/snapshots/rustical_caldav__calendar__tests__propfind-2.snap

@@ -12,7 +12,7 @@ PRODID:-//github.com/lennart-k/vzic-rs//RustiCal Calendar server//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
 TZID:Europe/Berlin
-LAST-MODIFIED:20250723T190331Z
+LAST-MODIFIED:20260124T185655Z
 X-LIC-LOCATION:Europe/Berlin
 X-PROLEPTIC-TZNAME:LMT
 BEGIN:STANDARD

crates/caldav/src/calendar_object/methods.rs

@@ -5,13 +5,14 @@ use axum::body::Body;
 use axum::extract::{Path, State};
 use axum::response::{IntoResponse, Response};
 use axum_extra::TypedHeader;
+use caldata::parser::ParserOptions;
 use headers::{ContentType, ETag, HeaderMapExt, IfNoneMatch};
 use http::{HeaderMap, HeaderValue, Method, StatusCode};
 use rustical_ical::CalendarObject;
 use rustical_store::CalendarStore;
 use rustical_store::auth::Principal;
 use std::str::FromStr;
-use tracing::{debug, instrument};
+use tracing::{instrument, warn};
 
 #[instrument(skip(cal_store))]
 pub async fn get_event<C: CalendarStore>(
@@ -20,7 +21,10 @@ pub async fn get_event<C: CalendarStore>(
         calendar_id,
         object_id,
     }): Path<CalendarObjectPathComponents>,
-    State(CalendarObjectResourceService { cal_store }): State<CalendarObjectResourceService<C>>,
+    State(CalendarObjectResourceService {
+        cal_store,
+        config: _,
+    }): State<CalendarObjectResourceService<C>>,
     user: Principal,
     method: Method,
 ) -> Result<Response, Error> {
@@ -57,7 +61,9 @@ pub async fn put_event<C: CalendarStore>(
         calendar_id,
         object_id,
     }): Path<CalendarObjectPathComponents>,
-    State(CalendarObjectResourceService { cal_store }): State<CalendarObjectResourceService<C>>,
+    State(CalendarObjectResourceService { cal_store, config }): State<
+        CalendarObjectResourceService<C>,
+    >,
     user: Principal,
     mut if_none_match: Option<TypedHeader<IfNoneMatch>>,
     header_map: HeaderMap,
@@ -94,13 +100,22 @@ pub async fn put_event<C: CalendarStore>(
         true
     };
 
-    let Ok(object) = CalendarObject::from_ics(body.clone(), Some(object_id)) else {
+    let object = match CalendarObject::import(
-        debug!("invalid calendar data:\n{body}");
+        &body,
+        Some(ParserOptions {
+            rfc7809: config.rfc7809,
+        }),
+    ) {
+        Ok(object) => object,
+        Err(err) => {
+            warn!("invalid calendar data:\n{body}");
+            warn!("{err}");
             return Err(Error::PreconditionFailed(Precondition::ValidCalendarData));
+        }
     };
     let etag = object.get_etag();
     cal_store
-        .put_object(principal, calendar_id, object, overwrite)
+        .put_object(&principal, &calendar_id, &object_id, object, overwrite)
         .await?;
 
     let mut headers = HeaderMap::new();

crates/caldav/src/calendar_object/resource.rs

@@ -1,10 +1,9 @@
-use std::borrow::Cow;
-
 use super::prop::{
     CalendarData, CalendarObjectProp, CalendarObjectPropName, CalendarObjectPropWrapper,
     CalendarObjectPropWrapperName,
 };
 use crate::Error;
+use caldata::generator::Emitter;
 use derive_more::derive::{From, Into};
 use rustical_dav::{
     extensions::CommonPropertiesExtension,
@@ -14,16 +13,18 @@ use rustical_dav::{
 };
 use rustical_ical::CalendarObject;
 use rustical_store::auth::Principal;
+use std::borrow::Cow;
 
 #[derive(Clone, From, Into)]
 pub struct CalendarObjectResource {
     pub object: CalendarObject,
+    pub object_id: String,
     pub principal: String,
 }
 
 impl ResourceName for CalendarObjectResource {
     fn get_name(&self) -> Cow<'_, str> {
-        Cow::from(format!("{}.ics", self.object.get_id()))
+        Cow::from(format!("{}.ics", self.object_id))
     }
 }
 
@@ -53,14 +54,18 @@ impl Resource for CalendarObjectResource {
                         CalendarObjectProp::Getetag(self.object.get_etag())
                     }
                     CalendarObjectPropName::CalendarData(CalendarData { expand, .. }) => {
-                        CalendarObjectProp::CalendarData(if let Some(expand) = expand.as_ref() {
+                        CalendarObjectProp::CalendarData(expand.as_ref().map_or_else(
-                            self.object.expand_recurrence(
+                            || self.object.get_ics().to_owned(),
+                            |expand| {
+                                self.object
+                                    .get_inner()
+                                    .expand_recurrence(
                                         Some(expand.start.to_utc()),
                                         Some(expand.end.to_utc()),
-                            )?
+                                    )
-                        } else {
+                                    .generate()
-                            self.object.get_ics().to_owned()
+                            },
-                        })
+                        ))
                     }
                     CalendarObjectPropName::Getcontenttype => {
                         CalendarObjectProp::Getcontenttype("text/calendar;charset=utf-8")

crates/caldav/src/calendar_object/service.rs

@@ -1,5 +1,5 @@
 use crate::{
-    CalDavPrincipalUri, Error,
+    CalDavConfig, CalDavPrincipalUri, Error,
     calendar_object::{
         methods::{get_event, put_event},
         resource::CalendarObjectResource,
@@ -24,19 +24,21 @@ pub struct CalendarObjectPathComponents {
 
 pub struct CalendarObjectResourceService<C: CalendarStore> {
     pub(crate) cal_store: Arc<C>,
+    pub(crate) config: Arc<CalDavConfig>,
 }
 
 impl<C: CalendarStore> Clone for CalendarObjectResourceService<C> {
     fn clone(&self) -> Self {
         Self {
             cal_store: self.cal_store.clone(),
+            config: self.config.clone(),
         }
     }
 }
 
 impl<C: CalendarStore> CalendarObjectResourceService<C> {
-    pub const fn new(cal_store: Arc<C>) -> Self {
+    pub const fn new(cal_store: Arc<C>, config: Arc<CalDavConfig>) -> Self {
-        Self { cal_store }
+        Self { cal_store, config }
     }
 }
 
@@ -66,6 +68,7 @@ impl<C: CalendarStore> ResourceService for CalendarObjectResourceService<C> {
             .await?;
         Ok(CalendarObjectResource {
             object,
+            object_id: object_id.to_owned(),
             principal: principal.to_owned(),
         })
     }

crates/caldav/src/error.rs

@@ -12,6 +12,9 @@ pub enum Precondition {
     #[error("valid-calendar-data")]
     #[xml(ns = "rustical_dav::namespace::NS_CALDAV")]
     ValidCalendarData,
+    #[error("calendar-timezone")]
+    #[xml(ns = "rustical_dav::namespace::NS_CALDAV")]
+    CalendarTimezone(&'static str),
 }
 
 impl IntoResponse for Precondition {
@@ -23,7 +26,7 @@ impl IntoResponse for Precondition {
         if let Err(err) = error.serialize_root(&mut writer) {
             return rustical_dav::Error::from(err).into_response();
         }
-        let mut res = Response::builder().status(StatusCode::PRECONDITION_FAILED);
+        let mut res = Response::builder().status(StatusCode::FORBIDDEN);
         res.headers_mut().unwrap().typed_insert(ContentType::xml());
         res.body(Body::from(output)).unwrap()
     }
@@ -52,9 +55,6 @@ pub enum Error {
     #[error(transparent)]
     XmlDecodeError(#[from] rustical_xml::XmlError),
 
-    #[error(transparent)]
-    IcalError(#[from] rustical_ical::Error),
-
     #[error(transparent)]
     PreconditionFailed(Precondition),
 }
@@ -75,18 +75,20 @@ impl Error {
             Self::XmlDecodeError(_) => StatusCode::BAD_REQUEST,
             Self::ChronoParseError(_) | Self::NotImplemented => StatusCode::INTERNAL_SERVER_ERROR,
             Self::NotFound => StatusCode::NOT_FOUND,
-            Self::IcalError(err) => err.status_code(),
+            // The correct status code for a failed precondition is not PreconditionFailed but
-            Self::PreconditionFailed(_err) => StatusCode::PRECONDITION_FAILED,
+            // Forbidden (or Conflict):
+            // https://datatracker.ietf.org/doc/html/rfc4791#section-1.3
+            Self::PreconditionFailed(_err) => StatusCode::FORBIDDEN,
         }
     }
 }
 
 impl IntoResponse for Error {
     fn into_response(self) -> axum::response::Response {
-        if matches!(
+        if let Self::PreconditionFailed(precondition) = self {
-            self.status_code(),
+            return precondition.into_response();
-            StatusCode::INTERNAL_SERVER_ERROR | StatusCode::PRECONDITION_FAILED
+        }
-        ) {
+        if matches!(self.status_code(), StatusCode::INTERNAL_SERVER_ERROR) {
             error!("{self}");
         }
         (self.status_code(), self.to_string()).into_response()

crates/caldav/src/lib.rs

@@ -8,6 +8,7 @@ use rustical_dav::resources::RootResourceService;
 use rustical_store::auth::middleware::AuthenticationLayer;
 use rustical_store::auth::{AuthenticationProvider, Principal};
 use rustical_store::{CalendarStore, SubscriptionStore};
+use serde::{Deserialize, Serialize};
 use std::sync::Arc;
 
 pub mod calendar;
@@ -34,6 +35,7 @@ pub fn caldav_router<AP: AuthenticationProvider, C: CalendarStore, S: Subscripti
     store: Arc<C>,
     subscription_store: Arc<S>,
     simplified_home_set: bool,
+    config: Arc<CalDavConfig>,
 ) -> Router {
     Router::new().nest(
         prefix,
@@ -42,9 +44,27 @@ pub fn caldav_router<AP: AuthenticationProvider, C: CalendarStore, S: Subscripti
             sub_store: subscription_store,
             cal_store: store,
             simplified_home_set,
+            config,
         })
         .axum_router()
         .layer(AuthenticationLayer::new(auth_provider))
         .layer(Extension(CalDavPrincipalUri(prefix))),
     )
 }
+
+const fn default_true() -> bool {
+    true
+}
+
+#[derive(Debug, Clone, Deserialize, Serialize)]
+#[serde(deny_unknown_fields, default)]
+pub struct CalDavConfig {
+    #[serde(default = "default_true")]
+    rfc7809: bool,
+}
+
+impl Default for CalDavConfig {
+    fn default() -> Self {
+        Self { rfc7809: true }
+    }
+}

crates/caldav/src/principal/service.rs

@@ -1,7 +1,7 @@
 use crate::calendar::CalendarResourceService;
 use crate::calendar::resource::CalendarResource;
 use crate::principal::PrincipalResource;
-use crate::{CalDavPrincipalUri, Error};
+use crate::{CalDavConfig, CalDavPrincipalUri, Error};
 use async_trait::async_trait;
 use axum::Router;
 use rustical_dav::resource::{AxumMethods, ResourceService};
@@ -20,6 +20,7 @@ pub struct PrincipalResourceService<
     pub(crate) cal_store: Arc<CS>,
     // If true only return the principal as the calendar home set, otherwise also groups
     pub(crate) simplified_home_set: bool,
+    pub(crate) config: Arc<CalDavConfig>,
 }
 
 impl<AP: AuthenticationProvider, S: SubscriptionStore, CS: CalendarStore> Clone
@@ -31,6 +32,7 @@ impl<AP: AuthenticationProvider, S: SubscriptionStore, CS: CalendarStore> Clone
             sub_store: self.sub_store.clone(),
             cal_store: self.cal_store.clone(),
             simplified_home_set: self.simplified_home_set,
+            config: self.config.clone(),
         }
     }
 }
@@ -84,7 +86,11 @@ impl<AP: AuthenticationProvider, S: SubscriptionStore, CS: CalendarStore> Resour
         Router::new()
             .nest(
                 "/{calendar_id}",
-                CalendarResourceService::new(self.cal_store.clone(), self.sub_store.clone())
+                CalendarResourceService::new(
+                    self.cal_store.clone(),
+                    self.sub_store.clone(),
+                    self.config.clone(),
+                )
                 .axum_router(),
             )
             .route_service("/", self.axum_service())

crates/caldav/src/principal/tests.rs

@@ -27,6 +27,7 @@ async fn test_principal_resource(
         sub_store: Arc::new(sub_store),
         auth_provider: Arc::new(auth_provider),
         simplified_home_set: false,
+        config: Default::default(),
     };
 
     // We don't have any calendars here

crates/carddav/Cargo.toml

@@ -32,7 +32,7 @@ rustical_ical.workspace = true
 http.workspace = true
 tower-http.workspace = true
 percent-encoding.workspace = true
-ical.workspace = true
+caldata.workspace = true
 strum.workspace = true
 strum_macros.workspace = true
 rstest.workspace = true

crates/carddav/src/address_object/methods.rs

@@ -103,10 +103,13 @@ pub async fn put_object<AS: AddressbookStore>(
         true
     };
 
-    let object = AddressObject::from_vcf(object_id, body)?;
+    let object = match AddressObject::from_vcf(body) {
+        Ok(object) => object,
+        Err(err) => return Ok((StatusCode::BAD_REQUEST, err.to_string()).into_response()),
+    };
     let etag = object.get_etag();
     addr_store
-        .put_object(principal, addressbook_id, object, overwrite)
+        .put_object(&principal, &addressbook_id, &object_id, object, overwrite)
         .await?;
 
     let mut headers = HeaderMap::new();

crates/carddav/src/address_object/resource.rs

@@ -7,6 +7,7 @@ use crate::{
         AddressObjectPropWrapperName,
     },
 };
+use caldata::property::VcardFNProperty;
 use derive_more::derive::{From, Into};
 use rustical_dav::{
     extensions::CommonPropertiesExtension,
@@ -21,11 +22,12 @@ use rustical_store::auth::Principal;
 pub struct AddressObjectResource {
     pub object: AddressObject,
     pub principal: String,
+    pub object_id: String,
 }
 
 impl ResourceName for AddressObjectResource {
     fn get_name(&self) -> Cow<'_, str> {
-        Cow::from(format!("{}.vcf", self.object.get_id()))
+        Cow::from(format!("{}.vcf", self.object_id))
     }
 }
 
@@ -69,7 +71,11 @@ impl Resource for AddressObjectResource {
     }
 
     fn get_displayname(&self) -> Option<&str> {
-        self.object.get_full_name()
+        self.object
+            .get_vcard()
+            .full_name
+            .first()
+            .map(|VcardFNProperty(name, _)| name.as_str())
     }
 
     fn get_owner(&self) -> Option<&str> {

crates/carddav/src/address_object/service.rs

@@ -57,6 +57,7 @@ impl<AS: AddressbookStore> ResourceService for AddressObjectResourceService<AS>
             .await?;
         Ok(AddressObjectResource {
             object,
+            object_id: object_id.to_owned(),
             principal: principal.to_owned(),
         })
     }

crates/carddav/src/addressbook/methods/get.rs

@@ -9,7 +9,6 @@ use http::{HeaderValue, Method, StatusCode, header};
 use percent_encoding::{CONTROLS, utf8_percent_encode};
 use rustical_dav::privileges::UserPrivilege;
 use rustical_dav::resource::Resource;
-use rustical_ical::AddressObject;
 use rustical_store::auth::Principal;
 use rustical_store::{AddressbookStore, SubscriptionStore};
 use std::str::FromStr;
@@ -40,7 +39,7 @@ pub async fn route_get<AS: AddressbookStore, S: SubscriptionStore>(
     let objects = addr_store.get_objects(&principal, &addressbook_id).await?;
     let vcf = objects
         .iter()
-        .map(AddressObject::get_vcf)
+        .map(|(_id, obj)| obj.get_vcf())
         .collect::<Vec<_>>()
         .join("\r\n");
 

crates/carddav/src/addressbook/methods/import.rs

@@ -1,16 +1,15 @@
-use std::io::BufReader;
-
 use crate::Error;
 use crate::addressbook::AddressbookResourceService;
 use axum::{
     extract::{Path, State},
     response::{IntoResponse, Response},
 };
-use http::StatusCode;
+use caldata::{
-use ical::{
+    VcardParser,
-    parser::{Component, ComponentMut, vcard},
+    component::{Component, ComponentMut},
-    property::Property,
+    parser::ContentLine,
 };
+use http::StatusCode;
 use rustical_store::{Addressbook, AddressbookStore, SubscriptionStore, auth::Principal};
 use tracing::instrument;
 
@@ -25,7 +24,7 @@ pub async fn route_import<AS: AddressbookStore, S: SubscriptionStore>(
         return Err(Error::Unauthorized);
     }
 
-    let parser = vcard::VcardParser::new(BufReader::new(body.as_bytes()));
+    let parser = VcardParser::from_slice(body.as_bytes());
 
     let mut objects = vec![];
     for res in parser {
@@ -33,15 +32,16 @@ pub async fn route_import<AS: AddressbookStore, S: SubscriptionStore>(
         let uid = card.get_uid();
         if uid.is_none() {
             let mut card_mut = card.mutable();
-            card_mut.set_property(Property {
+            card_mut.add_content_line(ContentLine {
                 name: "UID".to_owned(),
                 value: Some(uuid::Uuid::new_v4().to_string()),
-                params: vec![],
+                params: vec![].into(),
             });
-            card = card_mut.verify().unwrap();
+            card = card_mut.build(None).unwrap();
         }
-
+        // TODO: Make nicer
-        objects.push(card.try_into().unwrap());
+        let uid = card.get_uid().unwrap();
+        objects.push((uid.to_owned(), card.into()));
     }
 
     if objects.is_empty() {

crates/carddav/src/addressbook/methods/report/addressbook_multiget.rs

@@ -29,7 +29,7 @@ pub async fn get_objects_addressbook_multiget<AS: AddressbookStore>(
     principal: &str,
     addressbook_id: &str,
     store: &AS,
-) -> Result<(Vec<AddressObject>, Vec<String>), Error> {
+) -> Result<(Vec<(String, AddressObject)>, Vec<String>), Error> {
     let mut result = vec![];
     let mut not_found = vec![];
 
@@ -43,7 +43,7 @@ pub async fn get_objects_addressbook_multiget<AS: AddressbookStore>(
                     .get_object(principal, addressbook_id, object_id, false)
                     .await
                 {
-                    Ok(object) => result.push(object),
+                    Ok(object) => result.push((object_id.to_owned(), object)),
                     Err(rustical_store::Error::NotFound) => not_found.push(href.to_string()),
                     Err(err) => return Err(err.into()),
                 }
@@ -74,11 +74,12 @@ pub async fn handle_addressbook_multiget<AS: AddressbookStore>(
             .await?;
 
     let mut responses = Vec::new();
-    for object in objects {
+    for (object_id, object) in objects {
-        let path = format!("{}/{}.vcf", path, object.get_id());
+        let path = format!("{path}/{object_id}.vcf");
         responses.push(
             AddressObjectResource {
                 object,
+                object_id,
                 principal: principal.to_owned(),
             }
             .propfind(&path, prop, None, puri, user)?,

crates/carddav/src/addressbook/methods/report/addressbook_query/elements.rs

@@ -2,8 +2,8 @@ use crate::{
     address_object::AddressObjectPropWrapperName,
     addressbook::methods::report::addressbook_query::PropFilterElement,
 };
+use caldata::parser::ContentLine;
 use derive_more::{From, Into};
-use ical::property::Property;
 use rustical_dav::xml::{PropfindType, TextMatchElement};
 use rustical_ical::{AddressObject, UtcDateTime};
 use rustical_xml::{ValueDeserialize, XmlDeserialize, XmlRootTag};
@@ -32,8 +32,8 @@ pub struct ParamFilterElement {
 
 impl ParamFilterElement {
     #[must_use]
-    pub fn match_property(&self, prop: &Property) -> bool {
+    pub fn match_property(&self, prop: &ContentLine) -> bool {
-        let Some(param) = prop.get_param(&self.name) else {
+        let Some(param) = prop.params.get_param(&self.name) else {
             return self.is_not_defined.is_some();
         };
         if self.is_not_defined.is_some() {

crates/carddav/src/addressbook/methods/report/addressbook_query/mod.rs

@@ -15,8 +15,8 @@ pub async fn get_objects_addressbook_query<AS: AddressbookStore>(
     principal: &str,
     addressbook_id: &str,
     store: &AS,
-) -> Result<Vec<AddressObject>, Error> {
+) -> Result<Vec<(String, AddressObject)>, Error> {
     let mut objects = store.get_objects(principal, addressbook_id).await?;
-    objects.retain(|object| addr_query.filter.matches(object));
+    objects.retain(|(_id, object)| addr_query.filter.matches(object));
     Ok(objects)
 }

crates/carddav/src/addressbook/methods/report/addressbook_query/prop_filter.rs

@@ -1,5 +1,5 @@
 use super::{Allof, ParamFilterElement};
-use ical::{parser::Component, property::Property};
+use caldata::{component::Component, parser::ContentLine};
 use rustical_dav::xml::TextMatchElement;
 use rustical_ical::AddressObject;
 use rustical_xml::XmlDeserialize;
@@ -31,7 +31,7 @@ pub struct PropFilterElement {
 
 impl PropFilterElement {
     #[must_use]
-    pub fn match_property(&self, property: &Property) -> bool {
+    pub fn match_property(&self, property: &ContentLine) -> bool {
         if self.param_filter.is_empty() && self.text_match.is_empty() {
             // Filter empty
             return true;
@@ -56,22 +56,22 @@ impl PropFilterElement {
     }
 
     pub fn match_component(&self, comp: &impl PropFilterable) -> bool {
-        let properties = comp.get_named_properties(&self.name);
+        let mut properties = comp.get_named_properties(&self.name);
         if self.is_not_defined.is_some() {
-            return properties.is_empty();
+            return properties.next().is_none();
         }
 
         // The filter matches when one property instance matches
-        properties.iter().any(|prop| self.match_property(prop))
+        properties.any(|prop| self.match_property(prop))
     }
 }
 
 pub trait PropFilterable {
-    fn get_named_properties(&self, name: &str) -> Vec<&Property>;
+    fn get_named_properties<'a>(&'a self, name: &'a str) -> impl Iterator<Item = &'a ContentLine>;
 }
 
 impl PropFilterable for AddressObject {
-    fn get_named_properties(&self, name: &str) -> Vec<&Property> {
+    fn get_named_properties<'a>(&'a self, name: &'a str) -> impl Iterator<Item = &'a ContentLine> {
         self.get_vcard().get_named_properties(name)
     }
 }

crates/carddav/src/addressbook/methods/report/addressbook_query/tests.rs

@@ -64,7 +64,7 @@ const FILTER_2: &str = r#"
 #[case(VCF_2, FILTER_2, true)]
 fn test_filter(#[case] vcf: &str, #[case] filter: &str, #[case] matches: bool) {
     dbg!(vcf);
-    let obj = AddressObject::from_vcf(String::new(), vcf.to_owned()).unwrap();
+    let obj = AddressObject::from_vcf(vcf.to_owned()).unwrap();
     let filter = FilterElement::parse_str(filter).unwrap();
     assert_eq!(matches, filter.matches(&obj));
 }

crates/carddav/src/addressbook/methods/report/mod.rs

@@ -55,7 +55,7 @@ impl ReportRequest {
 }
 
 fn objects_response(
-    objects: Vec<AddressObject>,
+    objects: Vec<(String, AddressObject)>,
     not_found: Vec<String>,
     path: &str,
     principal: &str,
@@ -64,11 +64,12 @@ fn objects_response(
     prop: &PropfindType<AddressObjectPropWrapperName>,
 ) -> Result<MultistatusElement<AddressObjectPropWrapper, String>, Error> {
     let mut responses = Vec::new();
-    for object in objects {
+    for (object_id, object) in objects {
-        let path = format!("{}/{}.vcf", path, object.get_id());
+        let path = format!("{}/{}.vcf", path, &object_id);
         responses.push(
             AddressObjectResource {
                 object,
+                object_id,
                 principal: principal.to_owned(),
             }
             .propfind(&path, prop, None, puri, user)?,

crates/carddav/src/addressbook/methods/report/sync_collection.rs

@@ -32,11 +32,12 @@ pub async fn handle_sync_collection<AS: AddressbookStore>(
         .await?;
 
     let mut responses = Vec::new();
-    for object in new_objects {
+    for (object_id, object) in new_objects {
-        let path = format!("{}/{}.vcf", path.trim_end_matches('/'), object.get_id());
+        let path = format!("{}/{}.vcf", path.trim_end_matches('/'), object_id);
         responses.push(
             AddressObjectResource {
                 object,
+                object_id,
                 principal: principal.to_owned(),
             }
             .propfind(&path, &sync_collection.prop, None, puri, user)?,

crates/carddav/src/addressbook/service.rs

@@ -78,7 +78,8 @@ impl<AS: AddressbookStore, S: SubscriptionStore> ResourceService
             .get_objects(principal, addressbook_id)
             .await?
             .into_iter()
-            .map(|object| AddressObjectResource {
+            .map(|(object_id, object)| AddressObjectResource {
+                object_id,
                 object,
                 principal: principal.to_owned(),
             })
@@ -91,7 +92,7 @@ impl<AS: AddressbookStore, S: SubscriptionStore> ResourceService
         file: Self::Resource,
     ) -> Result<(), Self::Error> {
         self.addr_store
-            .update_addressbook(principal.to_owned(), addressbook_id.to_owned(), file.into())
+            .update_addressbook(principal, addressbook_id, file.into())
             .await?;
         Ok(())
     }

crates/carddav/src/error.rs

@@ -23,9 +23,6 @@ pub enum Error {
 
     #[error(transparent)]
     XmlDecodeError(#[from] rustical_xml::XmlError),
-
-    #[error(transparent)]
-    IcalError(#[from] rustical_ical::Error),
 }
 
 impl Error {
@@ -43,7 +40,6 @@ impl Error {
             Self::XmlDecodeError(_) => StatusCode::BAD_REQUEST,
             Self::ChronoParseError(_) | Self::NotImplemented => StatusCode::INTERNAL_SERVER_ERROR,
             Self::NotFound => StatusCode::NOT_FOUND,
-            Self::IcalError(err) => err.status_code(),
         }
     }
 }

crates/dav/Cargo.toml

@@ -28,7 +28,7 @@ headers.workspace = true
 strum.workspace = true
 matchit.workspace = true
 matchit-serde.workspace = true
-ical = { workspace = true, optional = true }
+caldata = { workspace = true, optional = true }
 
 [features]
-ical = ["dep:ical"]
+ical = ["dep:caldata"]

crates/dav/src/error.rs

@@ -51,19 +51,18 @@ impl Error {
                 _ => StatusCode::BAD_REQUEST,
             },
             Self::PropReadOnly => StatusCode::CONFLICT,
-            Self::PreconditionFailed => StatusCode::PRECONDITION_FAILED,
             Self::InternalError | Self::IOError(_) => StatusCode::INTERNAL_SERVER_ERROR,
-            Self::Forbidden => StatusCode::FORBIDDEN,
+            // The correct status code for a failed precondition is not PreconditionFailed but
+            // Forbidden (or Conflict):
+            // https://datatracker.ietf.org/doc/html/rfc4791#section-1.3
+            Self::PreconditionFailed | Self::Forbidden => StatusCode::FORBIDDEN,
         }
     }
 }
 
 impl axum::response::IntoResponse for Error {
     fn into_response(self) -> axum::response::Response {
-        if matches!(
+        if matches!(self.status_code(), StatusCode::INTERNAL_SERVER_ERROR) {
-            self.status_code(),
-            StatusCode::INTERNAL_SERVER_ERROR | StatusCode::PRECONDITION_FAILED
-        ) {
             error!("{self}");
         }
 

crates/dav/src/resource/methods/copy.rs

@@ -6,12 +6,15 @@ use axum::{
     extract::{MatchedPath, Path, State},
     response::{IntoResponse, Response},
 };
+use axum_extra::TypedHeader;
+use headers::Host;
 use http::{HeaderMap, StatusCode, Uri};
 use matchit_serde::ParamsDeserializer;
 use serde::Deserialize;
 use tracing::instrument;
 
 #[instrument(skip(path, resource_service,))]
+#[allow(clippy::too_many_arguments)]
 pub async fn axum_route_copy<R: ResourceService>(
     Path(path): Path<R::PathComponents>,
     State(resource_service): State<R>,
@@ -20,6 +23,7 @@ pub async fn axum_route_copy<R: ResourceService>(
     Overwrite(overwrite): Overwrite,
     matched_path: MatchedPath,
     header_map: HeaderMap,
+    TypedHeader(host): TypedHeader<Host>,
 ) -> Result<Response, R::Error> {
     let destination = header_map
         .get("Destination")
@@ -27,7 +31,11 @@ pub async fn axum_route_copy<R: ResourceService>(
         .to_str()
         .map_err(|_| crate::Error::Forbidden)?;
     let destination_uri: Uri = destination.parse().map_err(|_| crate::Error::Forbidden)?;
-    // TODO: Check that host also matches
+    if let Some(authority) = destination_uri.authority()
+        && host != authority.clone().into()
+    {
+        return Err(crate::Error::Forbidden.into());
+    }
     let destination = destination_uri.path();
 
     let mut router = matchit::Router::new();

crates/dav/src/resource/methods/mv.rs

@@ -6,12 +6,15 @@ use axum::{
     extract::{MatchedPath, Path, State},
     response::{IntoResponse, Response},
 };
+use axum_extra::TypedHeader;
+use headers::Host;
 use http::{HeaderMap, StatusCode, Uri};
 use matchit_serde::ParamsDeserializer;
 use serde::Deserialize;
 use tracing::instrument;
 
 #[instrument(skip(path, resource_service,))]
+#[allow(clippy::too_many_arguments)]
 pub async fn axum_route_move<R: ResourceService>(
     Path(path): Path<R::PathComponents>,
     State(resource_service): State<R>,
@@ -20,6 +23,7 @@ pub async fn axum_route_move<R: ResourceService>(
     Overwrite(overwrite): Overwrite,
     matched_path: MatchedPath,
     header_map: HeaderMap,
+    TypedHeader(host): TypedHeader<Host>,
 ) -> Result<Response, R::Error> {
     let destination = header_map
         .get("Destination")
@@ -27,7 +31,11 @@ pub async fn axum_route_move<R: ResourceService>(
         .to_str()
         .map_err(|_| crate::Error::Forbidden)?;
     let destination_uri: Uri = destination.parse().map_err(|_| crate::Error::Forbidden)?;
-    // TODO: Check that host also matches
+    if let Some(authority) = destination_uri.authority()
+        && host != authority.clone().into()
+    {
+        return Err(crate::Error::Forbidden.into());
+    }
     let destination = destination_uri.path();
 
     let mut router = matchit::Router::new();

crates/dav/src/resource/methods/proppatch.rs

@@ -71,6 +71,7 @@ pub async fn axum_route_proppatch<R: ResourceService>(
     route_proppatch(&path, uri.path(), &body, &principal, &resource_service).await
 }
 
+#[allow(clippy::too_many_lines)]
 pub async fn route_proppatch<R: ResourceService>(
     path_components: &R::PathComponents,
     path: &str,
@@ -116,12 +117,14 @@ pub async fn route_proppatch<R: ResourceService>(
                             }
                         }
                         SetPropertyPropWrapper::Invalid(invalid) => {
-                            let propname = invalid.tag_name();
+                            let Unparsed(propns, propname) = invalid;
 
                             if let Some(full_propname) = <R::Resource as Resource>::list_props()
                                 .into_iter()
                                 .find_map(|(ns, tag)| {
-                                    if tag == propname.as_str() {
+                                    if (ns, tag)
+                                        == (propns.as_ref().map(NamespaceOwned::as_ref), &propname)
+                                    {
                                         Some((ns.map(NamespaceOwned::from), tag.to_owned()))
                                     } else {
                                         None
@@ -133,7 +136,7 @@ pub async fn route_proppatch<R: ResourceService>(
                                 // - internal properties
                                 props_conflict.push(full_propname);
                             } else {
-                                props_not_found.push((None, propname));
+                                props_not_found.push((propns, propname));
                             }
                         }
                     }

crates/dav/src/xml/propfind.rs

@@ -45,7 +45,7 @@ impl<PN: XmlDeserialize> XmlDeserialize for PropElement<PN> {
                 // start of a child element
                 Event::Start(start) | Event::Empty(start) => {
                     let empty = matches!(event, Event::Empty(_));
-                    let (ns, name) = reader.resolve_element(start.name());
+                    let (ns, name) = reader.resolver().resolve_element(start.name());
                     let ns = match ns {
                         ResolveResult::Bound(ns) => Some(NamespaceOwned::from(ns)),
                         ResolveResult::Unknown(_ns) => todo!("handle error"),

crates/dav/src/xml/text_match.rs

@@ -1,4 +1,4 @@
-use ical::property::Property;
+use caldata::parser::ContentLine;
 use rustical_xml::{ValueDeserialize, XmlDeserialize};
 use std::borrow::Cow;
 
@@ -128,7 +128,7 @@ impl TextMatchElement {
         negate_condition.0 ^ matches
     }
     #[must_use]
-    pub fn match_property(&self, property: &Property) -> bool {
+    pub fn match_property(&self, property: &ContentLine) -> bool {
         let text = property.value.as_deref().unwrap_or("");
         self.match_text(text)
     }

crates/ical/Cargo.toml

@@ -15,7 +15,7 @@ chrono-tz.workspace = true
 thiserror.workspace = true
 derive_more.workspace = true
 rustical_xml.workspace = true
-ical.workspace = true
+caldata.workspace = true
 regex.workspace = true
 rrule.workspace = true
 serde.workspace = true

crates/ical/src/address_object.rs

@@ -1,59 +1,48 @@
-use crate::{CalDateTime, LOCAL_DATE};
 use crate::{CalendarObject, Error};
-use chrono::Datelike;
+use caldata::{
-use ical::generator::Emitter;
+    VcardParser,
-use ical::parser::{
+    component::{
-    Component,
+        CalendarInnerDataBuilder, ComponentMut, IcalAlarmBuilder, IcalCalendarObjectBuilder,
-    vcard::{self, component::VcardContact},
+        IcalEventBuilder, VcardContact,
+    },
+    generator::Emitter,
+    parser::ContentLine,
+    property::{
+        Calscale, IcalCALSCALEProperty, IcalDTENDProperty, IcalDTSTAMPProperty,
+        IcalDTSTARTProperty, IcalPRODIDProperty, IcalRRULEProperty, IcalSUMMARYProperty,
+        IcalUIDProperty, IcalVERSIONProperty, IcalVersion, VcardANNIVERSARYProperty,
+        VcardBDAYProperty, VcardFNProperty,
+    },
+    types::{CalDate, PartialDate, Timezone},
 };
+use chrono::{NaiveDate, Utc};
 use sha2::{Digest, Sha256};
-use std::{collections::HashMap, io::BufReader};
+use std::collections::BTreeMap;
+use std::str::FromStr;
 
 #[derive(Debug, Clone)]
 pub struct AddressObject {
-    id: String,
     vcf: String,
     vcard: VcardContact,
 }
 
-impl TryFrom<VcardContact> for AddressObject {
+impl From<VcardContact> for AddressObject {
-    type Error = Error;
+    fn from(vcard: VcardContact) -> Self {
-
-    fn try_from(vcard: VcardContact) -> Result<Self, Self::Error> {
-        let uid = vcard
-            .get_uid()
-            .ok_or_else(|| Error::InvalidData("missing UID".to_owned()))?
-            .to_owned();
         let vcf = vcard.generate();
-        Ok(Self {
+        Self { vcf, vcard }
-            vcf,
-            vcard,
-            id: uid,
-        })
     }
 }
 
 impl AddressObject {
-    pub fn from_vcf(id: String, vcf: String) -> Result<Self, Error> {
+    pub fn from_vcf(vcf: String) -> Result<Self, Error> {
-        let mut parser = vcard::VcardParser::new(BufReader::new(vcf.as_bytes()));
+        let parser = VcardParser::from_slice(vcf.as_bytes());
-        let vcard = parser.next().ok_or(Error::MissingContact)??;
+        let vcard = parser.expect_one()?;
-        if parser.next().is_some() {
+        Ok(Self { vcf, vcard })
-            return Err(Error::InvalidData(
-                "multiple vcards, only one allowed".to_owned(),
-            ));
-        }
-        Ok(Self { id, vcf, vcard })
-    }
-
-    #[must_use]
-    pub fn get_id(&self) -> &str {
-        &self.id
     }
 
     #[must_use]
     pub fn get_etag(&self) -> String {
         let mut hasher = Sha256::new();
-        hasher.update(self.get_id());
         hasher.update(self.get_vcf());
         format!("\"{:x}\"", hasher.finalize())
     }
@@ -63,121 +52,115 @@ impl AddressObject {
         &self.vcf
     }
 
-    #[must_use]
+    fn get_significant_date_object(
-    pub fn get_anniversary(&self) -> Option<(CalDateTime, bool)> {
+        &self,
-        let prop = self.vcard.get_property("ANNIVERSARY")?.value.as_deref()?;
+        date: &PartialDate,
-        CalDateTime::parse_vcard(prop).ok()
+        summary_prefix: &str,
-    }
+        suffix: &str,
+    ) -> Result<Option<CalendarObject>, Error> {
+        let Some(uid) = self.vcard.get_uid() else {
+            return Ok(None);
+        };
+        let uid = format!("{uid}{suffix}");
+        let year = date.get_year();
+        let year_suffix = year.map(|year| format!(" {year}")).unwrap_or_default();
+        let Some(month) = date.get_month() else {
+            return Ok(None);
+        };
+        let Some(day) = date.get_day() else {
+            return Ok(None);
+        };
+        let Some(dtstart) = NaiveDate::from_ymd_opt(year.unwrap_or(1900), month, day) else {
+            return Ok(None);
+        };
+        let start_date = CalDate(dtstart, Timezone::Local);
+        let Some(end_date) = start_date.succ_opt() else {
+            // start_date is MAX_DATE, this should never happen but FAPP also not raise an error
+            return Ok(None);
+        };
+        let Some(VcardFNProperty(fullname, _)) = self.vcard.full_name.first() else {
+            return Ok(None);
+        };
+        let summary = format!("{summary_prefix} {fullname}{year_suffix}");
 
-    #[must_use]
+        let event = IcalEventBuilder {
-    pub fn get_birthday(&self) -> Option<(CalDateTime, bool)> {
+            properties: vec![
-        let prop = self.vcard.get_property("BDAY")?.value.as_deref()?;
+                IcalDTSTAMPProperty(Utc::now().into(), vec![].into()).into(),
-        CalDateTime::parse_vcard(prop).ok()
+                IcalDTSTARTProperty(start_date.into(), vec![].into()).into(),
-    }
+                IcalDTENDProperty(end_date.into(), vec![].into()).into(),
+                IcalUIDProperty(uid, vec![].into()).into(),
+                IcalRRULEProperty(
+                    rrule::RRule::from_str("FREQ=YEARLY").unwrap(),
+                    vec![].into(),
+                )
+                .into(),
+                IcalSUMMARYProperty(summary.clone(), vec![].into()).into(),
+                ContentLine {
+                    name: "TRANSP".to_owned(),
+                    value: Some("TRANSPARENT".to_owned()),
+                    ..Default::default()
+                },
+            ],
+            alarms: vec![IcalAlarmBuilder {
+                properties: vec![
+                    ContentLine {
+                        name: "TRIGGER".to_owned(),
+                        value: Some("-PT0M".to_owned()),
+                        params: vec![("VALUE".to_owned(), vec!["DURATION".to_owned()])].into(),
+                    },
+                    ContentLine {
+                        name: "ACTION".to_owned(),
+                        value: Some("DISPLAY".to_owned()),
+                        ..Default::default()
+                    },
+                    ContentLine {
+                        name: "DESCRIPTION".to_owned(),
+                        value: Some(summary),
+                        ..Default::default()
+                    },
+                ],
+            }],
+        };
 
-    #[must_use]
+        Ok(Some(
-    pub fn get_full_name(&self) -> Option<&str> {
+            IcalCalendarObjectBuilder {
-        let prop = self.vcard.get_property("FN")?;
+                properties: vec![
-        prop.value.as_deref()
+                    IcalVERSIONProperty(IcalVersion::Version2_0, vec![].into()).into(),
+                    IcalCALSCALEProperty(Calscale::Gregorian, vec![].into()).into(),
+                    IcalPRODIDProperty(
+                        "-//github.com/lennart-k/rustical birthday calendar//EN".to_owned(),
+                        vec![].into(),
+                    )
+                    .into(),
+                ],
+                inner: Some(CalendarInnerDataBuilder::Event(vec![event])),
+                vtimezones: BTreeMap::default(),
+            }
+            .build(None)?
+            .into(),
+        ))
     }
 
     pub fn get_anniversary_object(&self) -> Result<Option<CalendarObject>, Error> {
-        Ok(
+        let Some(VcardANNIVERSARYProperty(anniversary, _)) = &self.vcard.anniversary else {
-            if let Some((anniversary, contains_year)) = self.get_anniversary() {
+            return Ok(None);
-                let Some(fullname) = self.get_full_name() else {
+        };
+        let Some(date) = &anniversary.date else {
             return Ok(None);
         };
-                let anniversary = anniversary.date();
-                let year = contains_year.then_some(anniversary.year());
-                let anniversary_start = anniversary.format(LOCAL_DATE);
-                let anniversary_end = anniversary
-                    .succ_opt()
-                    .unwrap_or(anniversary)
-                    .format(LOCAL_DATE);
-                let uid = format!("{}-anniversary", self.get_id());
 
-                let year_suffix = year.map(|year| format!(" ({year})")).unwrap_or_default();
+        self.get_significant_date_object(date, "💍", "-anniversary")
-                Some(CalendarObject::from_ics(
-                    format!(
-                        r"BEGIN:VCALENDAR
-VERSION:2.0
-CALSCALE:GREGORIAN
-PRODID:-//github.com/lennart-k/rustical birthday calendar//EN
-BEGIN:VEVENT
-DTSTART;VALUE=DATE:{anniversary_start}
-DTEND;VALUE=DATE:{anniversary_end}
-UID:{uid}
-RRULE:FREQ=YEARLY
-SUMMARY:💍 {fullname}{year_suffix}
-TRANSP:TRANSPARENT
-BEGIN:VALARM
-TRIGGER;VALUE=DURATION:-PT0M
-ACTION:DISPLAY
-DESCRIPTION:💍 {fullname}{year_suffix}
-END:VALARM
-END:VEVENT
-END:VCALENDAR",
-                    ),
-                    None,
-                )?)
-            } else {
-                None
-            },
-        )
     }
 
     pub fn get_birthday_object(&self) -> Result<Option<CalendarObject>, Error> {
-        Ok(
+        let Some(VcardBDAYProperty(bday, _)) = &self.vcard.birthday else {
-            if let Some((birthday, contains_year)) = self.get_birthday() {
+            return Ok(None);
-                let Some(fullname) = self.get_full_name() else {
+        };
+        let Some(date) = &bday.date else {
             return Ok(None);
         };
-                let birthday = birthday.date();
-                let year = contains_year.then_some(birthday.year());
-                let birthday_start = birthday.format(LOCAL_DATE);
-                let birthday_end = birthday.succ_opt().unwrap_or(birthday).format(LOCAL_DATE);
-                let uid = format!("{}-birthday", self.get_id());
 
-                let year_suffix = year.map(|year| format!(" ({year})")).unwrap_or_default();
+        self.get_significant_date_object(date, "🎂", "-birthday")
-                Some(CalendarObject::from_ics(
-                    format!(
-                        r"BEGIN:VCALENDAR
-VERSION:2.0
-CALSCALE:GREGORIAN
-PRODID:-//github.com/lennart-k/rustical birthday calendar//EN
-BEGIN:VEVENT
-DTSTART;VALUE=DATE:{birthday_start}
-DTEND;VALUE=DATE:{birthday_end}
-UID:{uid}
-RRULE:FREQ=YEARLY
-SUMMARY:🎂 {fullname}{year_suffix}
-TRANSP:TRANSPARENT
-BEGIN:VALARM
-TRIGGER;VALUE=DURATION:-PT0M
-ACTION:DISPLAY
-DESCRIPTION:🎂 {fullname}{year_suffix}
-END:VALARM
-END:VEVENT
-END:VCALENDAR",
-                    ),
-                    None,
-                )?)
-            } else {
-                None
-            },
-        )
-    }
-
-    /// Get significant dates associated with this address object
-    pub fn get_significant_dates(&self) -> Result<HashMap<&'static str, CalendarObject>, Error> {
-        let mut out = HashMap::new();
-        if let Some(birthday) = self.get_birthday_object()? {
-            out.insert("birthday", birthday);
-        }
-        if let Some(anniversary) = self.get_anniversary_object()? {
-            out.insert("anniversary", anniversary);
-        }
-        Ok(out)
     }
 
     #[must_use]

crates/ical/src/calendar_object.rs

@@ -0,0 +1,144 @@
+use std::sync::OnceLock;
+
+use crate::Error;
+use caldata::{
+    IcalObjectParser,
+    component::{CalendarInnerData, IcalCalendarObject},
+    generator::Emitter,
+    parser::ParserOptions,
+};
+use derive_more::Display;
+use serde::Deserialize;
+use serde::Serialize;
+use sha2::{Digest, Sha256};
+
+#[derive(Debug, Clone, Serialize, Deserialize, PartialEq, Eq, Display)]
+// specified in https://datatracker.ietf.org/doc/html/rfc5545#section-3.6
+pub enum CalendarObjectType {
+    #[serde(rename = "VEVENT")]
+    Event = 0,
+    #[serde(rename = "VTODO")]
+    Todo = 1,
+    #[serde(rename = "VJOURNAL")]
+    Journal = 2,
+}
+
+impl From<&IcalCalendarObject> for CalendarObjectType {
+    fn from(value: &IcalCalendarObject) -> Self {
+        match value.get_inner() {
+            CalendarInnerData::Event(_, _) => Self::Event,
+            CalendarInnerData::Todo(_, _) => Self::Todo,
+            CalendarInnerData::Journal(_, _) => Self::Journal,
+        }
+    }
+}
+
+impl CalendarObjectType {
+    #[must_use]
+    pub const fn as_str(&self) -> &'static str {
+        match self {
+            Self::Event => "VEVENT",
+            Self::Todo => "VTODO",
+            Self::Journal => "VJOURNAL",
+        }
+    }
+}
+
+impl rustical_xml::ValueSerialize for CalendarObjectType {
+    fn serialize(&self) -> String {
+        self.as_str().to_owned()
+    }
+}
+
+impl rustical_xml::ValueDeserialize for CalendarObjectType {
+    fn deserialize(val: &str) -> std::result::Result<Self, rustical_xml::XmlError> {
+        match <String as rustical_xml::ValueDeserialize>::deserialize(val)?.as_str() {
+            "VEVENT" => Ok(Self::Event),
+            "VTODO" => Ok(Self::Todo),
+            "VJOURNAL" => Ok(Self::Journal),
+            _ => Err(rustical_xml::XmlError::InvalidValue(
+                rustical_xml::ParseValueError::Other(format!(
+                    "Invalid value '{val}', must be VEVENT, VTODO, or VJOURNAL"
+                )),
+            )),
+        }
+    }
+}
+
+#[derive(Debug, Clone)]
+pub struct CalendarObject {
+    inner: IcalCalendarObject,
+    ics: OnceLock<String>,
+}
+
+impl CalendarObject {
+    // This function parses iCalendar data but doesn't cache it
+    // This is meant for iCalendar data coming from outside that might need to be normalised.
+    // For example if timezones are omitted this can be fixed by this function.
+    pub fn import(ics: &str, options: Option<ParserOptions>) -> Result<Self, Error> {
+        let parser =
+            IcalObjectParser::from_slice(ics.as_bytes()).with_options(options.unwrap_or_default());
+        let inner = parser.expect_one()?;
+
+        Ok(Self {
+            inner,
+            ics: OnceLock::new(),
+        })
+    }
+
+    // This function parses iCalendar data and then caches the parsed iCalendar data.
+    // This function is only meant for loading data from a data store where we know the iCalendar
+    // is already in the desired form.
+    pub fn from_ics(ics: String) -> Result<Self, Error> {
+        let parser = IcalObjectParser::from_slice(ics.as_bytes());
+        let inner = parser.expect_one()?;
+
+        Ok(Self {
+            inner,
+            ics: ics.into(),
+        })
+    }
+
+    #[must_use]
+    pub const fn get_inner(&self) -> &IcalCalendarObject {
+        &self.inner
+    }
+
+    #[must_use]
+    pub fn get_uid(&self) -> &str {
+        self.inner.get_uid()
+    }
+
+    #[must_use]
+    pub fn get_etag(&self) -> String {
+        let mut hasher = Sha256::new();
+        hasher.update(self.get_uid());
+        hasher.update(self.get_ics());
+        format!("\"{:x}\"", hasher.finalize())
+    }
+
+    #[must_use]
+    pub fn get_ics(&self) -> &str {
+        self.ics.get_or_init(|| self.inner.generate())
+    }
+
+    #[must_use]
+    pub fn get_object_type(&self) -> CalendarObjectType {
+        (&self.inner).into()
+    }
+}
+
+impl From<CalendarObject> for IcalCalendarObject {
+    fn from(value: CalendarObject) -> Self {
+        value.inner
+    }
+}
+
+impl From<IcalCalendarObject> for CalendarObject {
+    fn from(value: IcalCalendarObject) -> Self {
+        Self {
+            ics: value.generate().into(),
+            inner: value,
+        }
+    }
+}

crates/ical/src/error.rs

@@ -1,42 +0,0 @@
-use axum::{http::StatusCode, response::IntoResponse};
-
-use crate::CalDateTimeError;
-
-#[derive(Debug, thiserror::Error, PartialEq, Eq)]
-pub enum Error {
-    #[error("Invalid ics/vcf input: {0}")]
-    InvalidData(String),
-
-    #[error("Missing calendar")]
-    MissingCalendar,
-
-    #[error("Missing contact")]
-    MissingContact,
-
-    #[error(transparent)]
-    ParserError(#[from] ical::parser::ParserError),
-
-    #[error(transparent)]
-    CalDateTimeError(#[from] CalDateTimeError),
-
-    #[error(transparent)]
-    RRuleError(#[from] rrule::RRuleError),
-}
-
-impl Error {
-    #[must_use]
-    pub const fn status_code(&self) -> StatusCode {
-        match self {
-            Self::InvalidData(_) | Self::MissingCalendar | Self::MissingContact => {
-                StatusCode::BAD_REQUEST
-            }
-            _ => StatusCode::INTERNAL_SERVER_ERROR,
-        }
-    }
-}
-
-impl IntoResponse for Error {
-    fn into_response(self) -> axum::response::Response {
-        (self.status_code(), self.to_string()).into_response()
-    }
-}

crates/ical/src/icalendar/event.rs

@@ -1,385 +0,0 @@
-use crate::CalDateTime;
-use crate::Error;
-use chrono::{DateTime, Duration, Utc};
-use ical::parser::ComponentMut;
-use ical::{generator::IcalEvent, parser::Component, property::Property};
-use rrule::{RRule, RRuleSet};
-use std::{collections::HashMap, str::FromStr};
-
-#[derive(Debug, Clone, Default)]
-pub struct EventObject {
-    pub event: IcalEvent,
-    // If a timezone is None that means that in the VCALENDAR object there's a timezone defined
-    // with that name but its not from the Olson DB
-    pub timezones: HashMap<String, Option<chrono_tz::Tz>>,
-}
-
-impl EventObject {
-    #[must_use]
-    pub fn get_uid(&self) -> &str {
-        self.event.get_uid()
-    }
-
-    pub fn get_dtstart(&self) -> Result<Option<CalDateTime>, Error> {
-        if let Some(dtstart) = self.event.get_dtstart() {
-            Ok(Some(CalDateTime::parse_prop(dtstart, &self.timezones)?))
-        } else {
-            Ok(None)
-        }
-    }
-
-    pub fn get_dtend(&self) -> Result<Option<CalDateTime>, Error> {
-        if let Some(dtend) = self.event.get_dtend() {
-            Ok(Some(CalDateTime::parse_prop(dtend, &self.timezones)?))
-        } else {
-            Ok(None)
-        }
-    }
-
-    pub fn get_last_occurence(&self) -> Result<Option<CalDateTime>, Error> {
-        if self.event.get_rrule().is_some() {
-            // TODO: understand recurrence rules
-            return Ok(None);
-        }
-
-        if let Some(dtend) = self.get_dtend()? {
-            return Ok(Some(dtend));
-        }
-
-        let duration = self.event.get_duration().unwrap_or(Duration::days(1));
-
-        let first_occurence = self.get_dtstart()?;
-        Ok(first_occurence.map(|first_occurence| first_occurence + duration))
-    }
-
-    pub fn recurrence_ruleset(&self) -> Result<Option<rrule::RRuleSet>, Error> {
-        let dtstart: DateTime<rrule::Tz> = if let Some(dtstart) = self.get_dtstart()? {
-            if let Some(dtend) = self.get_dtend()? {
-                // DTSTART and DTEND MUST have the same timezone
-                assert_eq!(dtstart.timezone(), dtend.timezone());
-            }
-
-            dtstart
-                .as_datetime()
-                .with_timezone(&dtstart.timezone().into())
-        } else {
-            return Ok(None);
-        };
-
-        let mut rrule_set = RRuleSet::new(dtstart);
-        // TODO: Make nice, this is just a bodge to get correct behaviour
-        let mut empty = true;
-
-        for prop in &self.event.properties {
-            rrule_set = match prop.name.as_str() {
-                "RRULE" => {
-                    let rrule = RRule::from_str(prop.value.as_ref().ok_or_else(|| {
-                        Error::RRuleError(rrule::ParseError::MissingDateGenerationRules.into())
-                    })?)?
-                    .validate(dtstart)
-                    .unwrap();
-                    empty = false;
-                    rrule_set.rrule(rrule)
-                }
-                "RDATE" => {
-                    let rdate = CalDateTime::parse_prop(prop, &self.timezones)?.into();
-                    empty = false;
-                    rrule_set.rdate(rdate)
-                }
-                "EXDATE" => {
-                    let exdate = CalDateTime::parse_prop(prop, &self.timezones)?.into();
-                    empty = false;
-                    rrule_set.exdate(exdate)
-                }
-                _ => rrule_set,
-            }
-        }
-        if empty {
-            return Ok(None);
-        }
-
-        Ok(Some(rrule_set))
-    }
-
-    // The returned calendar components MUST NOT use recurrence
-    // properties (i.e., EXDATE, EXRULE, RDATE, and RRULE) and MUST NOT
-    // have reference to or include VTIMEZONE components.  Date and local
-    // time with reference to time zone information MUST be converted
-    // into date with UTC time.
-    pub fn expand_recurrence(
-        &self,
-        start: Option<DateTime<Utc>>,
-        end: Option<DateTime<Utc>>,
-        overrides: &[Self],
-    ) -> Result<Vec<IcalEvent>, Error> {
-        let mut events = vec![];
-        let dtstart = self.get_dtstart()?.expect("We must have a DTSTART here");
-        let computed_duration = self
-            .get_dtend()?
-            .map(|dtend| dtend.as_datetime().into_owned() - dtstart.as_datetime().as_ref());
-
-        let Some(mut rrule_set) = self.recurrence_ruleset()? else {
-            // If ruleset empty simply return main event AND all overrides
-            return Ok(std::iter::once(self.clone())
-                .chain(overrides.iter().cloned())
-                .map(|event| event.event)
-                .collect());
-        };
-        if let Some(start) = start {
-            rrule_set = rrule_set.after(start.with_timezone(&rrule::Tz::UTC));
-        }
-        if let Some(end) = end {
-            rrule_set = rrule_set.before(end.with_timezone(&rrule::Tz::UTC));
-        }
-        let dates = rrule_set.all(2048).dates;
-        'recurrence: for date in dates {
-            let date = CalDateTime::from(date.to_utc());
-            let recurrence_id = if dtstart.is_date() {
-                date.format_date()
-            } else {
-                date.format()
-            };
-
-            for ev_override in overrides {
-                if let Some(override_id) = &ev_override
-                    .event
-                    .get_recurrence_id()
-                    .as_ref()
-                    .expect("overrides have a recurrence id")
-                    .value
-                    && override_id == &recurrence_id
-                {
-                    // We have an override for this occurence
-                    //
-                    events.push(ev_override.event.clone());
-                    continue 'recurrence;
-                }
-            }
-
-            let mut ev = self.event.clone().mutable();
-            ev.remove_property("RRULE");
-            ev.remove_property("RDATE");
-            ev.remove_property("EXDATE");
-            ev.remove_property("EXRULE");
-            let dtstart_prop = ev
-                .get_property("DTSTART")
-                .expect("We must have a DTSTART here")
-                .clone();
-            ev.remove_property("DTSTART");
-            ev.remove_property("DTEND");
-
-            ev.set_property(Property {
-                name: "RECURRENCE-ID".to_string(),
-                value: Some(recurrence_id.clone()),
-                params: vec![],
-            });
-            ev.set_property(Property {
-                name: "DTSTART".to_string(),
-                value: Some(recurrence_id),
-                params: vec![],
-            });
-            if let Some(duration) = computed_duration {
-                let dtend = date + duration;
-                let dtendformat = if dtstart.is_date() {
-                    dtend.format_date()
-                } else {
-                    dtend.format()
-                };
-                ev.set_property(Property {
-                    name: "DTEND".to_string(),
-                    value: Some(dtendformat),
-                    params: dtstart_prop.params,
-                });
-            }
-            events.push(ev.verify()?);
-        }
-        Ok(events)
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use crate::{CalDateTime, CalendarObject};
-    use chrono::{DateTime, Utc};
-    use ical::generator::Emitter;
-    use rstest::rstest;
-
-    const ICS_1: &str = r"BEGIN:VCALENDAR
-CALSCALE:GREGORIAN
-VERSION:2.0
-BEGIN:VTIMEZONE
-TZID:Europe/Berlin
-X-LIC-LOCATION:Europe/Berlin
-END:VTIMEZONE
-
-BEGIN:VEVENT
-UID:318ec6503573d9576818daf93dac07317058d95c
-DTSTAMP:20250502T132758Z
-DTSTART;TZID=Europe/Berlin:20250506T090000
-DTEND;TZID=Europe/Berlin:20250506T092500
-SEQUENCE:2
-SUMMARY:weekly stuff
-TRANSP:OPAQUE
-RRULE:FREQ=WEEKLY;COUNT=4;INTERVAL=2;BYDAY=TU,TH,SU
-END:VEVENT
-END:VCALENDAR";
-
-    const EXPANDED_1: &[&str] = &[
-        "BEGIN:VEVENT\r
-UID:318ec6503573d9576818daf93dac07317058d95c\r
-DTSTAMP:20250502T132758Z\r
-SEQUENCE:2\r
-SUMMARY:weekly stuff\r
-TRANSP:OPAQUE\r
-RECURRENCE-ID:20250506T070000Z\r
-DTSTART:20250506T070000Z\r
-DTEND:20250506T072500Z\r
-END:VEVENT\r\n",
-        "BEGIN:VEVENT\r
-UID:318ec6503573d9576818daf93dac07317058d95c\r
-DTSTAMP:20250502T132758Z\r
-SEQUENCE:2\r
-SUMMARY:weekly stuff\r
-TRANSP:OPAQUE\r
-RECURRENCE-ID:20250508T070000Z\r
-DTSTART:20250508T070000Z\r
-DTEND:20250508T072500Z\r
-END:VEVENT\r\n",
-        "BEGIN:VEVENT\r
-UID:318ec6503573d9576818daf93dac07317058d95c\r
-DTSTAMP:20250502T132758Z\r
-SEQUENCE:2\r
-SUMMARY:weekly stuff\r
-TRANSP:OPAQUE\r
-RECURRENCE-ID:20250511T090000\r
-DTSTART:20250511T070000Z\r
-DTEND:20250511T072500Z\r
-END:VEVENT\r\n",
-        "BEGIN:VEVENT\r
-UID:318ec6503573d9576818daf93dac07317058d95c\r
-DTSTAMP:20250502T132758Z\r
-SEQUENCE:2\r
-SUMMARY:weekly stuff\r
-TRANSP:OPAQUE\r
-RECURRENCE-ID:20250520T090000\r
-DTSTA:20250520T070000Z\r
-DTEND:20250520T072500Z\r
-END:VEVENT\r\n",
-    ];
-
-    const ICS_2: &str = r"BEGIN:VCALENDAR
-CALSCALE:GREGORIAN
-VERSION:2.0
-BEGIN:VTIMEZONE
-TZID:US/Eastern
-END:VTIMEZONE
-BEGIN:VEVENT
-DTSTAMP:20060206T001121Z
-DTSTART;TZID=US/Eastern:20060102T120000
-DURATION:PT1H
-RRULE:FREQ=DAILY;COUNT=5
-SUMMARY:Event #2
-UID:abcd2
-END:VEVENT
-BEGIN:VEVENT
-DTSTAMP:20060206T001121Z
-DTSTART;TZID=US/Eastern:20060104T140000
-DURATION:PT1H
-RECURRENCE-ID;TZID=US/Eastern:20060104T120000
-SUMMARY:Event #2 bis
-UID:abcd2
-END:VEVENT
-END:VCALENDAR
-";
-
-    const EXPANDED_2: &[&str] = &[
-        "BEGIN:VEVENT\r
-DTSTAMP:20060206T001121Z\r
-DURATION:PT1H\r
-SUMMARY:Event #2\r
-UID:abcd2\r
-RECURRENCE-ID:20060103T170000\r
-DTSTART:20060103T170000\r
-END:VEVENT\r\n",
-        "BEGIN:VEVENT\r
-DTSTAMP:20060206T001121Z\r
-DURATION:PT1H\r
-SUMMARY:Event #2 bis\r
-UID:abcd2\r
-RECURRENCE-ID:20060104T170000\r
-DTSTART:20060104T190000\r
-END:VEVENT\r
-END:VCALENDAR\r\n",
-    ];
-
-    const ICS_3: &str = r"BEGIN:VCALENDAR
-CALSCALE:GREGORIAN
-VERSION:2.0
-BEGIN:VTIMEZONE
-TZID:US/Eastern
-END:VTIMEZONE
-BEGIN:VEVENT
-ATTENDEE;PARTSTAT=ACCEPTED;ROLE=CHAIR:mailto:cyrus@example.com
-ATTENDEE;PARTSTAT=NEEDS-ACTION:mailto:lisa@example.com
-DTSTAMP:20060206T001220Z
-DTSTART;TZID=US/Eastern:20060104T100000
-DURATION:PT1H
-LAST-MODIFIED:20060206T001330Z
-ORGANIZER:mailto:cyrus@example.com
-SEQUENCE:1
-STATUS:TENTATIVE
-SUMMARY:Event #3
-UID:abcd3
-END:VEVENT
-END:VCALENDAR
-";
-
-    const EXPANDED_3: &[&str] = &["BEGIN:VEVENT
-ATTENDEE;PARTSTAT=ACCEPTED;ROLE=CHAIR:mailto:cyrus@example.com
-ATTENDEE;PARTSTAT=NEEDS-ACTION:mailto:lisa@example.com
-DTSTAMP:20060206T001220Z
-DTSTART:20060104T150000
-DURATION:PT1H
-LAST-MODIFIED:20060206T001330Z
-ORGANIZER:mailto:cyrus@example.com
-SEQUENCE:1
-STATUS:TENTATIVE
-SUMMARY:Event #3
-UID:abcd3
-X-ABC-GUID:E1CX5Dr-0007ym-Hz@example.com
-END:VEVENT"];
-
-    #[rstest]
-    #[case(ICS_1, EXPANDED_1, None, None)]
-    // from https://datatracker.ietf.org/doc/html/rfc4791#section-7.8.3
-    #[case(ICS_2, EXPANDED_2,
-        Some(CalDateTime::parse("20060103T000000Z", Some(chrono_tz::US::Eastern)).unwrap().utc()),
-        Some(CalDateTime::parse("20060105T000000Z", Some(chrono_tz::US::Eastern)).unwrap().utc())
-    )]
-    #[case(ICS_3, EXPANDED_3,
-        Some(CalDateTime::parse("20060103T000000Z", Some(chrono_tz::US::Eastern)).unwrap().utc()),
-        Some(CalDateTime::parse("20060105T000000Z", Some(chrono_tz::US::Eastern)).unwrap().utc())
-    )]
-    fn test_expand_recurrence(
-        #[case] ics: &'static str,
-        #[case] expanded: &[&str],
-        #[case] from: Option<DateTime<Utc>>,
-        #[case] to: Option<DateTime<Utc>>,
-    ) {
-        let event = CalendarObject::from_ics(ics.to_string(), None).unwrap();
-        let crate::CalendarObjectComponent::Event(event, overrides) = event.get_data() else {
-            panic!()
-        };
-
-        let events: Vec<String> = event
-            .expand_recurrence(from, to, overrides)
-            .unwrap()
-            .into_iter()
-            .map(|event| Emitter::generate(&event))
-            .collect();
-        assert_eq!(events.len(), expanded.len());
-        for (output, reference) in events.iter().zip(expanded) {
-            similar_asserts::assert_eq!(output, reference);
-        }
-    }
-}

crates/ical/src/icalendar/mod.rs

@@ -1,5 +0,0 @@
-mod event;
-mod object;
-
-pub use event::*;
-pub use object::*;

crates/ical/src/icalendar/object.rs

@@ -1,366 +0,0 @@
-use super::EventObject;
-use crate::CalDateTime;
-use crate::Error;
-use chrono::DateTime;
-use chrono::Utc;
-use derive_more::Display;
-use ical::generator::{Emitter, IcalCalendar};
-use ical::parser::ical::component::IcalJournal;
-use ical::parser::ical::component::IcalTimeZone;
-use ical::parser::ical::component::IcalTodo;
-use ical::property::Property;
-use serde::Deserialize;
-use serde::Serialize;
-use sha2::{Digest, Sha256};
-use std::{collections::HashMap, io::BufReader};
-
-#[derive(Debug, Clone, Serialize, Deserialize, PartialEq, Eq, Display)]
-// specified in https://datatracker.ietf.org/doc/html/rfc5545#section-3.6
-pub enum CalendarObjectType {
-    #[serde(rename = "VEVENT")]
-    Event = 0,
-    #[serde(rename = "VTODO")]
-    Todo = 1,
-    #[serde(rename = "VJOURNAL")]
-    Journal = 2,
-}
-
-impl CalendarObjectType {
-    #[must_use]
-    pub const fn as_str(&self) -> &'static str {
-        match self {
-            Self::Event => "VEVENT",
-            Self::Todo => "VTODO",
-            Self::Journal => "VJOURNAL",
-        }
-    }
-}
-
-impl rustical_xml::ValueSerialize for CalendarObjectType {
-    fn serialize(&self) -> String {
-        self.as_str().to_owned()
-    }
-}
-
-impl rustical_xml::ValueDeserialize for CalendarObjectType {
-    fn deserialize(val: &str) -> std::result::Result<Self, rustical_xml::XmlError> {
-        match <String as rustical_xml::ValueDeserialize>::deserialize(val)?.as_str() {
-            "VEVENT" => Ok(Self::Event),
-            "VTODO" => Ok(Self::Todo),
-            "VJOURNAL" => Ok(Self::Journal),
-            _ => Err(rustical_xml::XmlError::InvalidValue(
-                rustical_xml::ParseValueError::Other(format!(
-                    "Invalid value '{val}', must be VEVENT, VTODO, or VJOURNAL"
-                )),
-            )),
-        }
-    }
-}
-
-#[derive(Debug, Clone)]
-pub enum CalendarObjectComponent {
-    Event(EventObject, Vec<EventObject>),
-    Todo(IcalTodo, Vec<IcalTodo>),
-    Journal(IcalJournal, Vec<IcalJournal>),
-}
-
-impl CalendarObjectComponent {
-    #[must_use]
-    pub fn get_uid(&self) -> &str {
-        match &self {
-            // We've made sure before that the first component exists and all components share the
-            // same UID
-            Self::Todo(todo, _) => todo.get_uid(),
-            Self::Event(event, _) => event.event.get_uid(),
-            Self::Journal(journal, _) => journal.get_uid(),
-        }
-    }
-}
-
-impl From<&CalendarObjectComponent> for CalendarObjectType {
-    fn from(value: &CalendarObjectComponent) -> Self {
-        match value {
-            CalendarObjectComponent::Event(..) => Self::Event,
-            CalendarObjectComponent::Todo(..) => Self::Todo,
-            CalendarObjectComponent::Journal(..) => Self::Journal,
-        }
-    }
-}
-
-impl CalendarObjectComponent {
-    fn from_events(mut events: Vec<EventObject>) -> Result<Self, Error> {
-        // A calendar object does not necessarily have to contain a main VOBJECT
-        if events.is_empty() {
-            return Err(Error::MissingCalendar);
-        }
-        #[allow(clippy::option_if_let_else)]
-        let main_event = if let Some(main) = events
-            .extract_if(.., |event| event.event.get_recurrence_id().is_none())
-            .next()
-        {
-            main
-        } else {
-            events.remove(0)
-        };
-        let overrides = events;
-        for event in &overrides {
-            if event.get_uid() != main_event.get_uid() {
-                return Err(Error::InvalidData(
-                    "Calendar object contains multiple UIDs".to_owned(),
-                ));
-            }
-            if event.event.get_recurrence_id().is_none() {
-                return Err(Error::InvalidData(
-                    "Calendar object can only contain one main component".to_owned(),
-                ));
-            }
-        }
-        Ok(Self::Event(main_event, overrides))
-    }
-    fn from_todos(mut todos: Vec<IcalTodo>) -> Result<Self, Error> {
-        // A calendar object does not necessarily have to contain a main VOBJECT
-        if todos.is_empty() {
-            return Err(Error::MissingCalendar);
-        }
-        #[allow(clippy::option_if_let_else)]
-        let main_todo = if let Some(main) = todos
-            .extract_if(.., |todo| todo.get_recurrence_id().is_none())
-            .next()
-        {
-            main
-        } else {
-            todos.remove(0)
-        };
-        let overrides = todos;
-        for todo in &overrides {
-            if todo.get_uid() != main_todo.get_uid() {
-                return Err(Error::InvalidData(
-                    "Calendar object contains multiple UIDs".to_owned(),
-                ));
-            }
-            if todo.get_recurrence_id().is_none() {
-                return Err(Error::InvalidData(
-                    "Calendar object can only contain one main component".to_owned(),
-                ));
-            }
-        }
-        Ok(Self::Todo(main_todo, overrides))
-    }
-    fn from_journals(mut journals: Vec<IcalJournal>) -> Result<Self, Error> {
-        // A calendar object does not necessarily have to contain a main VOBJECT
-        if journals.is_empty() {
-            return Err(Error::MissingCalendar);
-        }
-        #[allow(clippy::option_if_let_else)]
-        let main_journal = if let Some(main) = journals
-            .extract_if(.., |journal| journal.get_recurrence_id().is_none())
-            .next()
-        {
-            main
-        } else {
-            journals.remove(0)
-        };
-        let overrides = journals;
-        for journal in &overrides {
-            if journal.get_uid() != main_journal.get_uid() {
-                return Err(Error::InvalidData(
-                    "Calendar object contains multiple UIDs".to_owned(),
-                ));
-            }
-            if journal.get_recurrence_id().is_none() {
-                return Err(Error::InvalidData(
-                    "Calendar object can only contain one main component".to_owned(),
-                ));
-            }
-        }
-        Ok(Self::Journal(main_journal, overrides))
-    }
-
-    pub fn get_first_occurence(&self) -> Result<Option<CalDateTime>, Error> {
-        match &self {
-            Self::Event(main_event, overrides) => Ok(overrides
-                .iter()
-                .chain(std::iter::once(main_event))
-                .map(super::event::EventObject::get_dtstart)
-                .collect::<Result<Vec<_>, _>>()?
-                .into_iter()
-                .flatten()
-                .min()),
-            _ => Ok(None),
-        }
-    }
-
-    pub fn get_last_occurence(&self) -> Result<Option<CalDateTime>, Error> {
-        match &self {
-            Self::Event(main_event, overrides) => Ok(overrides
-                .iter()
-                .chain(std::iter::once(main_event))
-                .map(super::event::EventObject::get_last_occurence)
-                .collect::<Result<Vec<_>, _>>()?
-                .into_iter()
-                .flatten()
-                .max()),
-            _ => Ok(None),
-        }
-    }
-}
-
-#[derive(Debug, Clone)]
-pub struct CalendarObject {
-    data: CalendarObjectComponent,
-    properties: Vec<Property>,
-    id: String,
-    ics: String,
-    vtimezones: HashMap<String, IcalTimeZone>,
-}
-
-impl CalendarObject {
-    pub fn from_ics(ics: String, id: Option<String>) -> Result<Self, Error> {
-        let mut parser = ical::IcalParser::new(BufReader::new(ics.as_bytes()));
-        let cal = parser.next().ok_or(Error::MissingCalendar)??;
-        if parser.next().is_some() {
-            return Err(Error::InvalidData(
-                "multiple calendars, only one allowed".to_owned(),
-            ));
-        }
-
-        if u8::from(!cal.events.is_empty())
-            + u8::from(!cal.todos.is_empty())
-            + u8::from(!cal.journals.is_empty())
-            + u8::from(!cal.free_busys.is_empty())
-            != 1
-        {
-            // https://datatracker.ietf.org/doc/html/rfc4791#section-4.1
-            return Err(Error::InvalidData(
-                "iCalendar object must have exactly one component type".to_owned(),
-            ));
-        }
-
-        let timezones: HashMap<String, Option<chrono_tz::Tz>> = cal
-            .timezones
-            .clone()
-            .into_iter()
-            .map(|timezone| (timezone.get_tzid().to_owned(), (&timezone).try_into().ok()))
-            .collect();
-
-        let vtimezones = cal
-            .timezones
-            .clone()
-            .into_iter()
-            .map(|timezone| (timezone.get_tzid().to_owned(), timezone))
-            .collect();
-
-        let data = if !cal.events.is_empty() {
-            CalendarObjectComponent::from_events(
-                cal.events
-                    .into_iter()
-                    .map(|event| EventObject {
-                        event,
-                        timezones: timezones.clone(),
-                    })
-                    .collect(),
-            )?
-        } else if !cal.todos.is_empty() {
-            CalendarObjectComponent::from_todos(cal.todos)?
-        } else if !cal.journals.is_empty() {
-            CalendarObjectComponent::from_journals(cal.journals)?
-        } else {
-            return Err(Error::InvalidData(
-                "iCalendar component type not supported :(".to_owned(),
-            ));
-        };
-
-        Ok(Self {
-            id: id.unwrap_or_else(|| data.get_uid().to_owned()),
-            data,
-            properties: cal.properties,
-            ics,
-            vtimezones,
-        })
-    }
-
-    #[must_use]
-    pub const fn get_vtimezones(&self) -> &HashMap<String, IcalTimeZone> {
-        &self.vtimezones
-    }
-
-    #[must_use]
-    pub const fn get_data(&self) -> &CalendarObjectComponent {
-        &self.data
-    }
-
-    #[must_use]
-    pub fn get_uid(&self) -> &str {
-        self.data.get_uid()
-    }
-
-    #[must_use]
-    pub fn get_id(&self) -> &str {
-        &self.id
-    }
-
-    #[must_use]
-    pub fn get_etag(&self) -> String {
-        let mut hasher = Sha256::new();
-        hasher.update(self.get_uid());
-        hasher.update(self.get_ics());
-        format!("\"{:x}\"", hasher.finalize())
-    }
-
-    #[must_use]
-    pub fn get_ics(&self) -> &str {
-        &self.ics
-    }
-
-    #[must_use]
-    pub fn get_component_name(&self) -> &str {
-        self.get_object_type().as_str()
-    }
-
-    #[must_use]
-    pub fn get_object_type(&self) -> CalendarObjectType {
-        (&self.data).into()
-    }
-
-    pub fn get_first_occurence(&self) -> Result<Option<CalDateTime>, Error> {
-        self.data.get_first_occurence()
-    }
-
-    pub fn get_last_occurence(&self) -> Result<Option<CalDateTime>, Error> {
-        self.data.get_last_occurence()
-    }
-
-    pub fn expand_recurrence(
-        &self,
-        start: Option<DateTime<Utc>>,
-        end: Option<DateTime<Utc>>,
-    ) -> Result<String, Error> {
-        // Only events can be expanded
-        match &self.data {
-            CalendarObjectComponent::Event(main_event, overrides) => {
-                let cal = IcalCalendar {
-                    properties: self.properties.clone(),
-                    events: main_event.expand_recurrence(start, end, overrides)?,
-                    ..Default::default()
-                };
-                Ok(cal.generate())
-            }
-            _ => Ok(self.get_ics().to_string()),
-        }
-    }
-
-    #[must_use]
-    pub fn get_property(&self, name: &str) -> Option<&Property> {
-        self.properties
-            .iter()
-            .find(|property| property.name == name)
-    }
-
-    #[must_use]
-    pub fn get_named_properties(&self, name: &str) -> Vec<&Property> {
-        self.properties
-            .iter()
-            .filter(|property| property.name == name)
-            .collect()
-    }
-}

crates/ical/src/lib.rs

@@ -1,15 +1,13 @@
 #![warn(clippy::all, clippy::pedantic, clippy::nursery)]
 #![allow(clippy::missing_errors_doc, clippy::missing_panics_doc)]
 mod timestamp;
-mod timezone;
+use caldata::parser::ParserError;
 pub use timestamp::*;
-pub use timezone::*;
 
-mod icalendar;
+mod calendar_object;
-pub use icalendar::*;
+pub use calendar_object::*;
-
-mod error;
-pub use error::Error;
 
 mod address_object;
 pub use address_object::AddressObject;
+
+pub type Error = ParserError;

crates/ical/src/timestamp.rs

@@ -1,35 +1,8 @@
-use super::timezone::ICalTimezone;
+use chrono::{DateTime, NaiveDateTime, Utc};
-use chrono::{DateTime, Datelike, Duration, Local, NaiveDate, NaiveDateTime, NaiveTime, Utc};
-use chrono_tz::Tz;
 use derive_more::derive::Deref;
-use ical::property::Property;
 use rustical_xml::{ValueDeserialize, ValueSerialize};
-use std::{borrow::Cow, collections::HashMap, ops::Add, sync::LazyLock};
 
-static RE_VCARD_DATE_MM_DD: LazyLock<regex::Regex> =
-    LazyLock::new(|| regex::Regex::new(r"^--(?<m>\d{2})(?<d>\d{2})$").unwrap());
-
-const LOCAL_DATE_TIME: &str = "%Y%m%dT%H%M%S";
 const UTC_DATE_TIME: &str = "%Y%m%dT%H%M%SZ";
-pub const LOCAL_DATE: &str = "%Y%m%d";
-
-#[derive(Debug, thiserror::Error, PartialEq, Eq)]
-pub enum CalDateTimeError {
-    #[error(
-        "Timezone has X-LIC-LOCATION property to specify a timezone from the Olson database, however its value {0} is invalid"
-    )]
-    InvalidOlson(String),
-    #[error("TZID {0} does not refer to a valid timezone")]
-    InvalidTZID(String),
-    #[error("Timestamp doesn't exist because of gap in local time")]
-    LocalTimeGap,
-    #[error("Datetime string {0} has an invalid format")]
-    InvalidDatetimeFormat(String),
-    #[error("Could not parse datetime {0}")]
-    ParseError(String),
-    #[error("Duration string {0} has an invalid format")]
-    InvalidDurationFormat(String),
-}
 
 #[derive(Debug, Clone, Deref, PartialEq, Eq, Hash)]
 pub struct UtcDateTime(pub DateTime<Utc>);
@@ -54,375 +27,3 @@ impl ValueSerialize for UtcDateTime {
         format!("{}", self.0.format(UTC_DATE_TIME))
     }
 }
-
-#[derive(Debug, Clone, PartialEq, Eq)]
-pub enum CalDateTime {
-    // Form 1, example: 19980118T230000 -> Local
-    // Form 2, example: 19980119T070000Z -> UTC
-    // Form 3, example: TZID=America/New_York:19980119T020000 -> Olson
-    // https://en.wikipedia.org/wiki/Tz_database
-    DateTime(DateTime<ICalTimezone>),
-    Date(NaiveDate, ICalTimezone),
-}
-
-impl From<CalDateTime> for DateTime<rrule::Tz> {
-    fn from(value: CalDateTime) -> Self {
-        value
-            .as_datetime()
-            .into_owned()
-            .with_timezone(&value.timezone().into())
-    }
-}
-
-impl From<DateTime<rrule::Tz>> for CalDateTime {
-    fn from(value: DateTime<rrule::Tz>) -> Self {
-        Self::DateTime(value.with_timezone(&value.timezone().into()))
-    }
-}
-
-impl PartialOrd for CalDateTime {
-    fn partial_cmp(&self, other: &Self) -> Option<std::cmp::Ordering> {
-        Some(self.cmp(other))
-    }
-}
-
-impl Ord for CalDateTime {
-    fn cmp(&self, other: &Self) -> std::cmp::Ordering {
-        match (&self, &other) {
-            (Self::DateTime(a), Self::DateTime(b)) => a.cmp(b),
-            (Self::DateTime(a), Self::Date(..)) => a.cmp(&other.as_datetime()),
-            (Self::Date(..), Self::DateTime(b)) => self.as_datetime().as_ref().cmp(b),
-            (Self::Date(..), Self::Date(..)) => self.as_datetime().cmp(&other.as_datetime()),
-        }
-    }
-}
-
-impl From<DateTime<Local>> for CalDateTime {
-    fn from(value: DateTime<Local>) -> Self {
-        Self::DateTime(value.with_timezone(&ICalTimezone::Local))
-    }
-}
-
-impl From<DateTime<Utc>> for CalDateTime {
-    fn from(value: DateTime<Utc>) -> Self {
-        Self::DateTime(value.with_timezone(&ICalTimezone::Olson(chrono_tz::UTC)))
-    }
-}
-
-impl Add<Duration> for CalDateTime {
-    type Output = Self;
-
-    fn add(self, duration: Duration) -> Self::Output {
-        match self {
-            Self::DateTime(datetime) => Self::DateTime(datetime + duration),
-            Self::Date(date, tz) => Self::DateTime(
-                date.and_time(NaiveTime::default())
-                    .and_local_timezone(tz)
-                    .earliest()
-                    .expect("Local timezone has constant offset")
-                    + duration,
-            ),
-        }
-    }
-}
-
-impl CalDateTime {
-    pub fn parse_prop(
-        prop: &Property,
-        timezones: &HashMap<String, Option<chrono_tz::Tz>>,
-    ) -> Result<Self, CalDateTimeError> {
-        let prop_value = prop
-            .value
-            .as_ref()
-            .ok_or_else(|| CalDateTimeError::InvalidDatetimeFormat("empty property".into()))?;
-
-        let timezone = if let Some(tzid) = prop.get_param("TZID") {
-            if let Some(timezone) = timezones.get(tzid) {
-                timezone.to_owned()
-            } else {
-                // TZID refers to timezone that does not exist
-                return Err(CalDateTimeError::InvalidTZID(tzid.to_string()));
-            }
-        } else {
-            // No explicit timezone specified.
-            // This is valid and will be localtime or UTC depending on the value
-            // We will stick to this default as documented in https://github.com/lennart-k/rustical/issues/102
-            None
-        };
-
-        Self::parse(prop_value, timezone)
-    }
-
-    #[must_use]
-    pub fn format(&self) -> String {
-        match self {
-            Self::DateTime(datetime) => match datetime.timezone() {
-                ICalTimezone::Olson(chrono_tz::UTC) => datetime.format(UTC_DATE_TIME).to_string(),
-                _ => datetime.format(LOCAL_DATE_TIME).to_string(),
-            },
-            Self::Date(date, _) => date.format(LOCAL_DATE).to_string(),
-        }
-    }
-
-    #[must_use]
-    pub fn format_date(&self) -> String {
-        match self {
-            Self::DateTime(datetime) => datetime.format(LOCAL_DATE).to_string(),
-            Self::Date(date, _) => date.format(LOCAL_DATE).to_string(),
-        }
-    }
-
-    #[must_use]
-    pub fn date(&self) -> NaiveDate {
-        match self {
-            Self::DateTime(datetime) => datetime.date_naive(),
-            Self::Date(date, _) => date.to_owned(),
-        }
-    }
-
-    #[must_use]
-    pub const fn is_date(&self) -> bool {
-        matches!(&self, Self::Date(_, _))
-    }
-
-    #[must_use]
-    pub fn as_datetime(&self) -> Cow<'_, DateTime<ICalTimezone>> {
-        match self {
-            Self::DateTime(datetime) => Cow::Borrowed(datetime),
-            Self::Date(date, tz) => Cow::Owned(
-                date.and_time(NaiveTime::default())
-                    .and_local_timezone(tz.to_owned())
-                    .earliest()
-                    .expect("Midnight always exists"),
-            ),
-        }
-    }
-
-    #[must_use]
-    pub fn with_timezone(&self, tz: &ICalTimezone) -> Self {
-        match self {
-            Self::DateTime(datetime) => Self::DateTime(datetime.with_timezone(tz)),
-            Self::Date(date, _) => Self::Date(date.to_owned(), tz.to_owned()),
-        }
-    }
-
-    pub fn parse(value: &str, timezone: Option<Tz>) -> Result<Self, CalDateTimeError> {
-        if let Ok(datetime) = NaiveDateTime::parse_from_str(value, LOCAL_DATE_TIME) {
-            if let Some(timezone) = timezone {
-                return Ok(Self::DateTime(
-                    datetime
-                        .and_local_timezone(timezone.into())
-                        .earliest()
-                        .ok_or(CalDateTimeError::LocalTimeGap)?,
-                ));
-            }
-            return Ok(Self::DateTime(
-                datetime
-                    .and_local_timezone(ICalTimezone::Local)
-                    .earliest()
-                    .ok_or(CalDateTimeError::LocalTimeGap)?,
-            ));
-        }
-
-        if let Ok(datetime) = NaiveDateTime::parse_from_str(value, UTC_DATE_TIME) {
-            return Ok(datetime.and_utc().into());
-        }
-        let timezone = timezone.map_or(ICalTimezone::Local, ICalTimezone::Olson);
-        if let Ok(date) = NaiveDate::parse_from_str(value, LOCAL_DATE) {
-            return Ok(Self::Date(date, timezone));
-        }
-
-        if let Ok(date) = NaiveDate::parse_from_str(value, "%Y-%m-%d") {
-            return Ok(Self::Date(date, timezone));
-        }
-        if let Ok(date) = NaiveDate::parse_from_str(value, "%Y%m%d") {
-            return Ok(Self::Date(date, timezone));
-        }
-
-        Err(CalDateTimeError::InvalidDatetimeFormat(value.to_string()))
-    }
-
-    // Also returns whether the date contains a year
-    pub fn parse_vcard(value: &str) -> Result<(Self, bool), CalDateTimeError> {
-        if let Ok(datetime) = Self::parse(value, None) {
-            return Ok((datetime, true));
-        }
-
-        if let Some(captures) = RE_VCARD_DATE_MM_DD.captures(value) {
-            // Because 1972 is a leap year
-            let year = 1972;
-            // Cannot fail because of the regex
-            let month = captures.name("m").unwrap().as_str().parse().ok().unwrap();
-            let day = captures.name("d").unwrap().as_str().parse().ok().unwrap();
-
-            return Ok((
-                Self::Date(
-                    NaiveDate::from_ymd_opt(year, month, day)
-                        .ok_or_else(|| CalDateTimeError::ParseError(value.to_string()))?,
-                    ICalTimezone::Local,
-                ),
-                false,
-            ));
-        }
-        Err(CalDateTimeError::InvalidDatetimeFormat(value.to_string()))
-    }
-
-    #[must_use]
-    pub fn utc(&self) -> DateTime<Utc> {
-        self.as_datetime().to_utc()
-    }
-
-    #[must_use]
-    pub fn timezone(&self) -> ICalTimezone {
-        match &self {
-            Self::DateTime(datetime) => datetime.timezone(),
-            Self::Date(_, tz) => tz.to_owned(),
-        }
-    }
-}
-
-impl From<CalDateTime> for DateTime<Utc> {
-    fn from(value: CalDateTime) -> Self {
-        value.utc()
-    }
-}
-
-impl Datelike for CalDateTime {
-    fn year(&self) -> i32 {
-        match &self {
-            Self::DateTime(datetime) => datetime.year(),
-            Self::Date(date, _) => date.year(),
-        }
-    }
-    fn month(&self) -> u32 {
-        match &self {
-            Self::DateTime(datetime) => datetime.month(),
-            Self::Date(date, _) => date.month(),
-        }
-    }
-
-    fn month0(&self) -> u32 {
-        match &self {
-            Self::DateTime(datetime) => datetime.month0(),
-            Self::Date(date, _) => date.month0(),
-        }
-    }
-    fn day(&self) -> u32 {
-        match &self {
-            Self::DateTime(datetime) => datetime.day(),
-            Self::Date(date, _) => date.day(),
-        }
-    }
-    fn day0(&self) -> u32 {
-        match &self {
-            Self::DateTime(datetime) => datetime.day0(),
-            Self::Date(date, _) => date.day0(),
-        }
-    }
-    fn ordinal(&self) -> u32 {
-        match &self {
-            Self::DateTime(datetime) => datetime.ordinal(),
-            Self::Date(date, _) => date.ordinal(),
-        }
-    }
-    fn ordinal0(&self) -> u32 {
-        match &self {
-            Self::DateTime(datetime) => datetime.ordinal0(),
-            Self::Date(date, _) => date.ordinal0(),
-        }
-    }
-    fn weekday(&self) -> chrono::Weekday {
-        match &self {
-            Self::DateTime(datetime) => datetime.weekday(),
-            Self::Date(date, _) => date.weekday(),
-        }
-    }
-    fn iso_week(&self) -> chrono::IsoWeek {
-        match &self {
-            Self::DateTime(datetime) => datetime.iso_week(),
-            Self::Date(date, _) => date.iso_week(),
-        }
-    }
-    fn with_year(&self, year: i32) -> Option<Self> {
-        match &self {
-            Self::DateTime(datetime) => Some(Self::DateTime(datetime.with_year(year)?)),
-            Self::Date(date, tz) => Some(Self::Date(date.with_year(year)?, tz.to_owned())),
-        }
-    }
-    fn with_month(&self, month: u32) -> Option<Self> {
-        match &self {
-            Self::DateTime(datetime) => Some(Self::DateTime(datetime.with_month(month)?)),
-            Self::Date(date, tz) => Some(Self::Date(date.with_month(month)?, tz.to_owned())),
-        }
-    }
-    fn with_month0(&self, month0: u32) -> Option<Self> {
-        match &self {
-            Self::DateTime(datetime) => Some(Self::DateTime(datetime.with_month0(month0)?)),
-            Self::Date(date, tz) => Some(Self::Date(date.with_month0(month0)?, tz.to_owned())),
-        }
-    }
-    fn with_day(&self, day: u32) -> Option<Self> {
-        match &self {
-            Self::DateTime(datetime) => Some(Self::DateTime(datetime.with_day(day)?)),
-            Self::Date(date, tz) => Some(Self::Date(date.with_day(day)?, tz.to_owned())),
-        }
-    }
-    fn with_day0(&self, day0: u32) -> Option<Self> {
-        match &self {
-            Self::DateTime(datetime) => Some(Self::DateTime(datetime.with_day0(day0)?)),
-            Self::Date(date, tz) => Some(Self::Date(date.with_day0(day0)?, tz.to_owned())),
-        }
-    }
-    fn with_ordinal(&self, ordinal: u32) -> Option<Self> {
-        match &self {
-            Self::DateTime(datetime) => Some(Self::DateTime(datetime.with_ordinal(ordinal)?)),
-            Self::Date(date, tz) => Some(Self::Date(date.with_ordinal(ordinal)?, tz.to_owned())),
-        }
-    }
-    fn with_ordinal0(&self, ordinal0: u32) -> Option<Self> {
-        match &self {
-            Self::DateTime(datetime) => Some(Self::DateTime(datetime.with_ordinal0(ordinal0)?)),
-            Self::Date(date, tz) => Some(Self::Date(date.with_ordinal0(ordinal0)?, tz.to_owned())),
-        }
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use crate::CalDateTime;
-    use chrono::NaiveDate;
-
-    #[test]
-    fn test_vcard_date() {
-        assert_eq!(
-            CalDateTime::parse_vcard("19850412").unwrap(),
-            (
-                CalDateTime::Date(
-                    NaiveDate::from_ymd_opt(1985, 4, 12).unwrap(),
-                    crate::ICalTimezone::Local
-                ),
-                true
-            )
-        );
-        assert_eq!(
-            CalDateTime::parse_vcard("1985-04-12").unwrap(),
-            (
-                CalDateTime::Date(
-                    NaiveDate::from_ymd_opt(1985, 4, 12).unwrap(),
-                    crate::ICalTimezone::Local
-                ),
-                true
-            )
-        );
-        assert_eq!(
-            CalDateTime::parse_vcard("--0412").unwrap(),
-            (
-                CalDateTime::Date(
-                    NaiveDate::from_ymd_opt(1972, 4, 12).unwrap(),
-                    crate::ICalTimezone::Local
-                ),
-                false
-            )
-        );
-    }
-}

crates/ical/src/timezone.rs

@@ -1,92 +0,0 @@
-use chrono::{Local, NaiveDate, NaiveDateTime, TimeZone};
-use chrono_tz::Tz;
-use derive_more::{Display, From};
-
-#[derive(Debug, Clone, From, PartialEq, Eq)]
-pub enum ICalTimezone {
-    Local,
-    Olson(Tz),
-}
-
-impl From<ICalTimezone> for rrule::Tz {
-    fn from(value: ICalTimezone) -> Self {
-        match value {
-            ICalTimezone::Local => Self::LOCAL,
-            ICalTimezone::Olson(tz) => Self::Tz(tz),
-        }
-    }
-}
-
-impl From<rrule::Tz> for ICalTimezone {
-    fn from(value: rrule::Tz) -> Self {
-        match value {
-            rrule::Tz::Local(_) => Self::Local,
-            rrule::Tz::Tz(tz) => Self::Olson(tz),
-        }
-    }
-}
-
-#[derive(Debug, Clone, PartialEq, Eq, Display)]
-pub enum CalTimezoneOffset {
-    Local(chrono::FixedOffset),
-    Olson(chrono_tz::TzOffset),
-}
-
-impl chrono::Offset for CalTimezoneOffset {
-    fn fix(&self) -> chrono::FixedOffset {
-        match self {
-            Self::Local(local) => local.fix(),
-            Self::Olson(olson) => olson.fix(),
-        }
-    }
-}
-
-impl TimeZone for ICalTimezone {
-    type Offset = CalTimezoneOffset;
-
-    fn from_offset(offset: &Self::Offset) -> Self {
-        match offset {
-            CalTimezoneOffset::Local(_) => Self::Local,
-            CalTimezoneOffset::Olson(offset) => Self::Olson(Tz::from_offset(offset)),
-        }
-    }
-
-    fn offset_from_local_date(&self, local: &NaiveDate) -> chrono::MappedLocalTime<Self::Offset> {
-        match self {
-            Self::Local => Local
-                .offset_from_local_date(local)
-                .map(CalTimezoneOffset::Local),
-            Self::Olson(tz) => tz
-                .offset_from_local_date(local)
-                .map(CalTimezoneOffset::Olson),
-        }
-    }
-
-    fn offset_from_local_datetime(
-        &self,
-        local: &NaiveDateTime,
-    ) -> chrono::MappedLocalTime<Self::Offset> {
-        match self {
-            Self::Local => Local
-                .offset_from_local_datetime(local)
-                .map(CalTimezoneOffset::Local),
-            Self::Olson(tz) => tz
-                .offset_from_local_datetime(local)
-                .map(CalTimezoneOffset::Olson),
-        }
-    }
-
-    fn offset_from_utc_datetime(&self, utc: &NaiveDateTime) -> Self::Offset {
-        match self {
-            Self::Local => CalTimezoneOffset::Local(Local.offset_from_utc_datetime(utc)),
-            Self::Olson(tz) => CalTimezoneOffset::Olson(tz.offset_from_utc_datetime(utc)),
-        }
-    }
-
-    fn offset_from_utc_date(&self, utc: &NaiveDate) -> Self::Offset {
-        match self {
-            Self::Local => CalTimezoneOffset::Local(Local.offset_from_utc_date(utc)),
-            Self::Olson(tz) => CalTimezoneOffset::Olson(tz.offset_from_utc_date(utc)),
-        }
-    }
-}

crates/ical/tests/test_cal_object.rs

@@ -25,6 +25,6 @@ END:VCALENDAR
 
 #[test]
 fn parse_calendar_object() {
-    let object = CalendarObject::from_ics(MULTI_VEVENT.to_string(), None).unwrap();
+    let object = CalendarObject::from_ics(MULTI_VEVENT.to_string()).unwrap();
-    object.expand_recurrence(None, None).unwrap();
+    object.get_inner().expand_recurrence(None, None);
 }

crates/store/Cargo.toml

@@ -13,7 +13,7 @@ anyhow.workspace = true
 async-trait.workspace = true
 serde.workspace = true
 sha2.workspace = true
-ical.workspace = true
+caldata.workspace = true
 chrono.workspace = true
 regex.workspace = true
 thiserror.workspace = true

crates/store/src/addressbook_store.rs

@@ -15,8 +15,8 @@ pub trait AddressbookStore: Send + Sync + 'static {
 
     async fn update_addressbook(
         &self,
-        principal: String,
+        principal: &str,
-        id: String,
+        id: &str,
         addressbook: Addressbook,
     ) -> Result<(), Error>;
     async fn insert_addressbook(&self, addressbook: Addressbook) -> Result<(), Error>;
@@ -33,7 +33,7 @@ pub trait AddressbookStore: Send + Sync + 'static {
         principal: &str,
         addressbook_id: &str,
         synctoken: i64,
-    ) -> Result<(Vec<AddressObject>, Vec<String>, i64), Error>;
+    ) -> Result<(Vec<(String, AddressObject)>, Vec<String>, i64), Error>;
 
     async fn addressbook_metadata(
         &self,
@@ -45,7 +45,7 @@ pub trait AddressbookStore: Send + Sync + 'static {
         &self,
         principal: &str,
         addressbook_id: &str,
-    ) -> Result<Vec<AddressObject>, Error>;
+    ) -> Result<Vec<(String, AddressObject)>, Error>;
     async fn get_object(
         &self,
         principal: &str,
@@ -55,8 +55,9 @@ pub trait AddressbookStore: Send + Sync + 'static {
     ) -> Result<AddressObject, Error>;
     async fn put_object(
         &self,
-        principal: String,
+        principal: &str,
-        addressbook_id: String,
+        addressbook_id: &str,
+        object_id: &str,
         object: AddressObject,
         overwrite: bool,
     ) -> Result<(), Error>;
@@ -77,7 +78,7 @@ pub trait AddressbookStore: Send + Sync + 'static {
     async fn import_addressbook(
         &self,
         addressbook: Addressbook,
-        objects: Vec<AddressObject>,
+        objects: Vec<(String, AddressObject)>,
         merge_existing: bool,
     ) -> Result<(), Error>;
 }

crates/store/src/calendar_store.rs

@@ -22,8 +22,8 @@ pub trait CalendarStore: Send + Sync + 'static {
 
     async fn update_calendar(
         &self,
-        principal: String,
+        principal: &str,
-        id: String,
+        id: &str,
         calendar: Calendar,
     ) -> Result<(), Error>;
     async fn insert_calendar(&self, calendar: Calendar) -> Result<(), Error>;
@@ -46,7 +46,7 @@ pub trait CalendarStore: Send + Sync + 'static {
         principal: &str,
         cal_id: &str,
         synctoken: i64,
-    ) -> Result<(Vec<CalendarObject>, Vec<String>, i64), Error>;
+    ) -> Result<(Vec<(String, CalendarObject)>, Vec<String>, i64), Error>;
 
     /// Since the <calendar-query> rules are rather complex this function
     /// is only meant to do some prefiltering
@@ -55,7 +55,7 @@ pub trait CalendarStore: Send + Sync + 'static {
         principal: &str,
         cal_id: &str,
         _query: CalendarQuery,
-    ) -> Result<Vec<CalendarObject>, Error> {
+    ) -> Result<Vec<(String, CalendarObject)>, Error> {
         self.get_objects(principal, cal_id).await
     }
 
@@ -69,7 +69,7 @@ pub trait CalendarStore: Send + Sync + 'static {
         &self,
         principal: &str,
         cal_id: &str,
-    ) -> Result<Vec<CalendarObject>, Error>;
+    ) -> Result<Vec<(String, CalendarObject)>, Error>;
     async fn get_object(
         &self,
         principal: &str,
@@ -79,19 +79,25 @@ pub trait CalendarStore: Send + Sync + 'static {
     ) -> Result<CalendarObject, Error>;
     async fn put_objects(
         &self,
-        principal: String,
+        principal: &str,
-        cal_id: String,
+        cal_id: &str,
-        objects: Vec<CalendarObject>,
+        objects: Vec<(String, CalendarObject)>,
         overwrite: bool,
     ) -> Result<(), Error>;
     async fn put_object(
         &self,
-        principal: String,
+        principal: &str,
-        cal_id: String,
+        cal_id: &str,
+        object_id: &str,
         object: CalendarObject,
         overwrite: bool,
     ) -> Result<(), Error> {
-        self.put_objects(principal, cal_id, vec![object], overwrite)
+        self.put_objects(
+            principal,
+            cal_id,
+            vec![(object_id.to_owned(), object)],
+            overwrite,
+        )
         .await
     }
     async fn delete_object(

crates/store/src/combined_calendar_store.rs

@@ -1,5 +1,6 @@
-use crate::CalendarStore;
+use crate::{Calendar, CalendarStore, calendar_store::CalendarQuery};
 use async_trait::async_trait;
+use rustical_ical::CalendarObject;
 use std::{collections::HashMap, sync::Arc};
 
 pub trait PrefixedCalendarStore: CalendarStore {
@@ -51,11 +52,11 @@ impl CalendarStore for CombinedCalendarStore {
 
     async fn update_calendar(
         &self,
-        principal: String,
+        principal: &str,
-        id: String,
+        id: &str,
-        calendar: crate::Calendar,
+        calendar: Calendar,
     ) -> Result<(), crate::Error> {
-        self.store_for_id(&id)
+        self.store_for_id(id)
             .update_calendar(principal, id, calendar)
             .await
     }
@@ -88,7 +89,7 @@ impl CalendarStore for CombinedCalendarStore {
         principal: &str,
         cal_id: &str,
         synctoken: i64,
-    ) -> Result<(Vec<rustical_ical::CalendarObject>, Vec<String>, i64), crate::Error> {
+    ) -> Result<(Vec<(String, CalendarObject)>, Vec<String>, i64), crate::Error> {
         self.store_for_id(cal_id)
             .sync_changes(principal, cal_id, synctoken)
             .await
@@ -97,7 +98,7 @@ impl CalendarStore for CombinedCalendarStore {
     async fn import_calendar(
         &self,
         calendar: crate::Calendar,
-        objects: Vec<rustical_ical::CalendarObject>,
+        objects: Vec<CalendarObject>,
         merge_existing: bool,
     ) -> Result<(), crate::Error> {
         self.store_for_id(&calendar.id)
@@ -109,8 +110,8 @@ impl CalendarStore for CombinedCalendarStore {
         &self,
         principal: &str,
         cal_id: &str,
-        query: crate::calendar_store::CalendarQuery,
+        query: CalendarQuery,
-    ) -> Result<Vec<rustical_ical::CalendarObject>, crate::Error> {
+    ) -> Result<Vec<(String, CalendarObject)>, crate::Error> {
         self.store_for_id(cal_id)
             .calendar_query(principal, cal_id, query)
             .await
@@ -141,7 +142,7 @@ impl CalendarStore for CombinedCalendarStore {
         &self,
         principal: &str,
         cal_id: &str,
-    ) -> Result<Vec<rustical_ical::CalendarObject>, crate::Error> {
+    ) -> Result<Vec<(String, CalendarObject)>, crate::Error> {
         self.store_for_id(cal_id)
             .get_objects(principal, cal_id)
             .await
@@ -149,12 +150,12 @@ impl CalendarStore for CombinedCalendarStore {
 
     async fn put_objects(
         &self,
-        principal: String,
+        principal: &str,
-        cal_id: String,
+        cal_id: &str,
-        objects: Vec<rustical_ical::CalendarObject>,
+        objects: Vec<(String, CalendarObject)>,
         overwrite: bool,
     ) -> Result<(), crate::Error> {
-        self.store_for_id(&cal_id)
+        self.store_for_id(cal_id)
             .put_objects(principal, cal_id, objects, overwrite)
             .await
     }

crates/store/src/error.rs

@@ -26,7 +26,7 @@ pub enum Error {
     Other(#[from] anyhow::Error),
 
     #[error(transparent)]
-    IcalError(#[from] rustical_ical::Error),
+    IcalError(#[from] caldata::parser::ParserError),
 }
 
 impl Error {
@@ -36,7 +36,7 @@ impl Error {
             Self::NotFound => StatusCode::NOT_FOUND,
             Self::AlreadyExists => StatusCode::CONFLICT,
             Self::ReadOnly => StatusCode::FORBIDDEN,
-            Self::IcalError(err) => err.status_code(),
+            Self::IcalError(_err) => StatusCode::INTERNAL_SERVER_ERROR,
             Self::InvalidPrincipalType(_) => StatusCode::BAD_REQUEST,
             _ => StatusCode::INTERNAL_SERVER_ERROR,
         }
@@ -52,9 +52,7 @@ impl IntoResponse for Error {
     fn into_response(self) -> axum::response::Response {
         if matches!(
             self.status_code(),
-            StatusCode::INTERNAL_SERVER_ERROR
+            StatusCode::INTERNAL_SERVER_ERROR | StatusCode::CONFLICT
-                | StatusCode::PRECONDITION_FAILED
-                | StatusCode::CONFLICT
         ) {
             error!("{self}");
         }

crates/store_sqlite/Cargo.toml

@@ -20,6 +20,7 @@ rstest.workspace = true
 criterion.workspace = true
 
 [dependencies]
+caldata.workspace = true
 tokio.workspace = true
 rustical_store.workspace = true
 async-trait.workspace = true
@@ -36,3 +37,4 @@ pbkdf2.workspace = true
 rustical_ical.workspace = true
 rstest = { workspace = true, optional = true }
 sha2.workspace = true
+regex.workspace = true

crates/store_sqlite/benches/insert_calendar_object.rs

@@ -34,16 +34,19 @@ fn benchmark(c: &mut Criterion) {
         cal_store
     });
 
-    let object = CalendarObject::from_ics(include_str!("ical_event.ics").to_owned(), None).unwrap();
+    let row = (
+        "asd".to_owned(),
+        CalendarObject::from_ics(include_str!("ical_event.ics").to_owned()).unwrap(),
+    );
 
     let batch_size = 1000;
-    let objects: Vec<_> = std::iter::repeat_n(object.clone(), batch_size).collect();
+    let objects: Vec<_> = std::iter::repeat_n(row.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)
+                .put_objects("user", "okwow", objects.clone(), true)
                 .await
                 .unwrap();
         });
@@ -54,7 +57,7 @@ fn benchmark(c: &mut Criterion) {
             // yeet
             for _ in 0..1000 {
                 cal_store
-                    .put_object("user".to_owned(), "okwow".to_owned(), object.clone(), true)
+                    .put_object("user", "okwow", &row.0, row.1.clone(), true)
                     .await
                     .unwrap();
             }

crates/store_sqlite/src/addressbook_store/birthday_calendar.rs

@@ -1,14 +1,13 @@
 use crate::addressbook_store::SqliteAddressbookStore;
 use async_trait::async_trait;
 use chrono::NaiveDateTime;
-use rustical_ical::{AddressObject, CalendarObject, CalendarObjectType};
+use rustical_ical::{CalendarObject, CalendarObjectType};
 use rustical_store::{
     Addressbook, AddressbookStore, Calendar, CalendarMetadata, CalendarStore, CollectionMetadata,
     Error, PrefixedCalendarStore,
 };
 use sha2::{Digest, Sha256};
 use sqlx::{Executor, Sqlite};
-use std::collections::HashMap;
 use tracing::instrument;
 
 pub const BIRTHDAYS_PREFIX: &str = "_birthdays_";
@@ -269,17 +268,18 @@ impl CalendarStore for SqliteAddressbookStore {
     #[instrument]
     async fn update_calendar(
         &self,
-        principal: String,
+        principal: &str,
-        id: String,
+        id: &str,
         mut calendar: Calendar,
     ) -> Result<(), Error> {
+        assert_eq!(principal, calendar.principal);
         assert_eq!(id, calendar.id);
         calendar.id = calendar
             .id
             .strip_prefix(BIRTHDAYS_PREFIX)
             .ok_or(Error::NotFound)?
             .to_string();
-        Self::_update_birthday_calendar(&self.db, &principal, &calendar).await
+        Self::_update_birthday_calendar(&self.db, principal, &calendar).await
     }
 
     #[instrument]
@@ -324,19 +324,35 @@ impl CalendarStore for SqliteAddressbookStore {
         principal: &str,
         cal_id: &str,
         synctoken: i64,
-    ) -> Result<(Vec<CalendarObject>, Vec<String>, i64), Error> {
+    ) -> Result<(Vec<(String, CalendarObject)>, Vec<String>, i64), Error> {
         let cal_id = cal_id
             .strip_prefix(BIRTHDAYS_PREFIX)
             .ok_or(Error::NotFound)?;
         let (objects, deleted_objects, new_synctoken) =
             AddressbookStore::sync_changes(self, principal, cal_id, synctoken).await?;
-        let objects: Result<Vec<Option<CalendarObject>>, rustical_ical::Error> = objects
-            .iter()
-            .map(AddressObject::get_birthday_object)
-            .collect();
-        let objects = objects?.into_iter().flatten().collect();
 
-        Ok((objects, deleted_objects, new_synctoken))
+        let mut out_objects = vec![];
+
+        for (object_id, object) in objects {
+            if let Some(birthday) = object.get_birthday_object()? {
+                out_objects.push((format!("{object_id}-birthday"), birthday));
+            }
+            if let Some(anniversary) = object.get_anniversary_object()? {
+                out_objects.push((format!("{object_id}-anniversary"), anniversary));
+            }
+        }
+
+        let deleted_objects = deleted_objects
+            .into_iter()
+            .flat_map(|object_id| {
+                [
+                    format!("{object_id}-birthday"),
+                    format!("{object_id}-anniversary"),
+                ]
+            })
+            .collect();
+
+        Ok((out_objects, deleted_objects, new_synctoken))
     }
 
     #[instrument]
@@ -356,21 +372,19 @@ impl CalendarStore for SqliteAddressbookStore {
         &self,
         principal: &str,
         cal_id: &str,
-    ) -> Result<Vec<CalendarObject>, Error> {
+    ) -> Result<Vec<(String, CalendarObject)>, Error> {
+        let mut objects = vec![];
         let cal_id = cal_id
             .strip_prefix(BIRTHDAYS_PREFIX)
             .ok_or(Error::NotFound)?;
-        let objects: Result<Vec<HashMap<&'static str, CalendarObject>>, rustical_ical::Error> =
+        for (object_id, object) in AddressbookStore::get_objects(self, principal, cal_id).await? {
-            AddressbookStore::get_objects(self, principal, cal_id)
+            if let Some(birthday) = object.get_birthday_object()? {
-                .await?
+                objects.push((format!("{object_id}-birthday"), birthday));
-                .iter()
+            }
-                .map(AddressObject::get_significant_dates)
+            if let Some(anniversary) = object.get_anniversary_object()? {
-                .collect();
+                objects.push((format!("{object_id}-anniversary"), anniversary));
-        let objects = objects?
+            }
-            .into_iter()
+        }
-            .flat_map(HashMap::into_values)
-            .collect();
-
         Ok(objects)
     }
 
@@ -386,19 +400,22 @@ impl CalendarStore for SqliteAddressbookStore {
             .strip_prefix(BIRTHDAYS_PREFIX)
             .ok_or(Error::NotFound)?;
         let (addressobject_id, date_type) = object_id.rsplit_once('-').ok_or(Error::NotFound)?;
+        let obj =
             AddressbookStore::get_object(self, principal, cal_id, addressobject_id, show_deleted)
-            .await?
+                .await?;
-            .get_significant_dates()?
+        match date_type {
-            .remove(date_type)
+            "birthday" => Ok(obj.get_birthday_object()?.ok_or(Error::NotFound)?),
-            .ok_or(Error::NotFound)
+            "anniversary" => Ok(obj.get_anniversary_object()?.ok_or(Error::NotFound)?),
+            _ => Err(Error::NotFound),
+        }
     }
 
     #[instrument]
     async fn put_objects(
         &self,
-        _principal: String,
+        _principal: &str,
-        _cal_id: String,
+        _cal_id: &str,
-        _objects: Vec<CalendarObject>,
+        _objects: Vec<(String, CalendarObject)>,
         _overwrite: bool,
     ) -> Result<(), Error> {
         Err(Error::ReadOnly)

crates/store_sqlite/src/addressbook_store/mod.rs

@@ -1,6 +1,7 @@
 use super::ChangeOperation;
 use crate::BEGIN_IMMEDIATE;
 use async_trait::async_trait;
+use caldata::parser::ParserError;
 use derive_more::derive::Constructor;
 use rustical_ical::AddressObject;
 use rustical_store::{
@@ -9,7 +10,7 @@ use rustical_store::{
 };
 use sqlx::{Acquire, Executor, Sqlite, SqlitePool, Transaction};
 use tokio::sync::mpsc::Sender;
-use tracing::{error_span, instrument, warn};
+use tracing::{error, error_span, instrument, warn};
 
 pub mod birthday_calendar;
 
@@ -18,12 +19,18 @@ struct AddressObjectRow {
     id: String,
     vcf: String,
 }
+impl From<AddressObjectRow> for (String, Result<AddressObject, ParserError>) {
+    fn from(row: AddressObjectRow) -> Self {
+        let result = AddressObject::from_vcf(row.vcf);
+        (row.id, result)
+    }
+}
 
-impl TryFrom<AddressObjectRow> for AddressObject {
+impl TryFrom<AddressObjectRow> for (String, AddressObject) {
     type Error = rustical_store::Error;
 
     fn try_from(value: AddressObjectRow) -> Result<Self, Self::Error> {
-        Ok(Self::from_vcf(value.id, value.vcf)?)
+        Ok((value.id, AddressObject::from_vcf(value.vcf)?))
     }
 }
 
@@ -31,6 +38,7 @@ impl TryFrom<AddressObjectRow> for AddressObject {
 pub struct SqliteAddressbookStore {
     db: SqlitePool,
     sender: Sender<CollectionOperation>,
+    skip_broken: bool,
 }
 
 impl SqliteAddressbookStore {
@@ -88,6 +96,36 @@ impl SqliteAddressbookStore {
         Ok(())
     }
 
+    #[allow(clippy::missing_panics_doc)]
+    pub async fn validate_objects(&self, principal: &str) -> Result<(), Error> {
+        let mut success = true;
+        for addressbook in self.get_addressbooks(principal).await? {
+            for (object_id, res) in Self::_get_objects(&self.db, principal, &addressbook.id).await?
+            {
+                if let Err(err) = res {
+                    warn!(
+                        "Invalid address object found at {principal}/{addr_id}/{object_id}.vcf. Error: {err}",
+                        addr_id = addressbook.id
+                    );
+                    success = false;
+                }
+            }
+        }
+        if !success {
+            if self.skip_broken {
+                error!(
+                    "Not all address objects are valid. Since data_store.sqlite.skip_broken=true they will be hidden. You are still advised to manually remove or repair the object. If you need help feel free to open up an issue on GitHub."
+                );
+            } else {
+                error!(
+                    "Not all address objects are valid. Since data_store.sqlite.skip_broken=false this causes a panic. Remove or repair the broken objects manually or set data_store.sqlite.skip_broken=false as a temporary solution to ignore the error. If you need help feel free to open up an issue on GitHub."
+                );
+                panic!();
+            }
+        }
+        Ok(())
+    }
+
     // Logs an operation to an address object
     async fn log_object_operation(
         tx: &mut Transaction<'_, Sqlite>,
@@ -134,7 +172,7 @@ impl SqliteAddressbookStore {
         if let Err(err) = self.sender.try_send(CollectionOperation { topic, data }) {
             error_span!(
                 "Error trying to send addressbook update notification:",
-                err = format!("{err:?}"),
+                err = format!("{err}"),
             );
         }
     }
@@ -290,7 +328,7 @@ impl SqliteAddressbookStore {
         principal: &str,
         addressbook_id: &str,
         synctoken: i64,
-    ) -> Result<(Vec<AddressObject>, Vec<String>, i64), rustical_store::Error> {
+    ) -> Result<(Vec<(String, AddressObject)>, Vec<String>, i64), rustical_store::Error> {
         struct Row {
             object_id: String,
             synctoken: i64,
@@ -318,7 +356,7 @@ impl SqliteAddressbookStore {
         for Row { object_id, .. } in changes {
             match Self::_get_object(&mut *conn, principal, addressbook_id, &object_id, false).await
             {
-                Ok(object) => objects.push(object),
+                Ok(object) => objects.push((object_id, object)),
                 Err(rustical_store::Error::NotFound) => deleted_objects.push(object_id),
                 Err(err) => return Err(err),
             }
@@ -353,8 +391,8 @@ impl SqliteAddressbookStore {
         executor: E,
         principal: &str,
         addressbook_id: &str,
-    ) -> Result<Vec<AddressObject>, rustical_store::Error> {
+    ) -> Result<impl Iterator<Item = (String, Result<AddressObject, ParserError>)>, Error> {
-        sqlx::query_as!(
+        Ok(sqlx::query_as!(
             AddressObjectRow,
             "SELECT id, vcf FROM addressobjects WHERE principal = ? AND addressbook_id = ? AND deleted_at IS NULL",
             principal,
@@ -363,8 +401,8 @@ impl SqliteAddressbookStore {
         .fetch_all(executor)
         .await.map_err(crate::Error::from)?
         .into_iter()
-        .map(std::convert::TryInto::try_into)
+        .map(Into::into)
-        .collect()
+        )
     }
 
     async fn _get_object<'e, E: Executor<'e, Database = Sqlite>>(
@@ -374,7 +412,7 @@ impl SqliteAddressbookStore {
         object_id: &str,
         show_deleted: bool,
     ) -> Result<AddressObject, rustical_store::Error> {
-        sqlx::query_as!(
+        let (id, object) = sqlx::query_as!(
             AddressObjectRow,
             "SELECT id, vcf FROM addressobjects WHERE (principal, addressbook_id, id) = (?, ?, ?) AND ((deleted_at IS NULL) OR ?)",
             principal,
@@ -385,17 +423,20 @@ impl SqliteAddressbookStore {
         .fetch_one(executor)
         .await
         .map_err(crate::Error::from)?
-        .try_into()
+        .try_into()?;
+        assert_eq!(id, object_id);
+        Ok(object)
     }
 
     async fn _put_object<'e, E: Executor<'e, Database = Sqlite>>(
         executor: E,
         principal: &str,
         addressbook_id: &str,
+        object_id: &str,
         object: &AddressObject,
         overwrite: bool,
     ) -> Result<(), rustical_store::Error> {
-        let (object_id, vcf) = (object.get_id(), object.get_vcf());
+        let vcf = object.get_vcf();
 
         (if overwrite {
             sqlx::query!(
@@ -500,11 +541,13 @@ impl AddressbookStore for SqliteAddressbookStore {
     #[instrument]
     async fn update_addressbook(
         &self,
-        principal: String,
+        principal: &str,
-        id: String,
+        id: &str,
         addressbook: Addressbook,
     ) -> Result<(), rustical_store::Error> {
-        Self::_update_addressbook(&self.db, &principal, &id, &addressbook).await
+        assert_eq!(principal, &addressbook.principal);
+        assert_eq!(id, &addressbook.id);
+        Self::_update_addressbook(&self.db, principal, id, &addressbook).await
     }
 
     #[instrument]
@@ -569,7 +612,7 @@ impl AddressbookStore for SqliteAddressbookStore {
         principal: &str,
         addressbook_id: &str,
         synctoken: i64,
-    ) -> Result<(Vec<AddressObject>, Vec<String>, i64), rustical_store::Error> {
+    ) -> Result<(Vec<(String, AddressObject)>, Vec<String>, i64), rustical_store::Error> {
         Self::_sync_changes(&self.db, principal, addressbook_id, synctoken).await
     }
 
@@ -601,8 +644,17 @@ impl AddressbookStore for SqliteAddressbookStore {
         &self,
         principal: &str,
         addressbook_id: &str,
-    ) -> Result<Vec<AddressObject>, rustical_store::Error> {
+    ) -> Result<Vec<(String, AddressObject)>, rustical_store::Error> {
-        Self::_get_objects(&self.db, principal, addressbook_id).await
+        let objects = Self::_get_objects(&self.db, principal, addressbook_id).await?;
+        if self.skip_broken {
+            Ok(objects
+                .filter_map(|(id, res)| Some((id, res.ok()?)))
+                .collect())
+        } else {
+            Ok(objects
+                .map(|(id, res)| res.map(|obj| (id, obj)))
+                .collect::<Result<Vec<_>, _>>()?)
+        }
     }
 
     #[instrument]
@@ -619,8 +671,9 @@ impl AddressbookStore for SqliteAddressbookStore {
     #[instrument]
     async fn put_object(
         &self,
-        principal: String,
+        principal: &str,
-        addressbook_id: String,
+        addressbook_id: &str,
+        object_id: &str,
         object: AddressObject,
         overwrite: bool,
     ) -> Result<(), rustical_store::Error> {
@@ -630,15 +683,21 @@ impl AddressbookStore for SqliteAddressbookStore {
             .await
             .map_err(crate::Error::from)?;
 
-        let object_id = object.get_id().to_owned();
+        Self::_put_object(
-
+            &mut *tx,
-        Self::_put_object(&mut *tx, &principal, &addressbook_id, &object, overwrite).await?;
+            principal,
+            addressbook_id,
+            object_id,
+            &object,
+            overwrite,
+        )
+        .await?;
 
         let sync_token = Self::log_object_operation(
             &mut tx,
-            &principal,
+            principal,
-            &addressbook_id,
+            addressbook_id,
-            &object_id,
+            object_id,
             ChangeOperation::Add,
         )
         .await
@@ -648,7 +707,7 @@ impl AddressbookStore for SqliteAddressbookStore {
 
         self.send_push_notification(
             CollectionOperationInfo::Content { sync_token },
-            self.get_addressbook(&principal, &addressbook_id, false)
+            self.get_addressbook(principal, addressbook_id, false)
                 .await?
                 .push_topic,
         );
@@ -733,7 +792,7 @@ impl AddressbookStore for SqliteAddressbookStore {
     async fn import_addressbook(
         &self,
         addressbook: Addressbook,
-        objects: Vec<AddressObject>,
+        objects: Vec<(String, AddressObject)>,
         merge_existing: bool,
     ) -> Result<(), Error> {
         let mut tx = self
@@ -758,11 +817,12 @@ impl AddressbookStore for SqliteAddressbookStore {
         }
 
         let mut sync_token = None;
-        for object in objects {
+        for (object_id, object) in objects {
             Self::_put_object(
                 &mut *tx,
                 &addressbook.principal,
                 &addressbook.id,
+                &object_id,
                 &object,
                 false,
             )
@@ -773,7 +833,7 @@ impl AddressbookStore for SqliteAddressbookStore {
                     &mut tx,
                     &addressbook.principal,
                     &addressbook.id,
-                    object.get_id(),
+                    &object_id,
                     ChangeOperation::Add,
                 )
                 .await?,

crates/store_sqlite/src/calendar_store.rs

@@ -1,9 +1,12 @@
 use super::ChangeOperation;
 use crate::BEGIN_IMMEDIATE;
 use async_trait::async_trait;
+use caldata::parser::ParserError;
+use caldata::types::CalDateTime;
 use chrono::TimeDelta;
 use derive_more::derive::Constructor;
-use rustical_ical::{CalDateTime, CalendarObject, CalendarObjectType};
+use regex::Regex;
+use rustical_ical::{CalendarObject, CalendarObjectType};
 use rustical_store::calendar_store::CalendarQuery;
 use rustical_store::synctoken::format_synctoken;
 use rustical_store::{Calendar, CalendarMetadata, CalendarStore, CollectionMetadata, Error};
@@ -11,7 +14,7 @@ use rustical_store::{CollectionOperation, CollectionOperationInfo};
 use sqlx::types::chrono::NaiveDateTime;
 use sqlx::{Acquire, Executor, Sqlite, SqlitePool, Transaction};
 use tokio::sync::mpsc::Sender;
-use tracing::{error_span, instrument, warn};
+use tracing::{error, error_span, instrument, warn};
 
 #[derive(Debug, Clone)]
 struct CalendarObjectRow {
@@ -20,21 +23,37 @@ struct CalendarObjectRow {
     uid: String,
 }
 
-impl TryFrom<CalendarObjectRow> for CalendarObject {
+impl From<CalendarObjectRow> for (String, Result<CalendarObject, ParserError>) {
+    fn from(row: CalendarObjectRow) -> Self {
+        let result = CalendarObject::from_ics(row.ics).inspect(|object| {
+            if object.get_uid() != row.uid {
+                warn!(
+                    "Calendar object {}.ics: UID={} and row uid={} do not match",
+                    row.id,
+                    object.get_uid(),
+                    row.uid
+                );
+            }
+        });
+
+        (row.id, result)
+    }
+}
+
+impl TryFrom<CalendarObjectRow> for (String, CalendarObject) {
     type Error = rustical_store::Error;
 
-    fn try_from(value: CalendarObjectRow) -> Result<Self, Self::Error> {
+    fn try_from(row: CalendarObjectRow) -> Result<Self, Self::Error> {
-        let object = Self::from_ics(value.ics, Some(value.id))?;
+        let object = CalendarObject::from_ics(row.ics)?;
-        if object.get_uid() != value.uid {
+        if object.get_uid() != row.uid {
-            return Err(rustical_store::Error::IcalError(
+            warn!(
-                rustical_ical::Error::InvalidData(format!(
+                "Calendar object {}.ics: UID={} and row uid={} do not match",
-                    "uid={} and UID={} don't match",
+                row.id,
-                    value.uid,
+                object.get_uid(),
-                    object.get_uid()
+                row.uid
-                )),
+            );
-            ));
         }
-        Ok(object)
+        Ok((row.id, object))
     }
 }
 
@@ -91,6 +110,7 @@ impl From<CalendarRow> for Calendar {
 pub struct SqliteCalendarStore {
     db: SqlitePool,
     sender: Sender<CollectionOperation>,
+    skip_broken: bool,
 }
 
 impl SqliteCalendarStore {
@@ -140,11 +160,117 @@ impl SqliteCalendarStore {
         if let Err(err) = self.sender.try_send(CollectionOperation { topic, data }) {
             error_span!(
                 "Error trying to send calendar update notification:",
-                err = format!("{err:?}"),
+                err = format!("{err}"),
             );
         }
     }
 
+    #[allow(clippy::missing_panics_doc)]
+    pub async fn validate_objects(&self, principal: &str) -> Result<(), Error> {
+        let mut success = true;
+        for calendar in self.get_calendars(principal).await? {
+            for (object_id, res) in Self::_get_objects(&self.db, principal, &calendar.id).await? {
+                if let Err(err) = res {
+                    warn!(
+                        "Invalid calendar object found at {principal}/{cal_id}/{object_id}.ics. Error: {err}",
+                        cal_id = calendar.id
+                    );
+                    success = false;
+                }
+            }
+        }
+        if !success {
+            if self.skip_broken {
+                error!(
+                    "Not all calendar objects are valid. Since data_store.sqlite.skip_broken=true they will be hidden. You are still advised to manually remove or repair the object. If you need help feel free to open up an issue on GitHub."
+                );
+            } else {
+                error!(
+                    "Not all calendar objects are valid. Since data_store.sqlite.skip_broken=false this causes a panic. Remove or repair the broken objects manually or set data_store.sqlite.skip_broken=false as a temporary solution to ignore the error. If you need help feel free to open up an issue on GitHub."
+                );
+                panic!();
+            }
+        }
+        Ok(())
+    }
+
+    /// In the past exports generated objects with invalid VERSION:4.0
+    /// This repair sets them to VERSION:2.0
+    #[allow(clippy::missing_panics_doc)]
+    pub async fn repair_invalid_version_4_0(&self) -> Result<(), Error> {
+        struct Row {
+            principal: String,
+            cal_id: String,
+            id: String,
+            ics: String,
+        }
+
+        let mut tx = self
+            .db
+            .begin_with(BEGIN_IMMEDIATE)
+            .await
+            .map_err(crate::Error::from)?;
+
+        #[allow(clippy::missing_panics_doc)]
+        let version_pattern = Regex::new(r"(?mi)^VERSION:4.0").unwrap();
+
+        let repairs: Vec<Row> = sqlx::query_as!(
+            Row,
+            r#"SELECT principal, cal_id, id, ics FROM calendarobjects WHERE ics LIKE '%VERSION:4.0%';"#
+        )
+        .fetch_all(&mut *tx)
+        .await
+        .map_err(crate::Error::from)?
+            .into_iter()
+            .filter_map(|mut row| {
+                version_pattern.find(&row.ics)?;
+                let new_ics = version_pattern.replace(&row.ics, "VERSION:2.0");
+                // Safeguard that we really only changed the version
+                assert_eq!(row.ics.len(), new_ics.len());
+                row.ics = new_ics.to_string();
+                Some(row)
+            })
+            .collect();
+
+        if repairs.is_empty() {
+            return Ok(());
+        }
+        warn!(
+            "Found {} calendar objects with invalid VERSION:4.0. Repairing by setting to VERSION:2.0",
+            repairs.len()
+        );
+
+        for repair in &repairs {
+            // calendarobjectchangelog is used by sync-collection to fetch changes
+            // By deleting entries we will later regenerate new entries such that clients will notice
+            // the objects have changed
+            warn!(
+                "Repairing VERSION for {}/{}/{}.ics",
+                repair.principal, repair.cal_id, repair.id
+            );
+            sqlx::query!(
+                "DELETE FROM calendarobjectchangelog WHERE (principal, cal_id, object_id) = (?, ?, ?);",
+                repair.principal, repair.cal_id, repair.id
+            ).execute(&mut *tx).await
+            .map_err(crate::Error::from)?;
+
+            sqlx::query!(
+                "UPDATE calendarobjects SET ics = ? WHERE (principal, cal_id, id) = (?, ?, ?);",
+                repair.ics,
+                repair.principal,
+                repair.cal_id,
+                repair.id
+            )
+            .execute(&mut *tx)
+            .await
+            .map_err(crate::Error::from)?;
+        }
+
+        tx.commit().await.map_err(crate::Error::from)?;
+
+        Ok(())
+    }
+
     // Commit "orphaned" objects to the changelog table
     pub async fn repair_orphans(&self) -> Result<(), Error> {
         struct Row {
@@ -279,8 +405,8 @@ impl SqliteCalendarStore {
 
     async fn _update_calendar<'e, E: Executor<'e, Database = Sqlite>>(
         executor: E,
-        principal: String,
+        principal: &str,
-        id: String,
+        id: &str,
         calendar: Calendar,
     ) -> Result<(), Error> {
         let comp_event = calendar.components.contains(&CalendarObjectType::Event);
@@ -378,8 +504,8 @@ impl SqliteCalendarStore {
         executor: E,
         principal: &str,
         cal_id: &str,
-    ) -> Result<Vec<CalendarObject>, Error> {
+    ) -> Result<impl Iterator<Item = (String, Result<CalendarObject, ParserError>)>, Error> {
-        sqlx::query_as!(
+        Ok(sqlx::query_as!(
             CalendarObjectRow,
             "SELECT id, uid, ics FROM calendarobjects WHERE principal = ? AND cal_id = ? AND deleted_at IS NULL",
             principal,
@@ -388,8 +514,8 @@ impl SqliteCalendarStore {
         .fetch_all(executor)
         .await.map_err(crate::Error::from)?
         .into_iter()
-        .map(std::convert::TryInto::try_into)
+        .map(Into::into)
-        .collect()
+        )
     }
 
     async fn _calendar_query<'e, E: Executor<'e, Database = Sqlite>>(
@@ -397,14 +523,14 @@ impl SqliteCalendarStore {
         principal: &str,
         cal_id: &str,
         query: CalendarQuery,
-    ) -> Result<Vec<CalendarObject>, Error> {
+    ) -> Result<impl Iterator<Item = (String, Result<CalendarObject, ParserError>)>, Error> {
         // We extend our query interval by one day in each direction since we really don't want to
         // miss any objects because of timezone differences
         // I've previously tried NaiveDate::MIN,MAX, but it seems like sqlite cannot handle these
         let start = query.time_start.map(|start| start - TimeDelta::days(1));
         let end = query.time_end.map(|end| end + TimeDelta::days(1));
 
-        sqlx::query_as!(
+        Ok(sqlx::query_as!(
             CalendarObjectRow,
             r"SELECT id, uid, ics FROM calendarobjects
                 WHERE principal = ? AND cal_id = ? AND deleted_at IS NULL
@@ -422,8 +548,7 @@ impl SqliteCalendarStore {
         .await
         .map_err(crate::Error::from)?
         .into_iter()
-        .map(std::convert::TryInto::try_into)
+        .map(Into::into))
-        .collect()
     }
 
     async fn _get_object<'e, E: Executor<'e, Database = Sqlite>>(
@@ -433,7 +558,7 @@ impl SqliteCalendarStore {
         object_id: &str,
         show_deleted: bool,
     ) -> Result<CalendarObject, Error> {
-        sqlx::query_as!(
+        let (row_id, object) = sqlx::query_as!(
             CalendarObjectRow,
             "SELECT id, uid, ics FROM calendarobjects WHERE (principal, cal_id, id) = (?, ?, ?) AND ((deleted_at IS NULL) OR ?)",
             principal,
@@ -444,7 +569,9 @@ impl SqliteCalendarStore {
         .fetch_one(executor)
         .await
         .map_err(crate::Error::from)?
-        .try_into()
+        .try_into()?;
+        assert_eq!(object_id, row_id);
+        Ok(object)
     }
 
     #[instrument]
@@ -452,23 +579,24 @@ impl SqliteCalendarStore {
         executor: E,
         principal: &str,
         cal_id: &str,
+        object_id: &str,
         object: &CalendarObject,
         overwrite: bool,
     ) -> Result<(), Error> {
-        let (object_id, uid, ics) = (object.get_id(), object.get_uid(), object.get_ics());
+        let (uid, ics) = (object.get_uid(), object.get_ics());
 
         let first_occurence = object
+            .get_inner()
+            .get_inner()
             .get_first_occurence()
-            .ok()
-            .flatten()
             .as_ref()
-            .map(CalDateTime::date);
+            .map(CalDateTime::date_floor);
         let last_occurence = object
+            .get_inner()
+            .get_inner()
             .get_last_occurence()
-            .ok()
-            .flatten()
             .as_ref()
-            .map(CalDateTime::date);
+            .map(CalDateTime::date_ceil);
         let etag = object.get_etag();
         let object_type = object.get_object_type() as u8;
 
@@ -560,7 +688,8 @@ impl SqliteCalendarStore {
         principal: &str,
         cal_id: &str,
         synctoken: i64,
-    ) -> Result<(Vec<CalendarObject>, Vec<String>, i64), Error> {
+        skip_broken: bool,
+    ) -> Result<(Vec<(String, CalendarObject)>, Vec<String>, i64), Error> {
         struct Row {
             object_id: String,
             synctoken: i64,
@@ -587,8 +716,10 @@ impl SqliteCalendarStore {
 
         for Row { object_id, .. } in changes {
             match Self::_get_object(&mut *conn, principal, cal_id, &object_id, false).await {
-                Ok(object) => objects.push(object),
+                Ok(object) => objects.push((object_id, object)),
                 Err(rustical_store::Error::NotFound) => deleted_objects.push(object_id),
+                // Skip broken object
+                Err(rustical_store::Error::IcalError(_)) if skip_broken => (),
                 Err(err) => return Err(err),
             }
         }
@@ -627,8 +758,8 @@ impl CalendarStore for SqliteCalendarStore {
     #[instrument]
     async fn update_calendar(
         &self,
-        principal: String,
+        principal: &str,
-        id: String,
+        id: &str,
         calendar: Calendar,
     ) -> Result<(), Error> {
         Self::_update_calendar(&self.db, principal, id, calendar).await
@@ -696,14 +827,23 @@ impl CalendarStore for SqliteCalendarStore {
 
         let mut sync_token = None;
         for object in objects {
-            Self::_put_object(&mut *tx, &calendar.principal, &calendar.id, &object, false).await?;
+            let object_id = object.get_uid();
+            Self::_put_object(
+                &mut *tx,
+                &calendar.principal,
+                &calendar.id,
+                object_id,
+                &object,
+                false,
+            )
+            .await?;
 
             sync_token = Some(
                 Self::log_object_operation(
                     &mut tx,
                     &calendar.principal,
                     &calendar.id,
-                    object.get_id(),
+                    object_id,
                     ChangeOperation::Add,
                 )
                 .await?,
@@ -729,8 +869,17 @@ impl CalendarStore for SqliteCalendarStore {
         principal: &str,
         cal_id: &str,
         query: CalendarQuery,
-    ) -> Result<Vec<CalendarObject>, Error> {
+    ) -> Result<Vec<(String, CalendarObject)>, Error> {
-        Self::_calendar_query(&self.db, principal, cal_id, query).await
+        let objects = Self::_calendar_query(&self.db, principal, cal_id, query).await?;
+        if self.skip_broken {
+            Ok(objects
+                .filter_map(|(id, res)| Some((id, res.ok()?)))
+                .collect())
+        } else {
+            Ok(objects
+                .map(|(id, res)| res.map(|obj| (id, obj)))
+                .collect::<Result<Vec<_>, _>>()?)
+        }
     }
 
     async fn calendar_metadata(
@@ -760,8 +909,17 @@ impl CalendarStore for SqliteCalendarStore {
         &self,
         principal: &str,
         cal_id: &str,
-    ) -> Result<Vec<CalendarObject>, Error> {
+    ) -> Result<Vec<(String, CalendarObject)>, Error> {
-        Self::_get_objects(&self.db, principal, cal_id).await
+        let objects = Self::_get_objects(&self.db, principal, cal_id).await?;
+        if self.skip_broken {
+            Ok(objects
+                .filter_map(|(id, res)| Some((id, res.ok()?)))
+                .collect())
+        } else {
+            Ok(objects
+                .map(|(id, res)| res.map(|obj| (id, obj)))
+                .collect::<Result<Vec<_>, _>>()?)
+        }
     }
 
     #[instrument]
@@ -778,9 +936,9 @@ impl CalendarStore for SqliteCalendarStore {
     #[instrument]
     async fn put_objects(
         &self,
-        principal: String,
+        principal: &str,
-        cal_id: String,
+        cal_id: &str,
-        objects: Vec<CalendarObject>,
+        objects: Vec<(String, CalendarObject)>,
         overwrite: bool,
     ) -> Result<(), Error> {
         let mut tx = self
@@ -789,25 +947,25 @@ impl CalendarStore for SqliteCalendarStore {
             .await
             .map_err(crate::Error::from)?;
 
-        let calendar = Self::_get_calendar(&mut *tx, &principal, &cal_id, true).await?;
+        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);
         }
 
         let mut sync_token = None;
-        for object in objects {
+        for (object_id, object) in objects {
             sync_token = Some(
                 Self::log_object_operation(
                     &mut tx,
-                    &principal,
+                    principal,
-                    &cal_id,
+                    cal_id,
-                    object.get_id(),
+                    &object_id,
                     ChangeOperation::Add,
                 )
                 .await?,
             );
-            Self::_put_object(&mut *tx, &principal, &cal_id, &object, overwrite).await?;
+            Self::_put_object(&mut *tx, principal, cal_id, &object_id, &object, overwrite).await?;
         }
 
         tx.commit().await.map_err(crate::Error::from)?;
@@ -815,9 +973,7 @@ impl CalendarStore for SqliteCalendarStore {
         if let Some(sync_token) = sync_token {
             self.send_push_notification(
                 CollectionOperationInfo::Content { sync_token },
-                self.get_calendar(&principal, &cal_id, true)
+                self.get_calendar(principal, cal_id, true).await?.push_topic,
-                    .await?
-                    .push_topic,
             );
         }
         Ok(())
@@ -885,8 +1041,8 @@ impl CalendarStore for SqliteCalendarStore {
         principal: &str,
         cal_id: &str,
         synctoken: i64,
-    ) -> Result<(Vec<CalendarObject>, Vec<String>, i64), Error> {
+    ) -> Result<(Vec<(String, CalendarObject)>, Vec<String>, i64), Error> {
-        Self::_sync_changes(&self.db, principal, cal_id, synctoken).await
+        Self::_sync_changes(&self.db, principal, cal_id, synctoken, self.skip_broken).await
     }
 
     fn is_read_only(&self, _cal_id: &str) -> bool {

crates/store_sqlite/src/error.rs

@@ -18,7 +18,7 @@ impl From<sqlx::Error> for Error {
             sqlx::Error::RowNotFound => Self::StoreError(rustical_store::Error::NotFound),
             sqlx::Error::Database(err) => {
                 if err.is_unique_violation() {
-                    warn!("{err:?}");
+                    warn!("{err}");
                     Self::StoreError(rustical_store::Error::AlreadyExists)
                 } else {
                     Self::SqlxError(sqlx::Error::Database(err))

crates/store_sqlite/src/tests/mod.rs

@@ -52,8 +52,8 @@ pub async fn test_store_context() -> TestStoreContext {
     let db = get_test_db().await;
     TestStoreContext {
         db: db.clone(),
-        addr_store: SqliteAddressbookStore::new(db.clone(), send_addr),
+        addr_store: SqliteAddressbookStore::new(db.clone(), send_addr, false),
-        cal_store: SqliteCalendarStore::new(db.clone(), send_cal),
+        cal_store: SqliteCalendarStore::new(db.clone(), send_cal, false),
         principal_store: SqlitePrincipalStore::new(db.clone()),
         sub_store: SqliteStore::new(db),
     }

crates/xml/derive/src/xml_struct/mod.rs

@@ -136,7 +136,7 @@ impl NamedStruct {
                         #(#builder_field_inits),*
                     };
 
-                    let (ns, name) = reader.resolve_element(start.name());
+                    let (ns, name) = reader.resolver().resolve_element(start.name());
                     #(#tagname_field_branches);*
                     #(#namespace_field_branches);*
 
@@ -161,7 +161,7 @@ impl NamedStruct {
                                 // start of a child element
                                 Event::Start(start) | Event::Empty(start) => {
                                     let empty = matches!(event, Event::Empty(_));
-                                    let (ns, name) = reader.resolve_element(start.name());
+                                    let (ns, name) = reader.resolver().resolve_element(start.name());
                                     match (ns, name.as_ref()) {
                                         #(#named_field_branches),*
                                         #(#untagged_field_branches),*

crates/xml/src/de.rs

@@ -42,7 +42,7 @@ impl<T: XmlRootTag + XmlDeserialize> XmlDocument for T {
             match event {
                 Event::Decl(_) | Event::Comment(_) => { /*  ignore this */ }
                 Event::Start(start) | Event::Empty(start) => {
-                    let (ns, name) = reader.resolve_element(start.name());
+                    let (ns, name) = reader.resolver().resolve_element(start.name());
                     let matches = match (Self::root_ns(), &ns, name) {
                         // Wrong tag
                         (_, _, name) if name.as_ref() != Self::root_tag().as_bytes() => false,

crates/xml/src/namespace.rs

@@ -1,6 +1,6 @@
 use quick_xml::name::Namespace;
 
-#[derive(Debug, Clone, Default, PartialEq, Eq)]
+#[derive(Debug, Clone, Default, PartialEq, Eq, Hash)]
 pub struct NamespaceOwned(pub Vec<u8>);
 
 impl<'a> From<Namespace<'a>> for NamespaceOwned {

crates/xml/src/unparsed.rs

@@ -1,18 +1,21 @@
 use std::io::BufRead;
 
-use quick_xml::events::BytesStart;
+use quick_xml::{events::BytesStart, name::ResolveResult};
 
-use crate::{XmlDeserialize, XmlError};
+use crate::{NamespaceOwned, XmlDeserialize, XmlError};
 
-// TODO: actually implement
 #[derive(Debug, Clone, PartialEq, Eq, Hash)]
-pub struct Unparsed(String);
+pub struct Unparsed(pub Option<NamespaceOwned>, pub String);
 
 impl Unparsed {
     #[must_use]
-    pub fn tag_name(&self) -> String {
+    pub const fn ns(&self) -> Option<&NamespaceOwned> {
-        // TODO: respect namespace?
+        self.0.as_ref()
-        self.0.clone()
+    }
+
+    #[must_use]
+    pub const fn tag_name(&self) -> &str {
+        self.1.as_str()
     }
 }
 
@@ -27,7 +30,12 @@ impl XmlDeserialize for Unparsed {
             let mut buf = vec![];
             reader.read_to_end_into(start.name(), &mut buf)?;
         }
-        let tag_name = String::from_utf8_lossy(start.local_name().as_ref()).to_string();
+        let (ns, tag_name) = reader.resolver().resolve_element(start.name());
-        Ok(Self(tag_name))
+        let ns: Option<NamespaceOwned> = match ns {
+            ResolveResult::Bound(ns) => Some(ns.into()),
+            ResolveResult::Unbound | ResolveResult::Unknown(_) => None,
+        };
+        let tag_name = String::from_utf8_lossy(tag_name.as_ref()).to_string();
+        Ok(Self(ns, tag_name))
     }
 }

src/app.rs

@@ -9,7 +9,7 @@ use axum_extra::TypedHeader;
 use headers::{HeaderMapExt, UserAgent};
 use http::header::CONNECTION;
 use http::{HeaderValue, StatusCode};
-use rustical_caldav::caldav_router;
+use rustical_caldav::{CalDavConfig, caldav_router};
 use rustical_carddav::carddav_router;
 use rustical_frontend::nextcloud_login::nextcloud_login_router;
 use rustical_frontend::{FrontendConfig, frontend_router};
@@ -45,6 +45,7 @@ pub fn make_app<
     auth_provider: Arc<impl AuthenticationProvider>,
     frontend_config: FrontendConfig,
     oidc_config: Option<OidcConfig>,
+    caldav_config: CalDavConfig,
     nextcloud_login_config: &NextcloudLoginConfig,
     dav_push_enabled: bool,
     session_cookie_samesite_strict: bool,
@@ -54,6 +55,8 @@ pub fn make_app<
     let combined_cal_store =
         Arc::new(CombinedCalendarStore::new(cal_store).with_store(birthday_store));
 
+    let caldav_config = Arc::new(caldav_config);
+
     let mut router = Router::new()
         // endpoint to be used by healthcheck to see if rustical is online
         .route("/ping", axum::routing::get(async || "Pong!"))
@@ -63,6 +66,7 @@ pub fn make_app<
             combined_cal_store.clone(),
             subscription_store.clone(),
             false,
+            caldav_config.clone(),
         ))
         .merge(caldav_router(
             "/caldav-compat",
@@ -70,6 +74,7 @@ pub fn make_app<
             combined_cal_store.clone(),
             subscription_store.clone(),
             true,
+            caldav_config,
         ))
         .route(
             "/.well-known/caldav",

src/commands/mod.rs

@@ -3,6 +3,7 @@ use crate::config::{
     SqliteDataStoreConfig, TracingConfig,
 };
 use clap::Parser;
+use rustical_caldav::CalDavConfig;
 use rustical_frontend::FrontendConfig;
 
 pub mod health;
@@ -15,8 +16,11 @@ pub struct GenConfigArgs {}
 pub fn cmd_gen_config(_args: GenConfigArgs) -> anyhow::Result<()> {
     let config = Config {
         http: HttpConfig::default(),
+        caldav: CalDavConfig::default(),
         data_store: DataStoreConfig::Sqlite(SqliteDataStoreConfig {
             db_url: "/var/lib/rustical/db.sqlite3".to_owned(),
+            run_repairs: true,
+            skip_broken: true,
         }),
         tracing: TracingConfig::default(),
         frontend: FrontendConfig {

src/config.rs

@@ -1,3 +1,4 @@
+use rustical_caldav::CalDavConfig;
 use rustical_frontend::FrontendConfig;
 use rustical_oidc::OidcConfig;
 use serde::{Deserialize, Serialize};
@@ -26,6 +27,10 @@ impl Default for HttpConfig {
 #[serde(deny_unknown_fields)]
 pub struct SqliteDataStoreConfig {
     pub db_url: String,
+    #[serde(default = "default_true")]
+    pub run_repairs: bool,
+    #[serde(default = "default_true")]
+    pub skip_broken: bool,
 }
 
 #[derive(Debug, Deserialize, Serialize)]
@@ -93,4 +98,6 @@ pub struct Config {
     pub dav_push: DavPushConfig,
     #[serde(default)]
     pub nextcloud_login: NextcloudLoginConfig,
+    #[serde(default)]
+    pub caldav: CalDavConfig,
 }

src/integration_tests/caldav/calendar.rs

@@ -8,7 +8,7 @@ use rustical_store::{CalendarMetadata, CalendarStore};
 use rustical_store_sqlite::tests::{TestStoreContext, test_store_context};
 use tower::ServiceExt;
 
-fn mkcalendar_template(
+pub fn mkcalendar_template(
     CalendarMetadata {
         displayname,
         order: _order,

src/integration_tests/caldav/calendar_put.rs

@@ -0,0 +1,77 @@
+use axum::body::Body;
+use headers::{Authorization, HeaderMapExt};
+use http::{Request, StatusCode};
+use rstest::rstest;
+use rustical_store::CalendarMetadata;
+use rustical_store_sqlite::tests::{TestStoreContext, test_store_context};
+use tower::ServiceExt;
+
+use crate::integration_tests::{
+    ResponseExtractString, caldav::calendar::mkcalendar_template, get_app,
+};
+
+#[rstest]
+#[tokio::test]
+async fn test_put_invalid(
+    #[from(test_store_context)]
+    #[future]
+    context: TestStoreContext,
+) {
+    let context = context.await;
+    let app = get_app(context.clone());
+
+    let calendar_meta = CalendarMetadata {
+        displayname: Some("Calendar".to_string()),
+        description: Some("Description".to_string()),
+        color: Some("#00FF00".to_string()),
+        order: 0,
+    };
+    let (principal, cal_id) = ("user", "calendar");
+    let url = format!("/caldav/principal/{principal}/{cal_id}");
+
+    let mut request = Request::builder()
+        .method("MKCALENDAR")
+        .uri(&url)
+        .body(Body::from(mkcalendar_template(&calendar_meta)))
+        .unwrap();
+    request
+        .headers_mut()
+        .typed_insert(Authorization::basic("user", "pass"));
+    let response = app.clone().oneshot(request).await.unwrap();
+    assert_eq!(response.status(), StatusCode::CREATED);
+
+    // Invalid calendar data
+    let ical = r"BEGIN:VCALENDAR
+VERSION:2.0
+PRODID:-//Example Corp.//CalDAV Client//EN
+BEGIN:VEVENT
+UID:20010712T182145Z-123401@example.com
+DTSTAMP:20060712T182145Z
+DTSTART:20060714T170000Z
+RRULE:UNTIL=123
+DTEND:20060715T040000Z
+SUMMARY:Bastille Day Party
+END:VEVENT
+END:VCALENDAR";
+
+    let mut request = Request::builder()
+        .method("PUT")
+        .uri(format!("{url}/qwue23489.ics"))
+        .header("If-None-Match", "*")
+        .header("Content-Type", "text/calendar")
+        .body(Body::from(ical))
+        .unwrap();
+    request
+        .headers_mut()
+        .typed_insert(Authorization::basic("user", "pass"));
+
+    let response = app.clone().oneshot(request).await.unwrap();
+    assert_eq!(response.status(), StatusCode::FORBIDDEN);
+    let body = response.extract_string().await;
+    insta::assert_snapshot!(body, @r#"
+    <?xml version="1.0" encoding="utf-8"?>
+    <error xmlns="DAV:" xmlns:CAL="urn:ietf:params:xml:ns:caldav" xmlns:CARD="urn:ietf:params:xml:ns:carddav" xmlns:CS="http://calendarserver.org/ns/" xmlns:PUSH="https://bitfire.at/webdav-push">
+        <CAL:valid-calendar-data/>
+    </error>
+    "#);
+}

src/integration_tests/caldav/calendar_report.rs

@@ -87,70 +87,79 @@ const REPORT_7_8_3: &str = r#"
    </C:calendar-query>
 "#;
 
-const OUTPUT_7_8_3: &str = r#"
+// Adapted from Example 7.8.3 of RFC 4791
-     <D:response>
+// In the RFC the output is wrong since it returns DTSTART in UTC as local time, e.g.
-       <D:href>http://cal.example.com/bernard/work/abcd2.ics</D:href>
+// DTSTART:20060103T170000
-       <D:propstat>
+// instead of
-         <D:prop>
+// DTSTART:20060103T170000Z
-           <D:getetag>"fffff-abcd2"</D:getetag>
+// In https://datatracker.ietf.org/doc/html/rfc4791#section-9.6.5
-           <C:calendar-data>BEGIN:VCALENDAR
+// it is clearly stated that times with timezone information MUST be returned in UTC.
-   VERSION:2.0
+// Also, the RECURRENCE-ID needs to include the TIMEZONE, which is fixed here by converting it to
-   PRODID:-//Example Corp.//CalDAV Client//EN
+// UTC
-   BEGIN:VEVENT
+const OUTPUT_7_8_3: &str = r#"<?xml version="1.0" encoding="utf-8"?>
-   DTSTAMP:20060206T001121Z
+<multistatus xmlns="DAV:" xmlns:CAL="urn:ietf:params:xml:ns:caldav" xmlns:CARD="urn:ietf:params:xml:ns:carddav" xmlns:CS="http://calendarserver.org/ns/" xmlns:PUSH="https://bitfire.at/webdav-push">
-   DTSTART:20060103T170000
+    <response>
-   DURATION:PT1H
+        <href>/caldav/principal/user/calendar/abcd2.ics</href>
-   RECURRENCE-ID:20060103T170000
+        <propstat>
-   SUMMARY:Event #2
+            <prop>
-   UID:00959BC664CA650E933C892C@example.com
+                <CAL:calendar-data>BEGIN:VCALENDAR
-   END:VEVENT
+VERSION:2.0
-   BEGIN:VEVENT
+PRODID:-//Example Corp.//CalDAV Client//EN
-   DTSTAMP:20060206T001121Z
+BEGIN:VEVENT
-   DTSTART:20060104T190000
+DTSTAMP:20060206T001121Z
-   DURATION:PT1H
+DTSTART:20060103T170000Z
-   RECURRENCE-ID:20060104T170000
+DURATION:PT1H
-   SUMMARY:Event #2 bis
+SUMMARY:Event #2
-   UID:00959BC664CA650E933C892C@example.com
+UID:abcd2
-   END:VEVENT
+RECURRENCE-ID:20060103T170000Z
-   END:VCALENDAR
+END:VEVENT
-   </C:calendar-data>
+BEGIN:VEVENT
-         </D:prop>
+DTSTAMP:20060206T001121Z
-         <D:status>HTTP/1.1 200 OK</D:status>
+DTSTART:20060104T190000Z
-       </D:propstat>
+DURATION:PT1H
-     </D:response>
+RECURRENCE-ID:20060104T170000Z
-     <D:response>
+SUMMARY:Event #2 bis
-       <D:href>http://cal.example.com/bernard/work/abcd3.ics</D:href>
+UID:abcd2
-       <D:propstat>
+END:VEVENT
-         <D:prop>
+END:VCALENDAR
-           <D:getetag>"fffff-abcd3"</D:getetag>
+</CAL:calendar-data>
-           <C:calendar-data>BEGIN:VCALENDAR
+            </prop>
-   VERSION:2.0
+            <status>HTTP/1.1 200 OK</status>
-   PRODID:-//Example Corp.//CalDAV Client//EN
+        </propstat>
-   BEGIN:VEVENT
+    </response>
-   ATTENDEE;PARTSTAT=ACCEPTED;ROLE=CHAIR:mailto:cyrus@example.com
+    <response>
-   ATTENDEE;PARTSTAT=NEEDS-ACTION:mailto:lisa@example.com
+        <href>/caldav/principal/user/calendar/abcd3.ics</href>
-   DTSTAMP:20060206T001220Z
+        <propstat>
-   DTSTART:20060104T150000
+            <prop>
-   DURATION:PT1H
+                <CAL:calendar-data>BEGIN:VCALENDAR
-   LAST-MODIFIED:20060206T001330Z
+VERSION:2.0
-   ORGANIZER:mailto:cyrus@example.com
+PRODID:-//Example Corp.//CalDAV Client//EN
-   SEQUENCE:1
+BEGIN:VEVENT
-   STATUS:TENTATIVE
+ATTENDEE;PARTSTAT=ACCEPTED;ROLE=CHAIR:mailto:cyrus@example.com
-   SUMMARY:Event #3
+ATTENDEE;PARTSTAT=NEEDS-ACTION:mailto:lisa@example.com
-   UID:DC6C50A017428C5216A2F1CD@example.com
+DTSTAMP:20060206T001220Z
-   X-ABC-GUID:E1CX5Dr-0007ym-Hz@example.com
+DTSTART:20060104T150000Z
-   END:VEVENT
+DURATION:PT1H
-   END:VCALENDAR
+LAST-MODIFIED:20060206T001330Z
-   </C:calendar-data>
+ORGANIZER:mailto:cyrus@example.com
-         </D:prop>
+SEQUENCE:1
-         <D:status>HTTP/1.1 200 OK</D:status>
+STATUS:TENTATIVE
-       </D:propstat>
+SUMMARY:Event #3
-"#;
+UID:abcd3
+X-ABC-GUID:E1CX5Dr-0007ym-Hz@example.com
+END:VEVENT
+END:VCALENDAR
+</CAL:calendar-data>
+            </prop>
+            <status>HTTP/1.1 200 OK</status>
+        </propstat>
+    </response>
+</multistatus>"#;
 
 #[rstest]
-#[case(0, ICS_1, REPORT_7_8_1)]
+#[case(0, ICS_1, REPORT_7_8_1, None)]
-#[case(1, ICS_1, REPORT_7_8_2)]
+#[case(1, ICS_1, REPORT_7_8_2, None)]
-#[case(2, ICS_1, REPORT_7_8_3)]
+#[case(2, ICS_1, REPORT_7_8_3, Some(OUTPUT_7_8_3))]
 #[tokio::test]
 async fn test_report(
     #[from(test_store_context)]
@@ -159,6 +168,7 @@ async fn test_report(
     #[case] case: usize,
     #[case] ics: &'static str,
     #[case] report: &'static str,
+    #[case] output: Option<&'static str>,
 ) {
     let context = context.await;
     let app = get_app(context.clone());
@@ -193,4 +203,7 @@ async fn test_report(
     assert_eq!(response.status(), StatusCode::MULTI_STATUS);
     let body = response.extract_string().await;
     insta::assert_snapshot!(format!("{case}_report_body"), body);
+    if let Some(output) = output {
+        similar_asserts::assert_eq!(output, body.replace('\r', ""));
+    }
 }

src/integration_tests/caldav/mod.rs

@@ -9,6 +9,7 @@ use tower::ServiceExt;
 
 mod calendar;
 mod calendar_import;
+mod calendar_put;
 mod calendar_report;
 
 #[rstest]

src/integration_tests/caldav/resources/rfc4791_appb.ics

@@ -55,6 +55,7 @@ SEQUENCE:1
 STATUS:TENTATIVE
 SUMMARY:Event #3
 UID:abcd3
+X-ABC-GUID:E1CX5Dr-0007ym-Hz@example.com
 END:VEVENT
 BEGIN:VTODO
 DTSTAMP:20060205T235335Z

src/integration_tests/caldav/snapshots/rustical__integration_tests__caldav__calendar__get_body.snap

@@ -4,9 +4,10 @@ expression: body
 ---
 BEGIN:VCALENDAR
 VERSION:2.0
+PRODID:RustiCal Export
 CALSCALE:GREGORIAN
-PRODID:RustiCal
 X-WR-CALNAME:Calendar
 X-WR-CALDESC:Description
+X-WR-CALCOLOR:#00FF00
 X-WR-TIMEZONE:US/Eastern
 END:VCALENDAR

src/integration_tests/caldav/snapshots/rustical__integration_tests__caldav__calendar__multiget_body.snap

@@ -8,7 +8,7 @@ expression: body
         <href>/caldav/principal/user/calendar/qwue23489.ics</href>
         <propstat>
             <prop>
-                <getetag>&quot;aea50382a7775bb9742bfec277382e3a260b6066f503b5f5ae34548d7215ee46&quot;</getetag>
+                <getetag>&quot;f781224669f0db2674e9e45a9be2b01774c02136e3fb72792ef217bccf49fafa&quot;</getetag>
             </prop>
             <status>HTTP/1.1 200 OK</status>
         </propstat>

src/integration_tests/caldav/snapshots/rustical__integration_tests__caldav__calendar__propfind_body.snap

@@ -14,9 +14,10 @@ expression: body
 PRODID:-//github.com/lennart-k/vzic-rs//RustiCal Calendar server//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
-TZID:America/New_York
+TZID:US/Eastern
-LAST-MODIFIED:20250723T190331Z
+TZID-ALIAS-OF:America/New_York
-X-LIC-LOCATION:America/New_York
+LAST-MODIFIED:20260124T185655Z
+X-LIC-LOCATION:US/Eastern
 X-PROLEPTIC-TZNAME:LMT
 BEGIN:STANDARD
 TZNAME:EST

src/integration_tests/caldav/snapshots/rustical__integration_tests__caldav__calendar_import__0_get_body.snap

@@ -4,8 +4,8 @@ expression: body
 ---
 BEGIN:VCALENDAR
 VERSION:2.0
+PRODID:RustiCal Export
 CALSCALE:GREGORIAN
-PRODID:RustiCal
 BEGIN:VEVENT
 UID:[UID]
 SUMMARY:One-off Meeting

src/integration_tests/caldav/snapshots/rustical__integration_tests__caldav__calendar_import__1_get_body.snap

@@ -4,8 +4,8 @@ expression: body
 ---
 BEGIN:VCALENDAR
 VERSION:2.0
+PRODID:RustiCal Export
 CALSCALE:GREGORIAN
-PRODID:RustiCal
 BEGIN:VTIMEZONE
 LAST-MODIFIED:20040110T032845Z
 TZID:US/Eastern
@@ -29,7 +29,7 @@ DTSTAMP:20060206T001102Z
 DTSTART;TZID=US/Eastern:20060102T100000
 DURATION:PT1H
 SUMMARY:Event #1
-Description:Go Steelers!
+DESCRIPTION:Go Steelers!
 UID:[UID]
 END:VEVENT
 BEGIN:VEVENT
@@ -60,6 +60,7 @@ SEQUENCE:1
 STATUS:TENTATIVE
 SUMMARY:Event #3
 UID:[UID]
+X-ABC-GUID:[UID]
 END:VEVENT
 BEGIN:VTODO
 DTSTAMP:20060205T235335Z

src/integration_tests/caldav/snapshots/rustical__integration_tests__caldav__calendar_report__0_report_body.snap

@@ -56,7 +56,7 @@ END:VCALENDAR
         <href>/caldav/principal/user/calendar/abcd3.ics</href>
         <propstat>
             <prop>
-                <getetag>&quot;c6a5b1cf6985805686df99e7f2e1cf286567dcb3383fc6fa1b12ce42d3fbc01c&quot;</getetag>
+                <getetag>&quot;a84fd022dfc742bf8f17ac04fca3aad687e9ae724180185e8e0df11e432dae30&quot;</getetag>
                 <CAL:calendar-data>BEGIN:VCALENDAR
 VERSION:2.0
 PRODID:-//Example Corp.//CalDAV Client//EN
@@ -90,6 +90,7 @@ SEQUENCE:1
 STATUS:TENTATIVE
 SUMMARY:Event #3
 UID:abcd3
+X-ABC-GUID:E1CX5Dr-0007ym-Hz@example.com
 END:VEVENT
 END:VCALENDAR
 </CAL:calendar-data>

src/integration_tests/caldav/snapshots/rustical__integration_tests__caldav__calendar_report__1_report_body.snap

@@ -88,6 +88,7 @@ SEQUENCE:1
 STATUS:TENTATIVE
 SUMMARY:Event #3
 UID:abcd3
+X-ABC-GUID:E1CX5Dr-0007ym-Hz@example.com
 END:VEVENT
 END:VCALENDAR
 </CAL:calendar-data>

src/integration_tests/caldav/snapshots/rustical__integration_tests__caldav__calendar_report__2_report_body.snap

@@ -13,19 +13,19 @@ VERSION:2.0
 PRODID:-//Example Corp.//CalDAV Client//EN
 BEGIN:VEVENT
 DTSTAMP:20060206T001121Z
+DTSTART:20060103T170000Z
 DURATION:PT1H
 SUMMARY:Event #2
 UID:abcd2
 RECURRENCE-ID:20060103T170000Z
-DTSTART:20060103T170000Z
 END:VEVENT
 BEGIN:VEVENT
 DTSTAMP:20060206T001121Z
+DTSTART:20060104T190000Z
 DURATION:PT1H
-SUMMARY:Event #2
-UID:abcd2
 RECURRENCE-ID:20060104T170000Z
-DTSTART:20060104T170000Z
+SUMMARY:Event #2 bis
+UID:abcd2
 END:VEVENT
 END:VCALENDAR
 </CAL:calendar-data>
@@ -44,7 +44,7 @@ BEGIN:VEVENT
 ATTENDEE;PARTSTAT=ACCEPTED;ROLE=CHAIR:mailto:cyrus@example.com
 ATTENDEE;PARTSTAT=NEEDS-ACTION:mailto:lisa@example.com
 DTSTAMP:20060206T001220Z
-DTSTART;TZID=US/Eastern:20060104T100000
+DTSTART:20060104T150000Z
 DURATION:PT1H
 LAST-MODIFIED:20060206T001330Z
 ORGANIZER:mailto:cyrus@example.com
@@ -52,6 +52,7 @@ SEQUENCE:1
 STATUS:TENTATIVE
 SUMMARY:Event #3
 UID:abcd3
+X-ABC-GUID:E1CX5Dr-0007ym-Hz@example.com
 END:VEVENT
 END:VCALENDAR
 </CAL:calendar-data>

src/integration_tests/carddav/snapshots/rustical__integration_tests__carddav__addressbook__multiget_body.snap

@@ -8,7 +8,7 @@ expression: body
         <href>/carddav/principal/user/contacts/newcard.vcf</href>
         <propstat>
             <prop>
-                <getetag>&quot;24835b6c11816c864f9edadd4c7c296234c643892afcbbc5fbf5c9b7ac935cf8&quot;</getetag>
+                <getetag>&quot;ea0bf4a2ce7ef84606a4cf9235776dbc11b3e7ce351ddf35f27cbc0088acca7e&quot;</getetag>
                 <CARD:address-data>BEGIN:VCARD
 VERSION:3.0
 FN:Cyrus Daboo

src/integration_tests/mod.rs

@@ -2,6 +2,7 @@ use crate::{app::make_app, config::NextcloudLoginConfig};
 use axum::extract::Request;
 use axum::{body::Body, response::Response};
 use rstest::rstest;
+use rustical_caldav::CalDavConfig;
 use rustical_frontend::FrontendConfig;
 use rustical_store_sqlite::tests::{TestStoreContext, test_store_context};
 use std::sync::Arc;
@@ -26,6 +27,7 @@ pub fn get_app(context: TestStoreContext) -> axum::Router {
             allow_password_login: true,
         },
         None,
+        CalDavConfig::default(),
         &NextcloudLoginConfig { enabled: false },
         false,
         true,

src/main.rs

@@ -34,9 +34,6 @@ mod config;
 pub mod integration_tests;
 mod setup_tracing;
 
-mod migration_0_12;
-use migration_0_12::{validate_address_objects_0_12, validate_calendar_objects_0_12};
-
 #[derive(Parser, Debug)]
 #[command(author, version, about, long_about = None)]
 struct Args {
@@ -70,17 +67,36 @@ async fn get_data_stores(
     Receiver<CollectionOperation>,
 )> {
     Ok(match &config {
-        DataStoreConfig::Sqlite(SqliteDataStoreConfig { db_url }) => {
+        DataStoreConfig::Sqlite(SqliteDataStoreConfig {
+            db_url,
+            run_repairs,
+            skip_broken,
+        }) => {
             let db = create_db_pool(db_url, migrate).await?;
             // Channel to watch for changes (for DAV Push)
             let (send, recv) = tokio::sync::mpsc::channel(1000);
 
-            let addressbook_store = Arc::new(SqliteAddressbookStore::new(db.clone(), send.clone()));
+            let addressbook_store = Arc::new(SqliteAddressbookStore::new(
+                db.clone(),
+                send.clone(),
+                *skip_broken,
+            ));
+            let cal_store = Arc::new(SqliteCalendarStore::new(db.clone(), send, *skip_broken));
+            if *run_repairs {
+                info!("Running repair tasks");
                 addressbook_store.repair_orphans().await?;
-            let cal_store = Arc::new(SqliteCalendarStore::new(db.clone(), send));
+                cal_store.repair_invalid_version_4_0().await?;
                 cal_store.repair_orphans().await?;
+            }
             let subscription_store = Arc::new(SqliteStore::new(db.clone()));
             let principal_store = Arc::new(SqlitePrincipalStore::new(db));
+
+            // Validate all calendar objects
+            for principal in principal_store.get_principals().await? {
+                cal_store.validate_objects(&principal.id).await?;
+                addressbook_store.validate_objects(&principal.id).await?;
+            }
+
             (
                 addressbook_store,
                 cal_store,
@@ -118,12 +134,6 @@ async fn main() -> Result<()> {
             let (addr_store, cal_store, subscription_store, principal_store, update_recv) =
                 get_data_stores(!args.no_migrations, &config.data_store).await?;
 
-            warn!(
-                "Validating calendar data against the next-version ical parser.\nIn the next major release these will be rejected and cause errors.\nIf any errors occur, please open an issue so they can be fixed before the next major release."
-            );
-            validate_calendar_objects_0_12(principal_store.as_ref(), cal_store.as_ref()).await?;
-            validate_address_objects_0_12(principal_store.as_ref(), addr_store.as_ref()).await?;
-
             let mut tasks = vec![];
 
             if config.dav_push.enabled {
@@ -143,6 +153,7 @@ async fn main() -> Result<()> {
                 principal_store.clone(),
                 config.frontend.clone(),
                 config.oidc.clone(),
+                config.caldav,
                 &config.nextcloud_login,
                 config.dav_push.enabled,
                 config.http.session_cookie_samesite_strict,

src/migration_0_12.rs

@@ -1,84 +0,0 @@
-use rustical_store::{AddressbookStore, CalendarStore, auth::AuthenticationProvider};
-use tracing::{error, info};
-
-pub async fn validate_calendar_objects_0_12(
-    principal_store: &impl AuthenticationProvider,
-    cal_store: &impl CalendarStore,
-) -> Result<(), rustical_store::Error> {
-    let mut success = true;
-    for principal in principal_store.get_principals().await? {
-        for calendar in cal_store.get_calendars(&principal.id).await? {
-            for object in cal_store
-                .get_objects(&calendar.principal, &calendar.id)
-                .await?
-            {
-                if let Err(err) =
-                    ical_dev::parser::ical::IcalObjectParser::new(object.get_ics().as_bytes())
-                        .expect_one()
-                {
-                    if ical_dev::parser::ParserError::InvalidVersion == err {
-                        // This is a known issue that might cause a lot of spam in the logs
-                        continue;
-                    }
-                    success = false;
-                    error!(
-                        "An error occured parsing a calendar object: principal={principal}, calendar={calendar}, object_id={object_id}: {err}",
-                        principal = principal.id,
-                        calendar = calendar.id,
-                        object_id = object.get_id()
-                    );
-                    println!("{}", object.get_ics());
-                }
-            }
-        }
-    }
-    if success {
-        info!("Your calendar data seems to be valid in the next major version.");
-    } else {
-        error!(
-            "Not all calendar objects will be successfully parsed in the next major version (v0.12).
-This will not cause issues in this version, but please comment under the tracking issue on GitHub:
-https://github.com/lennart-k/rustical/issues/165"
-        );
-    }
-    Ok(())
-}
-
-pub async fn validate_address_objects_0_12(
-    principal_store: &impl AuthenticationProvider,
-    addr_store: &impl AddressbookStore,
-) -> Result<(), rustical_store::Error> {
-    let mut success = true;
-    for principal in principal_store.get_principals().await? {
-        for addressbook in addr_store.get_addressbooks(&principal.id).await? {
-            for object in addr_store
-                .get_objects(&addressbook.principal, &addressbook.id)
-                .await?
-            {
-                if let Err(err) =
-                    ical_dev::parser::vcard::VcardParser::new(object.get_vcf().as_bytes())
-                        .expect_one()
-                {
-                    success = false;
-                    error!(
-                        "An error occured parsing an address object: principal={principal}, addressbook={addressbook}, object_id={object_id}: {err}",
-                        principal = principal.id,
-                        addressbook = addressbook.id,
-                        object_id = object.get_id()
-                    );
-                    println!("{}", object.get_vcf());
-                }
-            }
-        }
-    }
-    if success {
-        info!("Your addressbook data seems to be valid in the next major version.");
-    } else {
-        error!(
-            "Not all address objects will be successfully parsed in the next major version (v0.12).
-This will not cause issues in this version, but please comment under the tracking issue on GitHub:
-https://github.com/lennart-k/rustical/issues/165"
-        );
-    }
-    Ok(())
-}