version 0.9.12

Fixes #104

.github/workflows/ci.yml

@@ -1,20 +0,0 @@
-name: Rust CI
-on:
-  push:
-    branches: ["main"]
-  pull_request:
-    branches: ["main"]
-
-env:
-  CARGO_TERM_COLOR: always
-
-jobs:
-  build:
-    runs-on: ubuntu-latest
-
-    steps:
-      - uses: actions/checkout@v4
-      - name: Build
-        run: cargo build --verbose
-      - name: Run tests
-        run: cargo test --verbose --workspace

.github/workflows/cicd.yml

@@ -0,0 +1,57 @@
+name: "CICD"
+on: [push, pull_request]
+permissions:
+  contents: read
+  pull-requests: write
+
+env:
+  CARGO_TERM_COLOR: always
+
+jobs:
+  check:
+    name: Check
+    runs-on: ubuntu-latest
+    steps:
+      - run: rustup update
+      - name: Checkout sources
+        uses: actions/checkout@v4
+      - run: cargo check
+
+  test:
+    name: Test Suite
+    runs-on: ubuntu-latest
+    steps:
+      - run: rustup update
+      - name: Checkout sources
+        uses: actions/checkout@v4
+      - run: cargo test --all-features --verbose --workspace
+
+  coverage:
+    name: Test Coverage
+    runs-on: ubuntu-latest
+    steps:
+      - run: rustup update
+      - name: Install tarpaulin
+        run: cargo install cargo-tarpaulin
+
+      - name: Checkout sources
+        uses: actions/checkout@v4
+
+      - name: Run tarpaulin
+        run: cargo tarpaulin --workspace --all-features --exclude xml_derive --coveralls ${{ secrets.COVERALLS_REPO_TOKEN }}
+
+  lints:
+    name: Lints
+    runs-on: ubuntu-latest
+    steps:
+      - run: rustup update
+      - run: rustup component add rustfmt clippy
+
+      - name: Checkout sources
+        uses: actions/checkout@v4
+
+      - name: Run cargo fmt
+        run: cargo fmt --all -- --check
+
+      - name: Run cargo clippy
+        run: cargo clippy -- -D warnings

.sqlx/query-27ac68a4eea40c1cac663cad034028cf6c373354b29e3a5290c18f58101913cd.json

@@ -1,6 +1,6 @@
 {
   "db_name": "SQLite",
-  "query": "SELECT *\n                FROM calendars\n                WHERE principal = ? AND deleted_at IS NOT NULL",
+  "query": "SELECT principal, id, displayname, \"order\", description, color, timezone_id, deleted_at, synctoken, subscription_url, push_topic, comp_event, comp_todo, comp_journal\n                FROM calendars\n                WHERE principal = ? AND deleted_at IS NOT NULL",
   "describe": {
     "columns": [
       {
@@ -14,68 +14,63 @@
         "type_info": "Text"
       },
       {
-        "name": "synctoken",
+        "name": "displayname",
         "ordinal": 2,
-        "type_info": "Integer"
+        "type_info": "Text"
       },
       {
-        "name": "displayname",
+        "name": "order",
         "ordinal": 3,
-        "type_info": "Text"
+        "type_info": "Integer"
       },
       {
         "name": "description",
         "ordinal": 4,
         "type_info": "Text"
       },
-      {
-        "name": "order",
-        "ordinal": 5,
-        "type_info": "Integer"
-      },
       {
         "name": "color",
-        "ordinal": 6,
-        "type_info": "Text"
-      },
-      {
-        "name": "timezone",
-        "ordinal": 7,
+        "ordinal": 5,
         "type_info": "Text"
       },
       {
         "name": "timezone_id",
-        "ordinal": 8,
+        "ordinal": 6,
         "type_info": "Text"
       },
       {
         "name": "deleted_at",
-        "ordinal": 9,
+        "ordinal": 7,
         "type_info": "Datetime"
       },
+      {
+        "name": "synctoken",
+        "ordinal": 8,
+        "type_info": "Integer"
+      },
       {
         "name": "subscription_url",
-        "ordinal": 10,
+        "ordinal": 9,
         "type_info": "Text"
       },
       {
         "name": "push_topic",
-        "ordinal": 11,
+        "ordinal": 10,
         "type_info": "Text"
       },
       {
         "name": "comp_event",
-        "ordinal": 12,
+        "ordinal": 11,
         "type_info": "Bool"
       },
       {
         "name": "comp_todo",
-        "ordinal": 13,
+        "ordinal": 12,
         "type_info": "Bool"
       },
       {
         "name": "comp_journal",
-        "ordinal": 14,
+        "ordinal": 13,
         "type_info": "Bool"
       }
     ],
@@ -85,14 +80,13 @@
     "nullable": [
       false,
       false,
-      false,
-      true,
       true,
       false,
       true,
       true,
       true,
       true,
+      false,
       true,
       false,
       false,
@@ -100,5 +94,5 @@
       false
     ]
   },
-  "hash": "cce62f7829bd688cd8c7928b587bc31f0e50865c214b1df113350bea2c254237"
+  "hash": "27ac68a4eea40c1cac663cad034028cf6c373354b29e3a5290c18f58101913cd"
 }

.sqlx/query-46ae176a06e314492f661c28436d6370883052c854da43475d7ced60cf8326e3.json

@@ -0,0 +1,12 @@
+{
+  "db_name": "SQLite",
+  "query": "UPDATE calendars SET principal = ?, id = ?, displayname = ?, description = ?, \"order\" = ?, color = ?, timezone_id = ?, push_topic = ?, comp_event = ?, comp_todo = ?, comp_journal = ?\n                WHERE (principal, id) = (?, ?)",
+  "describe": {
+    "columns": [],
+    "parameters": {
+      "Right": 13
+    },
+    "nullable": []
+  },
+  "hash": "46ae176a06e314492f661c28436d6370883052c854da43475d7ced60cf8326e3"
+}

.sqlx/query-5132ee8198f155242aa332a10019c48ec334884bcf7841c8aa03fd5eb11351d9.json

@@ -1,12 +0,0 @@
-{
-  "db_name": "SQLite",
-  "query": "INSERT INTO calendars (principal, id, displayname, description, \"order\", color, subscription_url, timezone, timezone_id, push_topic, comp_event, comp_todo, comp_journal)\n                VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)",
-  "describe": {
-    "columns": [],
-    "parameters": {
-      "Right": 13
-    },
-    "nullable": []
-  },
-  "hash": "5132ee8198f155242aa332a10019c48ec334884bcf7841c8aa03fd5eb11351d9"
-}

.sqlx/query-60b940ff493e7c0fcb2ffe8ae97172c6444525ffeec21b194bd7443d11d06113.json

@@ -0,0 +1,12 @@
+{
+  "db_name": "SQLite",
+  "query": "INSERT INTO calendars (principal, id, displayname, description, \"order\", color, subscription_url, timezone_id, push_topic, comp_event, comp_todo, comp_journal)\n                VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)",
+  "describe": {
+    "columns": [],
+    "parameters": {
+      "Right": 12
+    },
+    "nullable": []
+  },
+  "hash": "60b940ff493e7c0fcb2ffe8ae97172c6444525ffeec21b194bd7443d11d06113"
+}

.sqlx/query-bb2fa030f2e7c7afdb38c5c54cb31de5293be332d86cf643977d479999542553.json

@@ -39,43 +39,38 @@
         "type_info": "Text"
       },
       {
-        "name": "timezone",
+        "name": "timezone_id",
         "ordinal": 7,
         "type_info": "Text"
       },
-      {
-        "name": "timezone_id",
-        "ordinal": 8,
-        "type_info": "Text"
-      },
       {
         "name": "deleted_at",
-        "ordinal": 9,
+        "ordinal": 8,
         "type_info": "Datetime"
       },
       {
         "name": "subscription_url",
-        "ordinal": 10,
+        "ordinal": 9,
         "type_info": "Text"
       },
       {
         "name": "push_topic",
-        "ordinal": 11,
+        "ordinal": 10,
         "type_info": "Text"
       },
       {
         "name": "comp_event",
-        "ordinal": 12,
+        "ordinal": 11,
         "type_info": "Bool"
       },
       {
         "name": "comp_todo",
-        "ordinal": 13,
+        "ordinal": 12,
         "type_info": "Bool"
       },
       {
         "name": "comp_journal",
-        "ordinal": 14,
+        "ordinal": 13,
         "type_info": "Bool"
       }
     ],
@@ -93,7 +88,6 @@
       true,
       true,
       true,
-      true,
       false,
       false,
       false,

.sqlx/query-cedfb82b38fdd0c7681b9873b1008abee4a2f4ca16abad1b837f256d0bf416b1.json

@@ -39,43 +39,38 @@
         "type_info": "Text"
       },
       {
-        "name": "timezone",
+        "name": "timezone_id",
         "ordinal": 7,
         "type_info": "Text"
       },
-      {
-        "name": "timezone_id",
-        "ordinal": 8,
-        "type_info": "Text"
-      },
       {
         "name": "deleted_at",
-        "ordinal": 9,
+        "ordinal": 8,
         "type_info": "Datetime"
       },
       {
         "name": "subscription_url",
-        "ordinal": 10,
+        "ordinal": 9,
         "type_info": "Text"
       },
       {
         "name": "push_topic",
-        "ordinal": 11,
+        "ordinal": 10,
         "type_info": "Text"
       },
       {
         "name": "comp_event",
-        "ordinal": 12,
+        "ordinal": 11,
         "type_info": "Bool"
       },
       {
         "name": "comp_todo",
-        "ordinal": 13,
+        "ordinal": 12,
         "type_info": "Bool"
       },
       {
         "name": "comp_journal",
-        "ordinal": 14,
+        "ordinal": 13,
         "type_info": "Bool"
       }
     ],
@@ -93,7 +88,6 @@
       true,
       true,
       true,
-      true,
       false,
       false,
       false,

.sqlx/query-d65c9c40606e59dd816a51b9b9ac60fd2ff81aaa358fcc038134e9a68ba45ad7.json

@@ -1,12 +0,0 @@
-{
-  "db_name": "SQLite",
-  "query": "UPDATE calendars SET principal = ?, id = ?, displayname = ?, description = ?, \"order\" = ?, color = ?, timezone = ?, timezone_id = ?, push_topic = ?, comp_event = ?, comp_todo = ?, comp_journal = ?\n                WHERE (principal, id) = (?, ?)",
-  "describe": {
-    "columns": [],
-    "parameters": {
-      "Right": 14
-    },
-    "nullable": []
-  },
-  "hash": "d65c9c40606e59dd816a51b9b9ac60fd2ff81aaa358fcc038134e9a68ba45ad7"
-}

Cargo.toml

@@ -2,9 +2,10 @@
 members = ["crates/*"]
 
 [workspace.package]
-version = "0.7.0"
+version = "0.9.12"
 edition = "2024"
 description = "A CalDAV server"
+documentation = "https://lennart-k.github.io/rustical/"
 repository = "https://github.com/lennart-k/rustical"
 license = "AGPL-3.0-or-later"
 
@@ -16,7 +17,7 @@ description.workspace = true
 repository.workspace = true
 license.workspace = true
 resolver = "2"
-publish = false
+publish = true
 
 [features]
 debug = ["opentelemetry"]
@@ -48,7 +49,7 @@ rand_core = { version = "0.9", features = ["std"] }
 chrono = { version = "0.4", features = ["serde"] }
 regex = "1.10"
 lazy_static = "1.5"
-rstest = "0.25"
+rstest = "0.26"
 rstest_reuse = "0.7"
 sha2 = "0.10"
 tokio = { version = "1", features = [
@@ -61,7 +62,7 @@ tokio = { version = "1", features = [
 url = "2.5"
 base64 = "0.22"
 thiserror = "2.0"
-quick-xml = { version = "0.37" }
+quick-xml = { version = "0.38" }
 rust-embed = "8.5"
 tower-sessions = "0.14"
 futures-core = "0.3.31"
@@ -95,7 +96,11 @@ strum = "0.27"
 strum_macros = "0.27"
 serde_json = { version = "1.0", features = ["raw_value"] }
 sqlx-sqlite = { version = "0.8", features = ["bundled"] }
-ical = { version = "0.11", features = ["generator", "serde"] }
+ical = { git = "https://github.com/lennart-k/ical-rs", features = [
+  "generator",
+  "serde",
+  "chrono-tz",
+] }
 toml = "0.9"
 tower = "0.5"
 tower-http = { version = "0.6", features = [
@@ -135,7 +140,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 = "f0591d13" }
-vtimezones-rs = "0.1"
+vtimezones-rs = "0.2"
 ece = { version = "2.3", default-features = false, features = [
   "backend-openssl",
 ] }
@@ -159,15 +164,15 @@ async-trait = { workspace = true }
 uuid.workspace = true
 axum.workspace = true
 
-opentelemetry = { version = "0.30", optional = true }
-opentelemetry-otlp = { version = "0.30", optional = true, features = [
+opentelemetry = { version = "0.31", optional = true }
+opentelemetry-otlp = { version = "0.31", optional = true, features = [
   "grpc-tonic",
 ] }
-opentelemetry_sdk = { version = "0.30", features = [
+opentelemetry_sdk = { version = "0.31", features = [
   "rt-tokio",
 ], optional = true }
-opentelemetry-semantic-conventions = { version = "0.30", optional = true }
-tracing-opentelemetry = { version = "0.31", optional = true }
+opentelemetry-semantic-conventions = { version = "0.31", optional = true }
+tracing-opentelemetry = { version = "0.32", optional = true }
 tracing-subscriber = { version = "0.3", features = [
   "env-filter",
   "fmt",

Dockerfile

@@ -1,4 +1,4 @@
-FROM --platform=$BUILDPLATFORM rust:1.88-alpine AS chef
+FROM --platform=$BUILDPLATFORM rust:1.90-alpine AS chef
 
 ARG TARGETPLATFORM
 ARG BUILDPLATFORM
@@ -45,4 +45,5 @@ CMD ["/usr/local/bin/rustical"]
 ENV RUSTICAL_DATA_STORE__SQLITE__DB_URL=/var/lib/rustical/db.sqlite3
 
 LABEL org.opencontainers.image.authors="Lennart K github.com/lennart-k"
+LABEL org.opencontainers.image.licenses="AGPL-3.0-or-later"
 EXPOSE 4000

Justfile

@@ -12,3 +12,6 @@ docs:
 
 docs-dev:
   mkdocs serve
+
+coverage:
+  cargo tarpaulin --workspace --exclude xml_derive

README.md

@@ -4,14 +4,15 @@ a CalDAV/CardDAV server
 
 > [!WARNING]
   RustiCal is under **active development**!
-  While I've been successfully using RustiCal productively for a few weeks now,
+  While I've been successfully using RustiCal productively for some months now and there seems to be a growing user base,
   you'd still be one of the first testers so expect bugs and rough edges.
-  If you still want to play around with it in its current state, absolutely feel free to do so and to open up an issue if something is not working. :)
+  If you still want to use it in its current state, absolutely feel free to do so and to open up an issue if something is not working. :)
 
 ## Features
 
 - easy to backup, everything saved in one SQLite database
   - also export feature in the frontend
+- Import your existing calendars in the frontend
 - **[WebDAV Push](https://github.com/bitfireAT/webdav-push/)** support, so near-instant synchronisation to DAVx5
 - lightweight (the container image contains only one binary)
 - adequately fast (I'd love to say blazingly fast™ :fire: but I don't have any benchmarks)

about.toml

@@ -7,6 +7,7 @@ accepted = [
   "CDLA-Permissive-2.0",
   "Zlib",
   "AGPL-3.0",
+  "GPL-3.0",
   "MPL-2.0",
 ]
 workarounds = ["ring", "chrono", "rustls"]

crates/caldav/Cargo.toml

@@ -11,6 +11,7 @@ publish = false
 rustical_store_sqlite = { workspace = true, features = ["test"] }
 rstest.workspace = true
 async-std.workspace = true
+serde_json.workspace = true
 
 [dependencies]
 axum.workspace = true

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

@@ -8,7 +8,7 @@ use http::{HeaderValue, Method, StatusCode, header};
 use ical::generator::{Emitter, IcalCalendarBuilder};
 use ical::property::Property;
 use percent_encoding::{CONTROLS, utf8_percent_encode};
-use rustical_ical::{CalendarObjectComponent, EventObject, JournalObject, TodoObject};
+use rustical_ical::{CalendarObjectComponent, EventObject};
 use rustical_store::{CalendarStore, SubscriptionStore, auth::Principal};
 use std::collections::HashMap;
 use std::str::FromStr;
@@ -32,58 +32,76 @@ pub async fn route_get<C: CalendarStore, S: SubscriptionStore>(
         return Err(crate::Error::Unauthorized);
     }
 
-    let calendar = cal_store
-        .get_calendar(&principal, &calendar_id, true)
-        .await?;
-
     let mut timezones = HashMap::new();
+    let mut vtimezones = HashMap::new();
     let objects = cal_store.get_objects(&principal, &calendar_id).await?;
 
     let mut ical_calendar_builder = IcalCalendarBuilder::version("4.0")
         .gregorian()
         .prodid("RustiCal");
-    if calendar.displayname.is_some() {
+    if let Some(displayname) = calendar.meta.displayname {
         ical_calendar_builder = ical_calendar_builder.set(Property {
             name: "X-WR-CALNAME".to_owned(),
-            value: calendar.displayname,
+            value: Some(displayname),
             params: None,
         });
     }
-    if calendar.description.is_some() {
+    if let Some(description) = calendar.meta.description {
         ical_calendar_builder = ical_calendar_builder.set(Property {
             name: "X-WR-CALDESC".to_owned(),
-            value: calendar.description,
+            value: Some(description),
             params: None,
         });
     }
-    if calendar.timezone_id.is_some() {
+    if let Some(timezone_id) = calendar.timezone_id {
         ical_calendar_builder = ical_calendar_builder.set(Property {
             name: "X-WR-TIMEZONE".to_owned(),
-            value: calendar.timezone_id,
+            value: Some(timezone_id),
             params: None,
         });
     }
-    let mut ical_calendar = ical_calendar_builder.build();
 
     for object in &objects {
+        vtimezones.extend(object.get_vtimezones());
         match object.get_data() {
-            CalendarObjectComponent::Event(EventObject {
-                event,
-                timezones: object_timezones,
-                ..
-            }) => {
+            CalendarObjectComponent::Event(
+                EventObject {
+                    event,
+                    timezones: object_timezones,
+                    ..
+                },
+                overrides,
+            ) => {
                 timezones.extend(object_timezones);
-                ical_calendar.events.push(event.clone());
+                ical_calendar_builder = ical_calendar_builder.add_event(event.clone());
+                for _override in overrides {
+                    ical_calendar_builder =
+                        ical_calendar_builder.add_event(_override.event.clone());
+                }
             }
-            CalendarObjectComponent::Todo(TodoObject { todo, .. }) => {
-                ical_calendar.todos.push(todo.clone());
+            CalendarObjectComponent::Todo(todo, overrides) => {
+                ical_calendar_builder = ical_calendar_builder.add_todo(todo.clone());
+                for _override in overrides {
+                    ical_calendar_builder = ical_calendar_builder.add_todo(_override.clone());
+                }
             }
-            CalendarObjectComponent::Journal(JournalObject { journal, .. }) => {
-                ical_calendar.journals.push(journal.clone());
+            CalendarObjectComponent::Journal(journal, overrides) => {
+                ical_calendar_builder = ical_calendar_builder.add_journal(journal.clone());
+                for _override in overrides {
+                    ical_calendar_builder = ical_calendar_builder.add_journal(_override.clone());
+                }
             }
         }
     }
 
+    for vtimezone in vtimezones.into_values() {
+        ical_calendar_builder = ical_calendar_builder.add_tz(vtimezone.to_owned());
+    }
+
+    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();
     hdrs.typed_insert(ContentType::from_str("text/calendar").unwrap());

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

@@ -0,0 +1,110 @@
+use crate::Error;
+use crate::calendar::CalendarResourceService;
+use axum::{
+    extract::{Path, State},
+    response::{IntoResponse, Response},
+};
+use http::StatusCode;
+use ical::{
+    generator::Emitter,
+    parser::{Component, ComponentMut},
+};
+use rustical_dav::header::Overwrite;
+use rustical_ical::{CalendarObject, CalendarObjectType};
+use rustical_store::{
+    Calendar, CalendarMetadata, CalendarStore, SubscriptionStore, auth::Principal,
+};
+use std::io::BufReader;
+use tracing::instrument;
+
+#[instrument(skip(resource_service))]
+pub async fn route_import<C: CalendarStore, S: SubscriptionStore>(
+    Path((principal, cal_id)): Path<(String, String)>,
+    user: Principal,
+    State(resource_service): State<CalendarResourceService<C, S>>,
+    Overwrite(overwrite): Overwrite,
+    body: String,
+) -> Result<Response, Error> {
+    if !user.is_principal(&principal) {
+        return Err(Error::Unauthorized);
+    }
+
+    let mut parser = ical::IcalParser::new(BufReader::new(body.as_bytes()));
+    let mut cal = parser
+        .next()
+        .expect("input must contain calendar")
+        .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
+        .get_property("X-WR-CALNAME")
+        .and_then(|prop| prop.value.to_owned());
+    let description = cal
+        .get_property("X-WR-CALDESC")
+        .and_then(|prop| prop.value.to_owned());
+    let timezone_id = cal
+        .get_property("X-WR-TIMEZONE")
+        .and_then(|prop| prop.value.to_owned());
+    // 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-TIMEZONE");
+    let cal = cal.verify().unwrap();
+    // Make sure timezone is valid
+    if let Some(timezone_id) = timezone_id.as_ref() {
+        assert!(
+            vtimezones_rs::VTIMEZONES.contains_key(timezone_id),
+            "Invalid calendar timezone id"
+        );
+    }
+
+    // Extract necessary component types
+    let mut cal_components = vec![];
+    if !cal.events.is_empty() {
+        cal_components.push(CalendarObjectType::Event);
+    }
+    if !cal.journals.is_empty() {
+        cal_components.push(CalendarObjectType::Journal);
+    }
+    if !cal.todos.is_empty() {
+        cal_components.push(CalendarObjectType::Todo);
+    }
+
+    let expanded_cals = cal.expand_calendar();
+    // Janky way to convert between IcalCalendar and CalendarObject
+    let objects = expanded_cals
+        .into_iter()
+        .map(|cal| cal.generate())
+        .map(CalendarObject::from_ics)
+        .collect::<Result<Vec<_>, _>>()?;
+    let new_cal = Calendar {
+        principal,
+        id: cal_id,
+        meta: CalendarMetadata {
+            displayname,
+            order: 0,
+            description,
+            color: None,
+        },
+        timezone_id,
+        deleted_at: None,
+        synctoken: 0,
+        subscription_url: None,
+        push_topic: uuid::Uuid::new_v4().to_string(),
+        components: cal_components,
+    };
+
+    let cal_store = resource_service.cal_store;
+    cal_store
+        .import_calendar(new_cal, objects, overwrite)
+        .await?;
+
+    Ok(StatusCode::OK.into_response())
+}

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

@@ -4,10 +4,11 @@ use crate::calendar::prop::SupportedCalendarComponentSet;
 use axum::extract::{Path, State};
 use axum::response::{IntoResponse, Response};
 use http::{Method, StatusCode};
+use ical::IcalParser;
 use rustical_dav::xml::HrefElement;
 use rustical_ical::CalendarObjectType;
 use rustical_store::auth::Principal;
-use rustical_store::{Calendar, CalendarStore, SubscriptionStore};
+use rustical_store::{Calendar, CalendarMetadata, CalendarStore, SubscriptionStore};
 use rustical_xml::{Unparsed, XmlDeserialize, XmlDocument, XmlRootTag};
 use tracing::instrument;
 
@@ -45,7 +46,7 @@ pub struct PropElement {
 }
 
 #[derive(XmlDeserialize, XmlRootTag, Clone, Debug)]
-#[xml(root = b"mkcalendar")]
+#[xml(root = "mkcalendar")]
 #[xml(ns = "rustical_dav::namespace::NS_CALDAV")]
 struct MkcalendarRequest {
     #[xml(ns = "rustical_dav::namespace::NS_DAV")]
@@ -53,7 +54,7 @@ struct MkcalendarRequest {
 }
 
 #[derive(XmlDeserialize, XmlRootTag, Clone, Debug)]
-#[xml(root = b"mkcol")]
+#[xml(root = "mkcol")]
 #[xml(ns = "rustical_dav::namespace::NS_DAV")]
 struct MkcolRequest {
     #[xml(ns = "rustical_dav::namespace::NS_DAV")]
@@ -82,28 +83,42 @@ pub async fn route_mkcalendar<C: CalendarStore, S: SubscriptionStore>(
         request.displayname = None
     }
 
-    let mut timezone = request.calendar_timezone;
-    if let Some(tzid) = request.calendar_timezone_id.as_ref() {
-        // Validate timezone id and set timezone accordingly
-        timezone = Some(
-            vtimezones_rs::VTIMEZONES
-                .get(tzid)
-                .ok_or(rustical_dav::Error::BadRequest(format!(
-                    "Invalid timezone-id: {tzid}"
-                )))?
-                .to_string(),
-        );
-    }
+    let timezone_id = if let Some(tzid) = request.calendar_timezone_id {
+        Some(tzid)
+    } else if let Some(tz) = request.calendar_timezone {
+        // TODO: Proper error (calendar-timezone precondition)
+        let calendar = IcalParser::new(tz.as_bytes())
+            .next()
+            .ok_or(rustical_dav::Error::BadRequest(
+                "No timezone data provided".to_owned(),
+            ))?
+            .map_err(|_| rustical_dav::Error::BadRequest("No timezone data provided".to_owned()))?;
+
+        let timezone = calendar
+            .timezones
+            .first()
+            .ok_or(rustical_dav::Error::BadRequest(
+                "No timezone data provided".to_owned(),
+            ))?;
+        let timezone: chrono_tz::Tz = timezone
+            .try_into()
+            .map_err(|_| rustical_dav::Error::BadRequest("No timezone data provided".to_owned()))?;
+
+        Some(timezone.name().to_owned())
+    } else {
+        None
+    };
 
     let calendar = Calendar {
         id: cal_id.to_owned(),
         principal: principal.to_owned(),
-        order: request.calendar_order.unwrap_or(0),
-        displayname: request.displayname,
-        timezone,
-        timezone_id: request.calendar_timezone_id,
-        color: request.calendar_color,
-        description: request.calendar_description,
+        meta: CalendarMetadata {
+            order: request.calendar_order.unwrap_or(0),
+            displayname: request.displayname,
+            color: request.calendar_color,
+            description: request.calendar_description,
+        },
+        timezone_id,
         deleted_at: None,
         synctoken: 0,
         subscription_url: request.source.map(|href| href.href),

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

@@ -1,4 +1,5 @@
 pub mod get;
+pub mod import;
 pub mod mkcalendar;
 pub mod post;
 pub mod report;

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

@@ -1,310 +0,0 @@
-use crate::{Error, calendar_object::CalendarObjectPropWrapperName};
-use rustical_dav::xml::PropfindType;
-use rustical_ical::{CalendarObject, UtcDateTime};
-use rustical_store::{CalendarStore, calendar_store::CalendarQuery};
-use rustical_xml::XmlDeserialize;
-use std::ops::Deref;
-
-#[derive(XmlDeserialize, Clone, Debug, PartialEq)]
-#[allow(dead_code)]
-pub(crate) struct TimeRangeElement {
-    #[xml(ty = "attr")]
-    pub(crate) start: Option<UtcDateTime>,
-    #[xml(ty = "attr")]
-    pub(crate) end: Option<UtcDateTime>,
-}
-
-#[derive(XmlDeserialize, Clone, Debug, PartialEq)]
-#[allow(dead_code)]
-// https://www.rfc-editor.org/rfc/rfc4791#section-9.7.3
-struct ParamFilterElement {
-    #[xml(ns = "rustical_dav::namespace::NS_CALDAV")]
-    is_not_defined: Option<()>,
-    #[xml(ns = "rustical_dav::namespace::NS_CALDAV")]
-    text_match: Option<TextMatchElement>,
-
-    #[xml(ty = "attr")]
-    name: String,
-}
-
-#[derive(XmlDeserialize, Clone, Debug, PartialEq)]
-#[allow(dead_code)]
-struct TextMatchElement {
-    #[xml(ty = "attr")]
-    collation: String,
-    #[xml(ty = "attr")]
-    // "yes" or "no", default: "no"
-    negate_condition: Option<String>,
-}
-
-#[derive(XmlDeserialize, Clone, Debug, PartialEq)]
-#[allow(dead_code)]
-// https://www.rfc-editor.org/rfc/rfc4791#section-9.7.2
-pub(crate) struct PropFilterElement {
-    #[xml(ns = "rustical_dav::namespace::NS_CALDAV")]
-    is_not_defined: Option<()>,
-    #[xml(ns = "rustical_dav::namespace::NS_CALDAV")]
-    time_range: Option<TimeRangeElement>,
-    #[xml(ns = "rustical_dav::namespace::NS_CALDAV")]
-    text_match: Option<TextMatchElement>,
-    #[xml(ns = "rustical_dav::namespace::NS_CALDAV", flatten)]
-    param_filter: Vec<ParamFilterElement>,
-
-    #[xml(ty = "attr")]
-    name: String,
-}
-
-#[derive(XmlDeserialize, Clone, Debug, PartialEq)]
-#[allow(dead_code)]
-// https://datatracker.ietf.org/doc/html/rfc4791#section-9.7.1
-pub(crate) struct CompFilterElement {
-    #[xml(ns = "rustical_dav::namespace::NS_CALDAV")]
-    pub(crate) is_not_defined: Option<()>,
-    #[xml(ns = "rustical_dav::namespace::NS_CALDAV")]
-    pub(crate) time_range: Option<TimeRangeElement>,
-    #[xml(ns = "rustical_dav::namespace::NS_CALDAV", flatten)]
-    pub(crate) prop_filter: Vec<PropFilterElement>,
-    #[xml(ns = "rustical_dav::namespace::NS_CALDAV", flatten)]
-    pub(crate) comp_filter: Vec<CompFilterElement>,
-
-    #[xml(ty = "attr")]
-    pub(crate) name: String,
-}
-
-impl CompFilterElement {
-    // match the VCALENDAR part
-    pub fn matches_root(&self, cal_object: &CalendarObject) -> bool {
-        let comp_vcal = self.name == "VCALENDAR";
-        match (self.is_not_defined, comp_vcal) {
-            // Client wants VCALENDAR to not exist but we are a VCALENDAR
-            (Some(()), true) => return false,
-            // Client is asking for something different than a vcalendar
-            (None, false) => return false,
-            _ => {}
-        };
-
-        if self.time_range.is_some() {
-            // <time-range> should be applied on VEVENT/VTODO but not on VCALENDAR
-            return false;
-        }
-
-        // TODO: Implement prop-filter at some point
-
-        // Apply sub-comp-filters on VEVENT/VTODO/VJOURNAL component
-        if self
-            .comp_filter
-            .iter()
-            .all(|filter| filter.matches(cal_object))
-        {
-            return true;
-        }
-
-        false
-    }
-
-    // match the VEVENT/VTODO/VJOURNAL part
-    pub fn matches(&self, cal_object: &CalendarObject) -> bool {
-        let comp_name_matches = self.name == cal_object.get_component_name();
-        match (self.is_not_defined, comp_name_matches) {
-            // Client wants VCALENDAR to not exist but we are a VCALENDAR
-            (Some(()), true) => return false,
-            // Client is asking for something different than a vcalendar
-            (None, false) => return false,
-            _ => {}
-        };
-
-        // TODO: Implement prop-filter (and comp-filter?) at some point
-
-        if let Some(time_range) = &self.time_range {
-            if let Some(start) = &time_range.start {
-                if let Some(last_occurence) = cal_object.get_last_occurence().unwrap_or(None) {
-                    if start.deref() > &last_occurence.utc() {
-                        return false;
-                    }
-                };
-            }
-            if let Some(end) = &time_range.end {
-                if let Some(first_occurence) = cal_object.get_first_occurence().unwrap_or(None) {
-                    if end.deref() < &first_occurence.utc() {
-                        return false;
-                    }
-                };
-            }
-        }
-        true
-    }
-}
-
-#[derive(XmlDeserialize, Clone, Debug, PartialEq)]
-#[allow(dead_code)]
-// https://datatracker.ietf.org/doc/html/rfc4791#section-9.7
-pub(crate) struct FilterElement {
-    // This comp-filter matches on VCALENDAR
-    #[xml(ns = "rustical_dav::namespace::NS_CALDAV")]
-    pub(crate) comp_filter: CompFilterElement,
-}
-
-impl FilterElement {
-    pub fn matches(&self, cal_object: &CalendarObject) -> bool {
-        self.comp_filter.matches_root(cal_object)
-    }
-}
-
-impl From<&FilterElement> for CalendarQuery {
-    fn from(value: &FilterElement) -> Self {
-        let comp_filter_vcalendar = &value.comp_filter;
-        for comp_filter in comp_filter_vcalendar.comp_filter.iter() {
-            // A calendar object cannot contain both VEVENT and VTODO, so we only have to handle
-            // whatever we get first
-            if matches!(comp_filter.name.as_str(), "VEVENT" | "VTODO") {
-                if let Some(time_range) = &comp_filter.time_range {
-                    let start = time_range.start.as_ref().map(|start| start.date_naive());
-                    let end = time_range.end.as_ref().map(|end| end.date_naive());
-                    return CalendarQuery {
-                        time_start: start,
-                        time_end: end,
-                    };
-                }
-            }
-        }
-        Default::default()
-    }
-}
-
-#[derive(XmlDeserialize, Clone, Debug, PartialEq)]
-#[allow(dead_code)]
-// <!ELEMENT calendar-query ((DAV:allprop | DAV:propname | DAV:prop)?, filter, timezone?)>
-pub struct CalendarQueryRequest {
-    #[xml(ty = "untagged")]
-    pub prop: PropfindType<CalendarObjectPropWrapperName>,
-    #[xml(ns = "rustical_dav::namespace::NS_CALDAV")]
-    pub(crate) filter: Option<FilterElement>,
-    #[xml(ns = "rustical_dav::namespace::NS_CALDAV")]
-    pub(crate) timezone: Option<String>,
-    #[xml(ns = "rustical_dav::namespace::NS_CALDAV")]
-    pub(crate) timezone_id: Option<String>,
-}
-
-impl From<&CalendarQueryRequest> for CalendarQuery {
-    fn from(value: &CalendarQueryRequest) -> Self {
-        value
-            .filter
-            .as_ref()
-            .map(CalendarQuery::from)
-            .unwrap_or_default()
-    }
-}
-
-pub async fn get_objects_calendar_query<C: CalendarStore>(
-    cal_query: &CalendarQueryRequest,
-    principal: &str,
-    cal_id: &str,
-    store: &C,
-) -> Result<Vec<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));
-    }
-    Ok(objects)
-}
-
-#[cfg(test)]
-mod tests {
-    use rustical_dav::xml::PropElement;
-    use rustical_xml::XmlDocument;
-
-    use crate::{
-        calendar::methods::report::{
-            ReportRequest,
-            calendar_query::{
-                CalendarQueryRequest, CompFilterElement, FilterElement, ParamFilterElement,
-                PropFilterElement, TextMatchElement,
-            },
-        },
-        calendar_object::{CalendarObjectPropName, CalendarObjectPropWrapperName},
-    };
-
-    #[test]
-    fn calendar_query_7_8_7() {
-        const INPUT: &str = r#"
-            <?xml version="1.0" encoding="utf-8" ?>
-            <C:calendar-query xmlns:C="urn:ietf:params:xml:ns:caldav">
-                <D:prop xmlns:D="DAV:">
-                    <D:getetag/>
-                    <C:calendar-data/>
-                </D:prop>
-                <C:filter>
-                <C:comp-filter name="VCALENDAR">
-                    <C:comp-filter name="VEVENT">
-                        <C:prop-filter name="ATTENDEE">
-                            <C:text-match collation="i;ascii-casemap">mailto:lisa@example.com</C:text-match>
-                            <C:param-filter name="PARTSTAT">
-                                <C:text-match collation="i;ascii-casemap">NEEDS-ACTION</C:text-match>
-                            </C:param-filter>
-                        </C:prop-filter>
-                    </C:comp-filter>
-                </C:comp-filter>
-                </C:filter>
-            </C:calendar-query>
-        "#;
-
-        let report = ReportRequest::parse_str(INPUT).unwrap();
-        let calendar_query: CalendarQueryRequest =
-            if let ReportRequest::CalendarQuery(query) = report {
-                query
-            } else {
-                panic!()
-            };
-        assert_eq!(
-            calendar_query,
-            CalendarQueryRequest {
-                prop: rustical_dav::xml::PropfindType::Prop(PropElement(
-                    vec![
-                        CalendarObjectPropWrapperName::CalendarObject(
-                            CalendarObjectPropName::Getetag,
-                        ),
-                        CalendarObjectPropWrapperName::CalendarObject(
-                            CalendarObjectPropName::CalendarData(Default::default())
-                        ),
-                    ],
-                    vec![]
-                )),
-                filter: Some(FilterElement {
-                    comp_filter: CompFilterElement {
-                        is_not_defined: None,
-                        time_range: None,
-                        prop_filter: vec![],
-                        comp_filter: vec![CompFilterElement {
-                            prop_filter: vec![PropFilterElement {
-                                name: "ATTENDEE".to_owned(),
-                                text_match: Some(TextMatchElement {
-                                    collation: "i;ascii-casemap".to_owned(),
-                                    negate_condition: None
-                                }),
-                                is_not_defined: None,
-                                param_filter: vec![ParamFilterElement {
-                                    is_not_defined: None,
-                                    name: "PARTSTAT".to_owned(),
-                                    text_match: Some(TextMatchElement {
-                                        collation: "i;ascii-casemap".to_owned(),
-                                        negate_condition: None
-                                    }),
-                                }],
-                                time_range: None
-                            }],
-                            comp_filter: vec![],
-                            is_not_defined: None,
-                            name: "VEVENT".to_owned(),
-                            time_range: None
-                        }],
-                        name: "VCALENDAR".to_owned()
-                    }
-                }),
-                timezone: None,
-                timezone_id: None
-            }
-        )
-    }
-}

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

@@ -0,0 +1,194 @@
+use crate::calendar_object::CalendarObjectPropWrapperName;
+use rustical_dav::xml::PropfindType;
+use rustical_ical::{CalendarObject, UtcDateTime};
+use rustical_store::calendar_store::CalendarQuery;
+use rustical_xml::XmlDeserialize;
+use std::ops::Deref;
+
+#[derive(XmlDeserialize, Clone, Debug, PartialEq)]
+#[allow(dead_code)]
+pub(crate) struct TimeRangeElement {
+    #[xml(ty = "attr")]
+    pub(crate) start: Option<UtcDateTime>,
+    #[xml(ty = "attr")]
+    pub(crate) end: Option<UtcDateTime>,
+}
+
+#[derive(XmlDeserialize, Clone, Debug, PartialEq)]
+#[allow(dead_code)]
+// https://www.rfc-editor.org/rfc/rfc4791#section-9.7.3
+pub struct ParamFilterElement {
+    #[xml(ns = "rustical_dav::namespace::NS_CALDAV")]
+    pub(crate) is_not_defined: Option<()>,
+    #[xml(ns = "rustical_dav::namespace::NS_CALDAV")]
+    pub(crate) text_match: Option<TextMatchElement>,
+
+    #[xml(ty = "attr")]
+    pub(crate) name: String,
+}
+
+#[derive(XmlDeserialize, Clone, Debug, PartialEq)]
+#[allow(dead_code)]
+pub struct TextMatchElement {
+    #[xml(ty = "attr")]
+    pub(crate) collation: String,
+    #[xml(ty = "attr")]
+    // "yes" or "no", default: "no"
+    pub(crate) negate_condition: Option<String>,
+}
+
+#[derive(XmlDeserialize, Clone, Debug, PartialEq)]
+#[allow(dead_code)]
+// https://www.rfc-editor.org/rfc/rfc4791#section-9.7.2
+pub(crate) struct PropFilterElement {
+    #[xml(ns = "rustical_dav::namespace::NS_CALDAV")]
+    pub(crate) is_not_defined: Option<()>,
+    #[xml(ns = "rustical_dav::namespace::NS_CALDAV")]
+    pub(crate) time_range: Option<TimeRangeElement>,
+    #[xml(ns = "rustical_dav::namespace::NS_CALDAV")]
+    pub(crate) text_match: Option<TextMatchElement>,
+    #[xml(ns = "rustical_dav::namespace::NS_CALDAV", flatten)]
+    pub(crate) param_filter: Vec<ParamFilterElement>,
+
+    #[xml(ty = "attr")]
+    pub(crate) name: String,
+}
+
+#[derive(XmlDeserialize, Clone, Debug, PartialEq)]
+#[allow(dead_code)]
+// https://datatracker.ietf.org/doc/html/rfc4791#section-9.7.1
+pub(crate) struct CompFilterElement {
+    #[xml(ns = "rustical_dav::namespace::NS_CALDAV")]
+    pub(crate) is_not_defined: Option<()>,
+    #[xml(ns = "rustical_dav::namespace::NS_CALDAV")]
+    pub(crate) time_range: Option<TimeRangeElement>,
+    #[xml(ns = "rustical_dav::namespace::NS_CALDAV", flatten)]
+    pub(crate) prop_filter: Vec<PropFilterElement>,
+    #[xml(ns = "rustical_dav::namespace::NS_CALDAV", flatten)]
+    pub(crate) comp_filter: Vec<CompFilterElement>,
+
+    #[xml(ty = "attr")]
+    pub(crate) name: String,
+}
+
+impl CompFilterElement {
+    // match the VCALENDAR part
+    pub fn matches_root(&self, cal_object: &CalendarObject) -> bool {
+        let comp_vcal = self.name == "VCALENDAR";
+        match (self.is_not_defined, comp_vcal) {
+            // Client wants VCALENDAR to not exist but we are a VCALENDAR
+            (Some(()), true) => return false,
+            // Client is asking for something different than a vcalendar
+            (None, false) => return false,
+            _ => {}
+        };
+
+        if self.time_range.is_some() {
+            // <time-range> should be applied on VEVENT/VTODO but not on VCALENDAR
+            return false;
+        }
+
+        // TODO: Implement prop-filter at some point
+
+        // Apply sub-comp-filters on VEVENT/VTODO/VJOURNAL component
+        if self
+            .comp_filter
+            .iter()
+            .all(|filter| filter.matches(cal_object))
+        {
+            return true;
+        }
+
+        false
+    }
+
+    // match the VEVENT/VTODO/VJOURNAL part
+    pub fn matches(&self, cal_object: &CalendarObject) -> bool {
+        let comp_name_matches = self.name == cal_object.get_component_name();
+        match (self.is_not_defined, comp_name_matches) {
+            // Client wants VCALENDAR to not exist but we are a VCALENDAR
+            (Some(()), true) => return false,
+            // Client is asking for something different than a vcalendar
+            (None, false) => return false,
+            _ => {}
+        };
+
+        // TODO: Implement prop-filter (and comp-filter?) at some point
+
+        if let Some(time_range) = &self.time_range {
+            if let Some(start) = &time_range.start
+                && let Some(last_occurence) = cal_object.get_last_occurence().unwrap_or(None)
+                && start.deref() > &last_occurence.utc()
+            {
+                return false;
+            }
+            if let Some(end) = &time_range.end
+                && let Some(first_occurence) = cal_object.get_first_occurence().unwrap_or(None)
+                && end.deref() < &first_occurence.utc()
+            {
+                return false;
+            }
+        }
+        true
+    }
+}
+
+#[derive(XmlDeserialize, Clone, Debug, PartialEq)]
+#[allow(dead_code)]
+// https://datatracker.ietf.org/doc/html/rfc4791#section-9.7
+pub(crate) struct FilterElement {
+    // This comp-filter matches on VCALENDAR
+    #[xml(ns = "rustical_dav::namespace::NS_CALDAV")]
+    pub(crate) comp_filter: CompFilterElement,
+}
+
+impl FilterElement {
+    pub fn matches(&self, cal_object: &CalendarObject) -> bool {
+        self.comp_filter.matches_root(cal_object)
+    }
+}
+
+impl From<&FilterElement> for CalendarQuery {
+    fn from(value: &FilterElement) -> Self {
+        let comp_filter_vcalendar = &value.comp_filter;
+        for comp_filter in comp_filter_vcalendar.comp_filter.iter() {
+            // A calendar object cannot contain both VEVENT and VTODO, so we only have to handle
+            // whatever we get first
+            if matches!(comp_filter.name.as_str(), "VEVENT" | "VTODO")
+                && let Some(time_range) = &comp_filter.time_range
+            {
+                let start = time_range.start.as_ref().map(|start| start.date_naive());
+                let end = time_range.end.as_ref().map(|end| end.date_naive());
+                return CalendarQuery {
+                    time_start: start,
+                    time_end: end,
+                };
+            }
+        }
+        Default::default()
+    }
+}
+
+#[derive(XmlDeserialize, Clone, Debug, PartialEq)]
+#[allow(dead_code)]
+// <!ELEMENT calendar-query ((DAV:allprop | DAV:propname | DAV:prop)?, filter, timezone?)>
+pub struct CalendarQueryRequest {
+    #[xml(ty = "untagged")]
+    pub prop: PropfindType<CalendarObjectPropWrapperName>,
+    #[xml(ns = "rustical_dav::namespace::NS_CALDAV")]
+    pub(crate) filter: Option<FilterElement>,
+    #[xml(ns = "rustical_dav::namespace::NS_CALDAV")]
+    pub(crate) timezone: Option<String>,
+    #[xml(ns = "rustical_dav::namespace::NS_CALDAV")]
+    pub(crate) timezone_id: Option<String>,
+}
+
+impl From<&CalendarQueryRequest> for CalendarQuery {
+    fn from(value: &CalendarQueryRequest) -> Self {
+        value
+            .filter
+            .as_ref()
+            .map(CalendarQuery::from)
+            .unwrap_or_default()
+    }
+}

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

@@ -0,0 +1,120 @@
+use crate::Error;
+use rustical_ical::CalendarObject;
+use rustical_store::CalendarStore;
+
+mod elements;
+pub(crate) use elements::*;
+
+pub async fn get_objects_calendar_query<C: CalendarStore>(
+    cal_query: &CalendarQueryRequest,
+    principal: &str,
+    cal_id: &str,
+    store: &C,
+) -> Result<Vec<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));
+    }
+    Ok(objects)
+}
+
+#[cfg(test)]
+mod tests {
+    use rustical_dav::xml::PropElement;
+    use rustical_xml::XmlDocument;
+
+    use crate::{
+        calendar::methods::report::{
+            ReportRequest,
+            calendar_query::{
+                CalendarQueryRequest, CompFilterElement, FilterElement, ParamFilterElement,
+                PropFilterElement, TextMatchElement,
+            },
+        },
+        calendar_object::{CalendarObjectPropName, CalendarObjectPropWrapperName},
+    };
+
+    #[test]
+    fn calendar_query_7_8_7() {
+        const INPUT: &str = r#"
+            <?xml version="1.0" encoding="utf-8" ?>
+            <C:calendar-query xmlns:C="urn:ietf:params:xml:ns:caldav">
+                <D:prop xmlns:D="DAV:">
+                    <D:getetag/>
+                    <C:calendar-data/>
+                </D:prop>
+                <C:filter>
+                <C:comp-filter name="VCALENDAR">
+                    <C:comp-filter name="VEVENT">
+                        <C:prop-filter name="ATTENDEE">
+                            <C:text-match collation="i;ascii-casemap">mailto:lisa@example.com</C:text-match>
+                            <C:param-filter name="PARTSTAT">
+                                <C:text-match collation="i;ascii-casemap">NEEDS-ACTION</C:text-match>
+                            </C:param-filter>
+                        </C:prop-filter>
+                    </C:comp-filter>
+                </C:comp-filter>
+                </C:filter>
+            </C:calendar-query>
+        "#;
+
+        let report = ReportRequest::parse_str(INPUT).unwrap();
+        let calendar_query: CalendarQueryRequest =
+            if let ReportRequest::CalendarQuery(query) = report {
+                query
+            } else {
+                panic!()
+            };
+        assert_eq!(
+            calendar_query,
+            CalendarQueryRequest {
+                prop: rustical_dav::xml::PropfindType::Prop(PropElement(
+                    vec![
+                        CalendarObjectPropWrapperName::CalendarObject(
+                            CalendarObjectPropName::Getetag,
+                        ),
+                        CalendarObjectPropWrapperName::CalendarObject(
+                            CalendarObjectPropName::CalendarData(Default::default())
+                        ),
+                    ],
+                    vec![]
+                )),
+                filter: Some(FilterElement {
+                    comp_filter: CompFilterElement {
+                        is_not_defined: None,
+                        time_range: None,
+                        prop_filter: vec![],
+                        comp_filter: vec![CompFilterElement {
+                            prop_filter: vec![PropFilterElement {
+                                name: "ATTENDEE".to_owned(),
+                                text_match: Some(TextMatchElement {
+                                    collation: "i;ascii-casemap".to_owned(),
+                                    negate_condition: None
+                                }),
+                                is_not_defined: None,
+                                param_filter: vec![ParamFilterElement {
+                                    is_not_defined: None,
+                                    name: "PARTSTAT".to_owned(),
+                                    text_match: Some(TextMatchElement {
+                                        collation: "i;ascii-casemap".to_owned(),
+                                        negate_condition: None
+                                    }),
+                                }],
+                                time_range: None
+                            }],
+                            comp_filter: vec![],
+                            is_not_defined: None,
+                            name: "VEVENT".to_owned(),
+                            time_range: None
+                        }],
+                        name: "VCALENDAR".to_owned()
+                    }
+                }),
+                timezone: None,
+                timezone_id: None
+            }
+        )
+    }
+}

crates/caldav/src/calendar/mod.rs

@@ -4,3 +4,6 @@ pub mod resource;
 mod service;
 
 pub use service::CalendarResourceService;
+
+#[cfg(test)]
+pub mod tests;

crates/caldav/src/calendar/resource.rs

@@ -3,6 +3,7 @@ use crate::Error;
 use crate::calendar::prop::ReportMethod;
 use chrono::{DateTime, Utc};
 use derive_more::derive::{From, Into};
+use ical::IcalParser;
 use rustical_dav::extensions::{
     CommonPropertiesExtension, CommonPropertiesProp, SyncTokenExtension, SyncTokenExtensionProp,
 };
@@ -15,6 +16,7 @@ use rustical_store::Calendar;
 use rustical_store::auth::Principal;
 use rustical_xml::{EnumVariants, PropName};
 use rustical_xml::{XmlDeserialize, XmlSerialize};
+use serde::Deserialize;
 
 #[derive(XmlDeserialize, XmlSerialize, PartialEq, Clone, EnumVariants, PropName)]
 #[xml(unit_variants_ident = "CalendarPropName")]
@@ -61,7 +63,7 @@ pub enum CalendarPropWrapper {
     Common(CommonPropertiesProp),
 }
 
-#[derive(Clone, Debug, From, Into)]
+#[derive(Clone, Debug, From, Into, Deserialize)]
 pub struct CalendarResource {
     pub cal: Calendar,
     pub read_only: bool,
@@ -126,13 +128,15 @@ impl Resource for CalendarResource {
         Ok(match prop {
             CalendarPropWrapperName::Calendar(prop) => CalendarPropWrapper::Calendar(match prop {
                 CalendarPropName::CalendarColor => {
-                    CalendarProp::CalendarColor(self.cal.color.clone())
+                    CalendarProp::CalendarColor(self.cal.meta.color.clone())
                 }
                 CalendarPropName::CalendarDescription => {
-                    CalendarProp::CalendarDescription(self.cal.description.clone())
+                    CalendarProp::CalendarDescription(self.cal.meta.description.clone())
                 }
                 CalendarPropName::CalendarTimezone => {
-                    CalendarProp::CalendarTimezone(self.cal.timezone.clone())
+                    CalendarProp::CalendarTimezone(self.cal.timezone_id.as_ref().and_then(|tzid| {
+                        vtimezones_rs::VTIMEZONES.get(tzid).map(|tz| tz.to_string())
+                    }))
                 }
                 // chrono_tz uses the IANA database
                 CalendarPropName::TimezoneServiceSet => CalendarProp::TimezoneServiceSet(
@@ -142,7 +146,7 @@ impl Resource for CalendarResource {
                     CalendarProp::CalendarTimezoneId(self.cal.timezone_id.clone())
                 }
                 CalendarPropName::CalendarOrder => {
-                    CalendarProp::CalendarOrder(Some(self.cal.order))
+                    CalendarProp::CalendarOrder(Some(self.cal.meta.order))
                 }
                 CalendarPropName::SupportedCalendarComponentSet => {
                     CalendarProp::SupportedCalendarComponentSet(self.cal.components.clone().into())
@@ -183,37 +187,56 @@ impl Resource for CalendarResource {
         match prop {
             CalendarPropWrapper::Calendar(prop) => match prop {
                 CalendarProp::CalendarColor(color) => {
-                    self.cal.color = color;
+                    self.cal.meta.color = color;
                     Ok(())
                 }
                 CalendarProp::CalendarDescription(description) => {
-                    self.cal.description = description;
+                    self.cal.meta.description = description;
                     Ok(())
                 }
                 CalendarProp::CalendarTimezone(timezone) => {
-                    // TODO: Ensure that timezone-id is also updated
-                    // We probably want to prohibit non-IANA timezones
-                    self.cal.timezone = timezone;
+                    if let Some(tz) = timezone {
+                        // TODO: Proper error (calendar-timezone precondition)
+                        let calendar = IcalParser::new(tz.as_bytes())
+                            .next()
+                            .ok_or(rustical_dav::Error::BadRequest(
+                                "No timezone data provided".to_owned(),
+                            ))?
+                            .map_err(|_| {
+                                rustical_dav::Error::BadRequest(
+                                    "No timezone data provided".to_owned(),
+                                )
+                            })?;
+
+                        let timezone =
+                            calendar
+                                .timezones
+                                .first()
+                                .ok_or(rustical_dav::Error::BadRequest(
+                                    "No timezone data provided".to_owned(),
+                                ))?;
+                        let timezone: chrono_tz::Tz = timezone.try_into().map_err(|_| {
+                            rustical_dav::Error::BadRequest("No timezone data provided".to_owned())
+                        })?;
+
+                        self.cal.timezone_id = Some(timezone.name().to_owned());
+                    }
                     Ok(())
                 }
                 CalendarProp::TimezoneServiceSet(_) => Err(rustical_dav::Error::PropReadOnly),
                 CalendarProp::CalendarTimezoneId(timezone_id) => {
-                    if let Some(tzid) = &timezone_id {
-                        // Validate timezone id and set timezone accordingly
-                        self.cal.timezone = Some(
-                            vtimezones_rs::VTIMEZONES
-                                .get(tzid)
-                                .ok_or(rustical_dav::Error::BadRequest(format!(
-                                    "Invalid timezone-id: {tzid}"
-                                )))?
-                                .to_string(),
-                        );
+                    if let Some(tzid) = &timezone_id
+                        && !vtimezones_rs::VTIMEZONES.contains_key(tzid)
+                    {
+                        return Err(rustical_dav::Error::BadRequest(format!(
+                            "Invalid timezone-id: {tzid}"
+                        )));
                     }
                     self.cal.timezone_id = timezone_id;
                     Ok(())
                 }
                 CalendarProp::CalendarOrder(order) => {
-                    self.cal.order = order.unwrap_or_default();
+                    self.cal.meta.order = order.unwrap_or_default();
                     Ok(())
                 }
                 CalendarProp::SupportedCalendarComponentSet(comp_set) => {
@@ -241,24 +264,20 @@ impl Resource for CalendarResource {
         match prop {
             CalendarPropWrapperName::Calendar(prop) => match prop {
                 CalendarPropName::CalendarColor => {
-                    self.cal.color = None;
+                    self.cal.meta.color = None;
                     Ok(())
                 }
                 CalendarPropName::CalendarDescription => {
-                    self.cal.description = None;
+                    self.cal.meta.description = None;
                     Ok(())
                 }
-                CalendarPropName::CalendarTimezone => {
-                    self.cal.timezone = None;
-                    Ok(())
-                }
-                CalendarPropName::TimezoneServiceSet => Err(rustical_dav::Error::PropReadOnly),
-                CalendarPropName::CalendarTimezoneId => {
+                CalendarPropName::CalendarTimezone | CalendarPropName::CalendarTimezoneId => {
                     self.cal.timezone_id = None;
                     Ok(())
                 }
+                CalendarPropName::TimezoneServiceSet => Err(rustical_dav::Error::PropReadOnly),
                 CalendarPropName::CalendarOrder => {
-                    self.cal.order = 0;
+                    self.cal.meta.order = 0;
                     Ok(())
                 }
                 CalendarPropName::SupportedCalendarComponentSet => {
@@ -281,10 +300,10 @@ impl Resource for CalendarResource {
     }
 
     fn get_displayname(&self) -> Option<&str> {
-        self.cal.displayname.as_deref()
+        self.cal.meta.displayname.as_deref()
     }
     fn set_displayname(&mut self, name: Option<String>) -> Result<(), rustical_dav::Error> {
-        self.cal.displayname = name;
+        self.cal.meta.displayname = name;
         Ok(())
     }
 

crates/caldav/src/calendar/service.rs

@@ -1,4 +1,5 @@
 use crate::calendar::methods::get::route_get;
+use crate::calendar::methods::import::route_import;
 use crate::calendar::methods::mkcalendar::route_mkcalendar;
 use crate::calendar::methods::post::route_post;
 use crate::calendar::methods::report::route_report_calendar;
@@ -138,6 +139,13 @@ impl<C: CalendarStore, S: SubscriptionStore> AxumMethods for CalendarResourceSer
         })
     }
 
+    fn import() -> Option<rustical_dav::resource::MethodFunction<Self>> {
+        Some(|state, req| {
+            let mut service = Handler::with_state(route_import::<C, S>, state);
+            Box::pin(Service::call(&mut service, req))
+        })
+    }
+
     fn mkcalendar() -> Option<fn(Self, Request) -> BoxFuture<'static, Result<Response, Infallible>>>
     {
         Some(|state, req| {

crates/caldav/src/calendar/test_files/propfind.outputs

@@ -0,0 +1,222 @@
+<?xml version="1.0" encoding="utf-8"?>
+<response 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">
+    <href>/caldav/principal/user/calendar/</href>
+    <propstat>
+        <prop>
+            <calendar-color xmlns="http://apple.com/ns/ical/"/>
+            <calendar-description xmlns="urn:ietf:params:xml:ns:caldav"/>
+            <calendar-timezone xmlns="urn:ietf:params:xml:ns:caldav"/>
+            <timezone-service-set xmlns="urn:ietf:params:xml:ns:caldav"/>
+            <calendar-timezone-id xmlns="urn:ietf:params:xml:ns:caldav"/>
+            <calendar-order xmlns="http://apple.com/ns/ical/"/>
+            <supported-calendar-component-set xmlns="urn:ietf:params:xml:ns:caldav"/>
+            <supported-calendar-data xmlns="urn:ietf:params:xml:ns:caldav"/>
+            <max-resource-size xmlns="DAV:"/>
+            <supported-report-set xmlns="DAV:"/>
+            <source xmlns="http://calendarserver.org/ns/"/>
+            <min-date-time xmlns="urn:ietf:params:xml:ns:caldav"/>
+            <max-date-time xmlns="urn:ietf:params:xml:ns:caldav"/>
+            <sync-token xmlns="DAV:"/>
+            <getctag xmlns="http://calendarserver.org/ns/"/>
+            <transports xmlns="https://bitfire.at/webdav-push"/>
+            <topic xmlns="https://bitfire.at/webdav-push"/>
+            <supported-triggers xmlns="https://bitfire.at/webdav-push"/>
+            <resourcetype xmlns="DAV:"/>
+            <displayname xmlns="DAV:"/>
+            <current-user-principal xmlns="DAV:"/>
+            <current-user-privilege-set xmlns="DAV:"/>
+            <owner xmlns="DAV:"/>
+        </prop>
+        <status>HTTP/1.1 200 OK</status>
+    </propstat>
+</response>
+
+
+<?xml version="1.0" encoding="utf-8"?>
+<response 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">
+    <href>/caldav/principal/user/calendar/</href>
+    <propstat>
+        <prop>
+            <CAL:calendar-timezone>BEGIN:VCALENDAR
+PRODID:-//github.com/lennart-k/vzic-rs//RustiCal Calendar server//EN
+VERSION:2.0
+BEGIN:VTIMEZONE
+TZID:Europe/Berlin
+LAST-MODIFIED:20250723T190331Z
+X-LIC-LOCATION:Europe/Berlin
+X-PROLEPTIC-TZNAME:LMT
+BEGIN:STANDARD
+TZNAME:CET
+TZOFFSETFROM:+005328
+TZOFFSETTO:+0100
+DTSTART:18930401T000000
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:CEST
+TZOFFSETFROM:+0100
+TZOFFSETTO:+0200
+DTSTART:19160430T230000
+RDATE:19400401T020000
+RDATE:19430329T020000
+RDATE:19460414T020000
+RDATE:19470406T030000
+RDATE:19480418T020000
+RDATE:19490410T020000
+RDATE:19800406T020000
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:CET
+TZOFFSETFROM:+0200
+TZOFFSETTO:+0100
+DTSTART:19161001T010000
+RDATE:19421102T030000
+RDATE:19431004T030000
+RDATE:19441002T030000
+RDATE:19451118T030000
+RDATE:19461007T030000
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:CEST
+TZOFFSETFROM:+0100
+TZOFFSETTO:+0200
+DTSTART:19170416T020000
+RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=3MO;UNTIL=19180415T010000Z
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:CET
+TZOFFSETFROM:+0200
+TZOFFSETTO:+0100
+DTSTART:19170917T030000
+RRULE:FREQ=YEARLY;BYMONTH=9;BYDAY=3MO;UNTIL=19180916T010000Z
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:CEST
+TZOFFSETFROM:+0100
+TZOFFSETTO:+0200
+DTSTART:19440403T020000
+RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=1MO;UNTIL=19450402T010000Z
+END:DAYLIGHT
+BEGIN:DAYLIGHT
+TZNAME:CEMT
+TZOFFSETFROM:+0200
+TZOFFSETTO:+0300
+DTSTART:19450524T020000
+RDATE:19470511T030000
+END:DAYLIGHT
+BEGIN:DAYLIGHT
+TZNAME:CEST
+TZOFFSETFROM:+0300
+TZOFFSETTO:+0200
+DTSTART:19450924T030000
+RDATE:19470629T030000
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:CET
+TZOFFSETFROM:+0100
+TZOFFSETTO:+0100
+DTSTART:19460101T000000
+RDATE:19800101T000000
+END:STANDARD
+BEGIN:STANDARD
+TZNAME:CET
+TZOFFSETFROM:+0200
+TZOFFSETTO:+0100
+DTSTART:19471005T030000
+RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=1SU;UNTIL=19491002T010000Z
+END:STANDARD
+BEGIN:STANDARD
+TZNAME:CET
+TZOFFSETFROM:+0200
+TZOFFSETTO:+0100
+DTSTART:19800928T030000
+RRULE:FREQ=YEARLY;BYMONTH=9;BYDAY=-1SU;UNTIL=19950924T010000Z
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:CEST
+TZOFFSETFROM:+0100
+TZOFFSETTO:+0200
+DTSTART:19810329T020000
+RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:CET
+TZOFFSETFROM:+0200
+TZOFFSETTO:+0100
+DTSTART:19961027T030000
+RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU
+END:STANDARD
+END:VTIMEZONE
+END:VCALENDAR
+</CAL:calendar-timezone>
+            <CAL:timezone-service-set>
+                <href>https://www.iana.org/time-zones</href>
+            </CAL:timezone-service-set>
+            <CAL:calendar-timezone-id>Europe/Berlin</CAL:calendar-timezone-id>
+            <calendar-order xmlns="http://apple.com/ns/ical/">0</calendar-order>
+            <CAL:supported-calendar-component-set>
+                <CAL:comp name="VEVENT"/>
+                <CAL:comp name="VTODO"/>
+            </CAL:supported-calendar-component-set>
+            <CAL:supported-calendar-data>
+                <CAL:calendar-data content-type="text/calendar" version="2.0"/>
+            </CAL:supported-calendar-data>
+            <max-resource-size>10000000</max-resource-size>
+            <supported-report-set>
+                <supported-report>
+                    <report>
+                        <CAL:calendar-query/>
+                    </report>
+                </supported-report>
+                <supported-report>
+                    <report>
+                        <CAL:calendar-multiget/>
+                    </report>
+                </supported-report>
+                <supported-report>
+                    <report>
+                        <sync-collection/>
+                    </report>
+                </supported-report>
+            </supported-report-set>
+            <CAL:min-date-time>-2621430101T000000Z</CAL:min-date-time>
+            <CAL:max-date-time>+2621421231T235959Z</CAL:max-date-time>
+            <sync-token>github.com/lennart-k/rustical/ns/12</sync-token>
+            <CS:getctag>github.com/lennart-k/rustical/ns/12</CS:getctag>
+            <PUSH:transports>
+                <PUSH:web-push/>
+            </PUSH:transports>
+            <PUSH:topic>b28b41e9-8801-4fc5-ae29-8efb5fadeb36</PUSH:topic>
+            <PUSH:supported-triggers>
+                <PUSH:content-update>
+                    <depth>1</depth>
+                </PUSH:content-update>
+                <PUSH:property-update>
+                    <depth>1</depth>
+                </PUSH:property-update>
+            </PUSH:supported-triggers>
+            <resourcetype>
+                <collection/>
+                <CAL:calendar/>
+            </resourcetype>
+            <displayname>Calendar</displayname>
+            <current-user-principal>
+                <href>/caldav/principal/user/</href>
+            </current-user-principal>
+            <current-user-privilege-set>
+                <privilege>
+                    <read/>
+                </privilege>
+                <privilege>
+                    <read-acl/>
+                </privilege>
+                <privilege>
+                    <read-current-user-privilege-set/>
+                </privilege>
+            </current-user-privilege-set>
+            <owner>
+                <href>/caldav/principal/user/</href>
+            </owner>
+        </prop>
+        <status>HTTP/1.1 200 OK</status>
+    </propstat>
+</response>

crates/caldav/src/calendar/test_files/propfind.principals.json

@@ -0,0 +1,11 @@
+[
+  {
+    "id": "user",
+    "displayname": null,
+    "principal_type": "individual",
+    "password": null,
+    "memberships": [
+      "group"
+    ]
+  }
+]

crates/caldav/src/calendar/test_files/propfind.requests

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<propfind xmlns="DAV:"><propname/></propfind>
+
+
+<?xml version="1.0" encoding="UTF-8"?>
+<propfind xmlns="DAV:"><allprop/></propfind>

crates/caldav/src/calendar/test_files/propfind.resources.json

@@ -0,0 +1,42 @@
+[
+  {
+    "cal": {
+      "principal": "user",
+      "id": "calendar",
+      "displayname": "Calendar",
+      "order": 0,
+      "description": null,
+      "color": null,
+      "timezone_id": "Europe/Berlin",
+      "deleted_at": null,
+      "synctoken": 12,
+      "subscription_url": null,
+      "push_topic": "b28b41e9-8801-4fc5-ae29-8efb5fadeb36",
+      "components": [
+        "VEVENT",
+        "VTODO"
+      ]
+    },
+    "read_only": true
+  },
+  {
+    "cal": {
+      "principal": "user",
+      "id": "calendar",
+      "displayname": "Calendar",
+      "order": 0,
+      "description": null,
+      "color": null,
+      "timezone_id": "Europe/Berlin",
+      "deleted_at": null,
+      "synctoken": 12,
+      "subscription_url": null,
+      "push_topic": "b28b41e9-8801-4fc5-ae29-8efb5fadeb36",
+      "components": [
+        "VEVENT",
+        "VTODO"
+      ]
+    },
+    "read_only": true
+  }
+]

crates/caldav/src/calendar/tests.rs

@@ -0,0 +1,47 @@
+use crate::{CalDavPrincipalUri, calendar::resource::CalendarResource};
+use rustical_dav::resource::Resource;
+use rustical_store::auth::Principal;
+use rustical_xml::XmlSerializeRoot;
+use serde_json::from_str;
+
+#[tokio::test]
+async fn test_propfind() {
+    let requests: Vec<_> = include_str!("./test_files/propfind.requests")
+        .trim()
+        .split("\n\n")
+        .collect();
+    let principals: Vec<Principal> =
+        from_str(include_str!("./test_files/propfind.principals.json")).unwrap();
+    let resources: Vec<CalendarResource> =
+        from_str(include_str!("./test_files/propfind.resources.json")).unwrap();
+    let outputs: Vec<_> = include_str!("./test_files/propfind.outputs")
+        .trim()
+        .split("\n\n")
+        .collect();
+
+    for principal in principals {
+        for ((request, resource), &expected_output) in requests.iter().zip(&resources).zip(&outputs)
+        {
+            let propfind = CalendarResource::parse_propfind(request).unwrap();
+
+            let response = resource
+                .propfind(
+                    &format!("/caldav/principal/{}/{}", principal.id, resource.cal.id),
+                    &propfind.prop,
+                    propfind.include.as_ref(),
+                    &CalDavPrincipalUri("/caldav"),
+                    &principal,
+                )
+                .unwrap();
+            let expected_output = expected_output.trim();
+            let output = response
+                .serialize_to_string()
+                .unwrap()
+                .trim()
+                .replace("\r\n", "\n");
+            println!("{output}");
+            println!("{}, {} \n\n\n", output.len(), expected_output.len());
+            assert_eq!(output, expected_output);
+        }
+    }
+}

crates/caldav/src/calendar_object/methods.rs

@@ -11,7 +11,7 @@ use rustical_ical::CalendarObject;
 use rustical_store::CalendarStore;
 use rustical_store::auth::Principal;
 use std::str::FromStr;
-use tracing::instrument;
+use tracing::{debug, error, instrument};
 
 #[instrument(skip(cal_store))]
 pub async fn get_event<C: CalendarStore>(
@@ -78,12 +78,21 @@ pub async fn put_event<C: CalendarStore>(
         true
     };
 
-    let object = match CalendarObject::from_ics(object_id, body) {
+    let object = match CalendarObject::from_ics(body.clone()) {
         Ok(obj) => obj,
         Err(_) => {
+            debug!("invalid calendar data:\n{body}");
             return Err(Error::PreconditionFailed(Precondition::ValidCalendarData));
         }
     };
+    if object.get_id() != object_id {
+        error!(
+            "Calendar object UID and file name not matching: UID={}, filename={}",
+            object.get_id(),
+            object_id
+        );
+        return Err(Error::PreconditionFailed(Precondition::MatchingUid));
+    }
     cal_store
         .put_object(principal, calendar_id, object, overwrite)
         .await?;

crates/caldav/src/error.rs

@@ -12,6 +12,8 @@ pub enum Precondition {
     #[error("valid-calendar-data")]
     #[xml(ns = "rustical_dav::namespace::NS_CALDAV")]
     ValidCalendarData,
+    #[error("matching-uid")]
+    MatchingUid,
 }
 
 impl IntoResponse for Precondition {
@@ -83,6 +85,12 @@ impl Error {
 
 impl IntoResponse for Error {
     fn into_response(self) -> axum::response::Response {
+        if matches!(
+            self.status_code(),
+            StatusCode::INTERNAL_SERVER_ERROR | StatusCode::PRECONDITION_FAILED
+        ) {
+            error!("{self}");
+        }
         (self.status_code(), self.to_string()).into_response()
     }
 }

crates/caldav/src/principal/prop.rs

@@ -16,13 +16,13 @@ pub enum PrincipalProp {
     CalendarUserAddressSet(HrefElement),
 
     // WebDAV Access Control (RFC 3744)
-    #[xml(ns = "rustical_dav::namespace::NS_DAV", rename = b"principal-URL")]
+    #[xml(ns = "rustical_dav::namespace::NS_DAV", rename = "principal-URL")]
     PrincipalUrl(HrefElement),
     #[xml(ns = "rustical_dav::namespace::NS_DAV")]
     GroupMembership(GroupMembership),
     #[xml(ns = "rustical_dav::namespace::NS_DAV")]
     GroupMemberSet(GroupMemberSet),
-    #[xml(ns = "rustical_dav::namespace::NS_DAV", rename = b"alternate-URI-set")]
+    #[xml(ns = "rustical_dav::namespace::NS_DAV", rename = "alternate-URI-set")]
     AlternateUriSet,
     // #[xml(ns = "rustical_dav::namespace::NS_DAV")]
     // PrincipalCollectionSet(HrefElement),

crates/caldav/src/principal/tests.rs

@@ -1,14 +1,19 @@
 use std::sync::Arc;
 
-use crate::principal::PrincipalResourceService;
+use crate::{
+    CalDavPrincipalUri,
+    principal::{PrincipalResource, PrincipalResourceService},
+};
 use rstest::rstest;
-use rustical_dav::resource::ResourceService;
+use rustical_dav::resource::{Resource, ResourceService};
+use rustical_store::auth::{Principal, PrincipalType::Individual};
 use rustical_store_sqlite::{
     SqliteStore,
     calendar_store::SqliteCalendarStore,
     principal_store::SqlitePrincipalStore,
     tests::{get_test_calendar_store, get_test_principal_store, get_test_subscription_store},
 };
+use rustical_xml::XmlSerializeRoot;
 
 #[rstest]
 #[tokio::test]
@@ -30,6 +35,15 @@ async fn test_principal_resource(
         simplified_home_set: false,
     };
 
+    // We don't have any calendars here
+    assert!(
+        service
+            .get_members(&("user".to_owned(),))
+            .await
+            .unwrap()
+            .is_empty()
+    );
+
     assert!(matches!(
         service
             .get_resource(&("invalid-user".to_owned(),), true)
@@ -44,4 +58,35 @@ async fn test_principal_resource(
 }
 
 #[tokio::test]
-async fn test_propfind() {}
+async fn test_propfind() {
+    let propfind = PrincipalResource::parse_propfind(
+        r#"<?xml version="1.0" encoding="UTF-8"?><propfind xmlns="DAV:"><allprop/></propfind>"#,
+    )
+    .unwrap();
+
+    let principal = Principal {
+        id: "user".to_string(),
+        displayname: None,
+        principal_type: Individual,
+        password: None,
+        memberships: vec!["group".to_string()],
+    };
+
+    let resource = PrincipalResource {
+        principal: principal.clone(),
+        members: vec![],
+        simplified_home_set: false,
+    };
+
+    let response = resource
+        .propfind(
+            &format!("/caldav/principal/{}", principal.id),
+            &propfind.prop,
+            propfind.include.as_ref(),
+            &CalDavPrincipalUri("/caldav"),
+            &principal,
+        )
+        .unwrap();
+
+    let _output = response.serialize_to_string().unwrap();
+}

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

@@ -0,0 +1,67 @@
+use std::io::BufReader;
+
+use crate::Error;
+use crate::addressbook::AddressbookResourceService;
+use axum::{
+    extract::{Path, State},
+    response::{IntoResponse, Response},
+};
+use http::StatusCode;
+use ical::{
+    parser::{Component, ComponentMut, vcard},
+    property::Property,
+};
+use rustical_store::{Addressbook, AddressbookStore, SubscriptionStore, auth::Principal};
+use tracing::instrument;
+
+#[instrument(skip(resource_service))]
+pub async fn route_import<AS: AddressbookStore, S: SubscriptionStore>(
+    Path((principal, addressbook_id)): Path<(String, String)>,
+    user: Principal,
+    State(resource_service): State<AddressbookResourceService<AS, S>>,
+    body: String,
+) -> Result<Response, Error> {
+    if !user.is_principal(&principal) {
+        return Err(Error::Unauthorized);
+    }
+
+    let parser = vcard::VcardParser::new(BufReader::new(body.as_bytes()));
+
+    let mut objects = vec![];
+    for res in parser {
+        let mut card = res.unwrap();
+        let uid = card.get_uid();
+        if uid.is_none() {
+            let mut card_mut = card.mutable();
+            card_mut.set_property(Property {
+                name: "UID".to_owned(),
+                value: Some(uuid::Uuid::new_v4().to_string()),
+                params: None,
+            });
+            card = card_mut.verify().unwrap();
+        }
+
+        objects.push(card.try_into().unwrap());
+    }
+
+    if objects.is_empty() {
+        return Ok((StatusCode::BAD_REQUEST, "empty addressbook data").into_response());
+    }
+
+    let addressbook = Addressbook {
+        principal,
+        id: addressbook_id,
+        displayname: None,
+        description: None,
+        deleted_at: None,
+        synctoken: 0,
+        push_topic: uuid::Uuid::new_v4().to_string(),
+    };
+
+    let addr_store = resource_service.addr_store;
+    addr_store
+        .import_addressbook(addressbook, objects, false)
+        .await?;
+
+    Ok(StatusCode::OK.into_response())
+}

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

@@ -22,7 +22,7 @@ pub struct MkcolAddressbookProp {
     resourcetype: Option<Resourcetype>,
     #[xml(ns = "rustical_dav::namespace::NS_DAV")]
     displayname: Option<String>,
-    #[xml(rename = b"addressbook-description")]
+    #[xml(rename = "addressbook-description")]
     #[xml(ns = "rustical_dav::namespace::NS_CARDDAV")]
     description: Option<String>,
 }
@@ -34,7 +34,7 @@ pub struct PropElement<T: XmlDeserialize> {
 }
 
 #[derive(XmlDeserialize, XmlRootTag, Clone, Debug, PartialEq)]
-#[xml(root = b"mkcol")]
+#[xml(root = "mkcol")]
 #[xml(ns = "rustical_dav::namespace::NS_DAV")]
 struct MkcolRequest {
     #[xml(ns = "rustical_dav::namespace::NS_DAV")]

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

@@ -1,5 +1,5 @@
 pub mod get;
+pub mod import;
 pub mod mkcol;
 pub mod post;
-pub mod put;
 pub mod report;

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

@@ -1,47 +0,0 @@
-use crate::Error;
-use crate::addressbook::AddressbookResourceService;
-use axum::response::IntoResponse;
-use axum::{
-    extract::{Path, State},
-    response::Response,
-};
-use http::StatusCode;
-use ical::VcardParser;
-use rustical_ical::AddressObject;
-use rustical_store::Addressbook;
-use rustical_store::{AddressbookStore, SubscriptionStore, auth::Principal};
-use tracing::instrument;
-
-#[instrument(skip(addr_store))]
-pub async fn route_put<AS: AddressbookStore, S: SubscriptionStore>(
-    Path((principal, addressbook_id)): Path<(String, String)>,
-    State(AddressbookResourceService { addr_store, .. }): State<AddressbookResourceService<AS, S>>,
-    user: Principal,
-    body: String,
-) -> Result<Response, Error> {
-    if !user.is_principal(&principal) {
-        return Err(Error::Unauthorized);
-    }
-
-    let mut objects = vec![];
-    for object in VcardParser::new(body.as_bytes()) {
-        let object = object.map_err(rustical_ical::Error::from)?;
-        objects.push(AddressObject::try_from(object)?);
-    }
-
-    let addressbook = Addressbook {
-        id: addressbook_id.clone(),
-        principal: principal.clone(),
-        displayname: None,
-        description: None,
-        deleted_at: None,
-        synctoken: Default::default(),
-        push_topic: uuid::Uuid::new_v4().to_string(),
-    };
-
-    addr_store
-        .import_addressbook(principal.clone(), addressbook, objects)
-        .await?;
-
-    Ok(StatusCode::CREATED.into_response())
-}

crates/carddav/src/addressbook/service.rs

@@ -3,8 +3,8 @@ use super::methods::report::route_report_addressbook;
 use crate::address_object::AddressObjectResourceService;
 use crate::address_object::resource::AddressObjectResource;
 use crate::addressbook::methods::get::route_get;
+use crate::addressbook::methods::import::route_import;
 use crate::addressbook::methods::post::route_post;
-use crate::addressbook::methods::put::route_put;
 use crate::addressbook::resource::AddressbookResource;
 use crate::{CardDavPrincipalUri, Error};
 use async_trait::async_trait;
@@ -139,9 +139,9 @@ impl<AS: AddressbookStore, S: SubscriptionStore> AxumMethods for AddressbookReso
         })
     }
 
-    fn put() -> Option<fn(Self, Request) -> BoxFuture<'static, Result<Response, Infallible>>> {
+    fn import() -> Option<fn(Self, Request) -> BoxFuture<'static, Result<Response, Infallible>>> {
         Some(|state, req| {
-            let mut service = Handler::with_state(route_put::<AS, S>, state);
+            let mut service = Handler::with_state(route_import::<AS, S>, state);
             Box::pin(Service::call(&mut service, req))
         })
     }

crates/carddav/src/principal/prop.rs

@@ -8,14 +8,14 @@ use rustical_xml::{EnumVariants, PropName, XmlDeserialize, XmlSerialize};
 #[xml(unit_variants_ident = "PrincipalPropName")]
 pub enum PrincipalProp {
     // WebDAV Access Control (RFC 3744)
-    #[xml(rename = b"principal-URL")]
+    #[xml(rename = "principal-URL")]
     #[xml(ns = "rustical_dav::namespace::NS_DAV")]
     PrincipalUrl(HrefElement),
     #[xml(ns = "rustical_dav::namespace::NS_DAV")]
     GroupMembership(GroupMembership),
     #[xml(ns = "rustical_dav::namespace::NS_DAV")]
     GroupMemberSet(GroupMemberSet),
-    #[xml(ns = "rustical_dav::namespace::NS_DAV", rename = b"alternate-URI-set")]
+    #[xml(ns = "rustical_dav::namespace::NS_DAV", rename = "alternate-URI-set")]
     AlternateUriSet,
     #[xml(ns = "rustical_dav::namespace::NS_DAV")]
     PrincipalCollectionSet(HrefElement),

crates/dav/src/error.rs

@@ -1,3 +1,4 @@
+use axum::body::Body;
 use http::StatusCode;
 use rustical_xml::XmlError;
 use thiserror::Error;
@@ -59,7 +60,12 @@ impl Error {
 
 impl axum::response::IntoResponse for Error {
     fn into_response(self) -> axum::response::Response {
-        use axum::body::Body;
+        if matches!(
+            self.status_code(),
+            StatusCode::INTERNAL_SERVER_ERROR | StatusCode::PRECONDITION_FAILED
+        ) {
+            error!("{self}");
+        }
 
         let mut resp = axum::response::Response::builder().status(self.status_code());
         if matches!(&self, &Error::Unauthorized) {

crates/dav/src/header/overwrite.rs

@@ -14,16 +14,12 @@ impl IntoResponse for InvalidOverwriteHeader {
     }
 }
 
-#[derive(Debug, PartialEq, Default)]
-pub enum Overwrite {
-    #[default]
-    T,
-    F,
-}
+#[derive(Debug, PartialEq)]
+pub struct Overwrite(pub bool);
 
-impl Overwrite {
-    pub fn is_true(&self) -> bool {
-        matches!(self, Self::T)
+impl Default for Overwrite {
+    fn default() -> Self {
+        Self(true)
     }
 }
 
@@ -47,9 +43,48 @@ impl TryFrom<&[u8]> for Overwrite {
 
     fn try_from(value: &[u8]) -> Result<Self, Self::Error> {
         match value {
-            b"T" => Ok(Overwrite::T),
-            b"F" => Ok(Overwrite::F),
+            b"T" => Ok(Self(true)),
+            b"F" => Ok(Self(false)),
             _ => Err(InvalidOverwriteHeader),
         }
     }
 }
+
+#[cfg(test)]
+mod tests {
+    use axum::{extract::FromRequestParts, response::IntoResponse};
+    use http::Request;
+
+    use crate::header::Overwrite;
+
+    #[tokio::test]
+    async fn test_overwrite_default() {
+        let request = Request::put("asd").body(()).unwrap();
+        let (mut parts, _) = request.into_parts();
+        let overwrite = Overwrite::from_request_parts(&mut parts, &())
+            .await
+            .unwrap();
+        assert_eq!(
+            Overwrite(true),
+            overwrite,
+            "By default we want to overwrite!"
+        );
+    }
+
+    #[test]
+    fn test_overwrite() {
+        assert_eq!(
+            Overwrite(true),
+            Overwrite::try_from(b"T".as_slice()).unwrap()
+        );
+        assert_eq!(
+            Overwrite(false),
+            Overwrite::try_from(b"F".as_slice()).unwrap()
+        );
+        if let Err(err) = Overwrite::try_from(b"aslkdjlad".as_slice()) {
+            let _ = err.into_response();
+        } else {
+            unreachable!("should return error")
+        }
+    }
+}

crates/dav/src/privileges.rs

@@ -1,9 +1,10 @@
+use itertools::Itertools;
 use quick_xml::name::Namespace;
 use rustical_xml::{XmlDeserialize, XmlSerialize};
 use std::collections::{HashMap, HashSet};
 
 // https://datatracker.ietf.org/doc/html/rfc3744
-#[derive(Debug, Clone, XmlSerialize, XmlDeserialize, Eq, Hash, PartialEq)]
+#[derive(Debug, Clone, XmlSerialize, XmlDeserialize, Eq, Hash, PartialEq, PartialOrd, Ord)]
 pub enum UserPrivilege {
     Read,
     Write,
@@ -19,18 +20,18 @@ impl XmlSerialize for UserPrivilegeSet {
     fn serialize(
         &self,
         ns: Option<Namespace>,
-        tag: Option<&[u8]>,
-        namespaces: &HashMap<Namespace, &[u8]>,
+        tag: Option<&str>,
+        namespaces: &HashMap<Namespace, &str>,
         writer: &mut quick_xml::Writer<&mut Vec<u8>>,
     ) -> std::io::Result<()> {
         #[derive(XmlSerialize)]
         pub struct FakeUserPrivilegeSet {
-            #[xml(rename = b"privilege", flatten)]
+            #[xml(rename = "privilege", flatten)]
             privileges: Vec<UserPrivilege>,
         }
 
         FakeUserPrivilegeSet {
-            privileges: self.privileges.iter().cloned().collect(),
+            privileges: self.privileges.iter().cloned().sorted().collect(),
         }
         .serialize(ns, tag, namespaces, writer)
     }

crates/dav/src/resource/axum_methods.rs

@@ -38,6 +38,11 @@ pub trait AxumMethods: Sized + Send + Sync + 'static {
         None
     }
 
+    #[inline]
+    fn import() -> Option<MethodFunction<Self>> {
+        None
+    }
+
     #[inline]
     fn allow_header() -> Allow {
         let mut allow = vec![
@@ -67,6 +72,9 @@ pub trait AxumMethods: Sized + Send + Sync + 'static {
         if Self::put().is_some() {
             allow.push(Method::PUT);
         }
+        if Self::import().is_some() {
+            allow.push(Method::from_str("IMPORT").unwrap());
+        }
 
         allow.into_iter().collect()
     }

crates/dav/src/resource/axum_service.rs

@@ -97,6 +97,11 @@ where
                     return svc(self.resource_service.clone(), req);
                 }
             }
+            "IMPORT" => {
+                if let Some(svc) = RS::import() {
+                    return svc(self.resource_service.clone(), req);
+                }
+            }
             _ => {}
         };
         Box::pin(async move {

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

@@ -17,7 +17,7 @@ pub(crate) async fn axum_route_copy<R: ResourceService>(
     State(resource_service): State<R>,
     depth: Option<Depth>,
     principal: R::Principal,
-    overwrite: Overwrite,
+    Overwrite(overwrite): Overwrite,
     matched_path: MatchedPath,
     header_map: HeaderMap,
 ) -> Result<Response, R::Error> {
@@ -39,7 +39,7 @@ pub(crate) async fn axum_route_copy<R: ResourceService>(
             .map_err(|_| crate::Error::Forbidden)?;
 
         if resource_service
-            .copy_resource(&path, &dest_path, &principal, overwrite.is_true())
+            .copy_resource(&path, &dest_path, &principal, overwrite)
             .await?
         {
             // Overwritten

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

@@ -60,11 +60,11 @@ pub async fn route_delete<R: ResourceService>(
             return Err(crate::Error::PreconditionFailed.into());
         }
     }
-    if let Some(if_none_match) = if_none_match {
-        if resource.satisfies_if_none_match(&if_none_match) {
-            // Precondition failed
-            return Err(crate::Error::PreconditionFailed.into());
-        }
+    if let Some(if_none_match) = if_none_match
+        && resource.satisfies_if_none_match(&if_none_match)
+    {
+        // Precondition failed
+        return Err(crate::Error::PreconditionFailed.into());
     }
     resource_service
         .delete_resource(path_components, !no_trash)

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

@@ -17,7 +17,7 @@ pub(crate) async fn axum_route_move<R: ResourceService>(
     State(resource_service): State<R>,
     depth: Option<Depth>,
     principal: R::Principal,
-    overwrite: Overwrite,
+    Overwrite(overwrite): Overwrite,
     matched_path: MatchedPath,
     header_map: HeaderMap,
 ) -> Result<Response, R::Error> {
@@ -39,7 +39,7 @@ pub(crate) async fn axum_route_move<R: ResourceService>(
             .map_err(|_| crate::Error::Forbidden)?;
 
         if resource_service
-            .copy_resource(&path, &dest_path, &principal, overwrite.is_true())
+            .copy_resource(&path, &dest_path, &principal, overwrite)
             .await?
         {
             // Overwritten

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

@@ -6,11 +6,7 @@ use crate::resource::Resource;
 use crate::resource::ResourceName;
 use crate::resource::ResourceService;
 use crate::xml::MultistatusElement;
-use crate::xml::PropfindElement;
-use crate::xml::PropfindType;
 use axum::extract::{Extension, OriginalUri, Path, State};
-use rustical_xml::PropName;
-use rustical_xml::XmlDocument;
 use tracing::instrument;
 
 type RSMultistatus<R> = MultistatusElement<
@@ -58,24 +54,8 @@ pub(crate) async fn route_propfind<R: ResourceService>(
     }
 
     // A request body is optional. If empty we MUST return all props
-    let propfind_self: PropfindElement<<<R::Resource as Resource>::Prop as PropName>::Names> =
-        if !body.is_empty() {
-            PropfindElement::parse_str(body).map_err(Error::XmlError)?
-        } else {
-            PropfindElement {
-                prop: PropfindType::Allprop,
-                include: None,
-            }
-        };
-    let propfind_member: PropfindElement<<<R::MemberType as Resource>::Prop as PropName>::Names> =
-        if !body.is_empty() {
-            PropfindElement::parse_str(body).map_err(Error::XmlError)?
-        } else {
-            PropfindElement {
-                prop: PropfindType::Allprop,
-                include: None,
-            }
-        };
+    let propfind_self = R::Resource::parse_propfind(body).map_err(Error::XmlError)?;
+    let propfind_member = R::MemberType::parse_propfind(body).map_err(Error::XmlError)?;
 
     let mut member_responses = Vec::new();
     if depth != &Depth::Zero {

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

@@ -57,7 +57,7 @@ enum Operation<T: XmlDeserialize> {
 }
 
 #[derive(XmlDeserialize, XmlRootTag, Clone, Debug)]
-#[xml(root = b"propertyupdate")]
+#[xml(root = "propertyupdate")]
 #[xml(ns = "crate::namespace::NS_DAV")]
 struct PropertyupdateElement<T: XmlDeserialize>(#[xml(ty = "untagged", flatten)] Vec<Operation<T>>);
 

crates/dav/src/resource/mod.rs

@@ -1,15 +1,16 @@
 use crate::Principal;
 use crate::privileges::UserPrivilegeSet;
 use crate::xml::multistatus::{PropTagWrapper, PropstatElement, PropstatWrapper};
-use crate::xml::{PropElement, PropfindType, Resourcetype};
+use crate::xml::{PropElement, PropfindElement, PropfindType, Resourcetype};
 use crate::xml::{TagList, multistatus::ResponseElement};
 use headers::{ETag, IfMatch, IfNoneMatch};
 use http::StatusCode;
 use itertools::Itertools;
 use quick_xml::name::Namespace;
 pub use resource_service::ResourceService;
-use rustical_xml::{EnumVariants, NamespaceOwned, PropName, XmlDeserialize, XmlSerialize};
-use std::collections::HashSet;
+use rustical_xml::{
+    EnumVariants, NamespaceOwned, PropName, XmlDeserialize, XmlDocument, XmlSerialize,
+};
 use std::str::FromStr;
 
 mod axum_methods;
@@ -102,6 +103,19 @@ pub trait Resource: Clone + Send + 'static {
         principal: &Self::Principal,
     ) -> Result<UserPrivilegeSet, Self::Error>;
 
+    fn parse_propfind(
+        body: &str,
+    ) -> Result<PropfindElement<<Self::Prop as PropName>::Names>, rustical_xml::XmlError> {
+        if !body.is_empty() {
+            PropfindElement::parse_str(body)
+        } else {
+            Ok(PropfindElement {
+                prop: PropfindType::Allprop,
+                include: None,
+            })
+        }
+    }
+
     fn propfind(
         &self,
         path: &str,
@@ -116,7 +130,7 @@ pub trait Resource: Clone + Send + 'static {
             path.push('/');
         }
 
-        let (mut props, mut invalid_props): (HashSet<<Self::Prop as PropName>::Names>, Vec<_>) =
+        let (mut props, mut invalid_props): (Vec<<Self::Prop as PropName>::Names>, Vec<_>) =
             match prop {
                 PropfindType::Propname => {
                     let props = Self::list_props()
@@ -141,7 +155,7 @@ pub trait Resource: Clone + Send + 'static {
                     vec![],
                 ),
                 PropfindType::Prop(PropElement(valid_tags, invalid_tags)) => (
-                    valid_tags.iter().cloned().collect(),
+                    valid_tags.iter().unique().cloned().collect(),
                     invalid_tags.to_owned(),
                 ),
             };

crates/dav/src/resources/mod.rs

@@ -1,3 +1,72 @@
 pub mod root;
 
 pub use root::{RootResource, RootResourceService};
+
+#[cfg(test)]
+pub mod test {
+    use crate::{
+        Error, Principal,
+        extensions::{CommonPropertiesExtension, CommonPropertiesProp},
+        namespace::NS_DAV,
+        privileges::UserPrivilegeSet,
+        resource::{PrincipalUri, Resource},
+        xml::{Resourcetype, ResourcetypeInner},
+    };
+
+    #[derive(Debug, Clone)]
+    pub struct TestPrincipal(pub String);
+
+    impl Principal for TestPrincipal {
+        fn get_id(&self) -> &str {
+            &self.0
+        }
+    }
+
+    impl Resource for TestPrincipal {
+        type Prop = CommonPropertiesProp;
+        type Error = Error;
+        type Principal = Self;
+
+        fn is_collection(&self) -> bool {
+            true
+        }
+
+        fn get_resourcetype(&self) -> crate::xml::Resourcetype {
+            Resourcetype(&[ResourcetypeInner(Some(NS_DAV), "collection")])
+        }
+
+        fn get_prop(
+            &self,
+            principal_uri: &impl crate::resource::PrincipalUri,
+            principal: &Self::Principal,
+            prop: &<Self::Prop as rustical_xml::PropName>::Names,
+        ) -> Result<Self::Prop, Self::Error> {
+            <Self as CommonPropertiesExtension>::get_prop(self, principal_uri, principal, prop)
+        }
+
+        fn get_displayname(&self) -> Option<&str> {
+            Some(&self.0)
+        }
+
+        fn get_user_privileges(
+            &self,
+            principal: &Self::Principal,
+        ) -> Result<UserPrivilegeSet, Self::Error> {
+            Ok(UserPrivilegeSet::owner_only(
+                principal.get_id() == self.get_id(),
+            ))
+        }
+    }
+
+    #[derive(Debug, Clone)]
+    pub struct TestPrincipalUri;
+
+    impl PrincipalUri for TestPrincipalUri {
+        fn principal_collection(&self) -> String {
+            "/".to_owned()
+        }
+        fn principal_uri(&self, principal: &str) -> String {
+            format!("/{principal}/")
+        }
+    }
+}

crates/dav/src/resources/root.rs

@@ -105,3 +105,33 @@ impl<PRS: ResourceService<Principal = P> + Clone, P: Principal, PURI: PrincipalU
     for RootResourceService<PRS, P, PURI>
 {
 }
+
+#[cfg(test)]
+mod test {
+    use crate::{
+        resource::Resource,
+        resources::{
+            RootResource,
+            test::{TestPrincipal, TestPrincipalUri},
+        },
+    };
+
+    #[test]
+    fn test_root_resource() {
+        let resource = RootResource::<TestPrincipal, TestPrincipal>::default();
+        let propfind = RootResource::<TestPrincipal, TestPrincipal>::parse_propfind(
+            r#"<?xml version="1.0" encoding="UTF-8"?><propfind xmlns="DAV:"><allprop/></propfind>"#,
+        )
+        .unwrap();
+
+        let _response = resource
+            .propfind(
+                "/",
+                &propfind.prop,
+                propfind.include.as_ref(),
+                &TestPrincipalUri,
+                &TestPrincipal("user".to_owned()),
+            )
+            .unwrap();
+    }
+}

crates/dav/src/xml/error.rs

@@ -1,12 +1,12 @@
 use rustical_xml::{XmlRootTag, XmlSerialize};
 
 #[derive(XmlSerialize, XmlRootTag)]
-#[xml(ns = "crate::namespace::NS_DAV", root = b"error")]
+#[xml(ns = "crate::namespace::NS_DAV", root = "error")]
 #[xml(ns_prefix(
-    crate::namespace::NS_DAV = b"",
-    crate::namespace::NS_CARDDAV = b"CARD",
-    crate::namespace::NS_CALDAV = b"CAL",
-    crate::namespace::NS_CALENDARSERVER = b"CS",
-    crate::namespace::NS_DAVPUSH = b"PUSH"
+    crate::namespace::NS_DAV = "",
+    crate::namespace::NS_CARDDAV = "CARD",
+    crate::namespace::NS_CALDAV = "CAL",
+    crate::namespace::NS_CALENDARSERVER = "CS",
+    crate::namespace::NS_DAVPUSH = "PUSH"
 ))]
 pub struct ErrorElement<'t, T: XmlSerialize>(#[xml(ty = "untagged")] pub &'t T);

crates/dav/src/xml/multistatus.rs

@@ -22,8 +22,8 @@ pub struct PropstatElement<PropType: XmlSerialize> {
 fn xml_serialize_status(
     status: &StatusCode,
     ns: Option<Namespace>,
-    tag: Option<&[u8]>,
-    namespaces: &HashMap<Namespace, &[u8]>,
+    tag: Option<&str>,
+    namespaces: &HashMap<Namespace, &str>,
     writer: &mut quick_xml::Writer<&mut Vec<u8>>,
 ) -> std::io::Result<()> {
     XmlSerialize::serialize(&format!("HTTP/1.1 {}", status), ns, tag, namespaces, writer)
@@ -39,8 +39,15 @@ pub enum PropstatWrapper<T: XmlSerialize> {
 // RFC 2518
 // <!ELEMENT response (href, ((href*, status)|(propstat+)),
 // responsedescription?) >
-#[derive(XmlSerialize)]
-#[xml(ns = "crate::namespace::NS_DAV")]
+#[derive(XmlSerialize, XmlRootTag)]
+#[xml(ns = "crate::namespace::NS_DAV", root = "response")]
+#[xml(ns_prefix(
+    crate::namespace::NS_DAV = "",
+    crate::namespace::NS_CARDDAV = "CARD",
+    crate::namespace::NS_CALDAV = "CAL",
+    crate::namespace::NS_CALENDARSERVER = "CS",
+    crate::namespace::NS_DAVPUSH = "PUSH"
+))]
 pub struct ResponseElement<PropstatType: XmlSerialize> {
     pub href: String,
     #[xml(serialize_with = "xml_serialize_optional_status")]
@@ -52,8 +59,8 @@ pub struct ResponseElement<PropstatType: XmlSerialize> {
 fn xml_serialize_optional_status(
     val: &Option<StatusCode>,
     ns: Option<Namespace>,
-    tag: Option<&[u8]>,
-    namespaces: &HashMap<Namespace, &[u8]>,
+    tag: Option<&str>,
+    namespaces: &HashMap<Namespace, &str>,
     writer: &mut quick_xml::Writer<&mut Vec<u8>>,
 ) -> std::io::Result<()> {
     XmlSerialize::serialize(
@@ -79,18 +86,18 @@ impl<PT: XmlSerialize> Default for ResponseElement<PT> {
 // <!ELEMENT multistatus (response+, responsedescription?) >
 // Extended by sync-token as specified in RFC 6578
 #[derive(XmlSerialize, XmlRootTag)]
-#[xml(root = b"multistatus", ns = "crate::namespace::NS_DAV")]
+#[xml(root = "multistatus", ns = "crate::namespace::NS_DAV")]
 #[xml(ns_prefix(
-    crate::namespace::NS_DAV = b"",
-    crate::namespace::NS_CARDDAV = b"CARD",
-    crate::namespace::NS_CALDAV = b"CAL",
-    crate::namespace::NS_CALENDARSERVER = b"CS",
-    crate::namespace::NS_DAVPUSH = b"PUSH"
+    crate::namespace::NS_DAV = "",
+    crate::namespace::NS_CARDDAV = "CARD",
+    crate::namespace::NS_CALDAV = "CAL",
+    crate::namespace::NS_CALENDARSERVER = "CS",
+    crate::namespace::NS_DAVPUSH = "PUSH"
 ))]
 pub struct MultistatusElement<PropType: XmlSerialize, MemberPropType: XmlSerialize> {
-    #[xml(rename = b"response", flatten)]
+    #[xml(rename = "response", flatten)]
     pub responses: Vec<ResponseElement<PropType>>,
-    #[xml(rename = b"response", flatten)]
+    #[xml(rename = "response", flatten)]
     pub member_responses: Vec<ResponseElement<MemberPropType>>,
     pub sync_token: Option<String>,
 }

crates/dav/src/xml/propfind.rs

@@ -7,7 +7,7 @@ use rustical_xml::XmlError;
 use rustical_xml::XmlRootTag;
 
 #[derive(Debug, Clone, XmlDeserialize, XmlRootTag, PartialEq)]
-#[xml(root = b"propfind", ns = "crate::namespace::NS_DAV")]
+#[xml(root = "propfind", ns = "crate::namespace::NS_DAV")]
 pub struct PropfindElement<PN: XmlDeserialize> {
     #[xml(ty = "untagged")]
     pub prop: PropfindType<PN>,
@@ -66,6 +66,9 @@ impl<PN: XmlDeserialize> XmlDeserialize for PropElement<PN> {
                 Event::Text(_) | Event::CData(_) => {
                     return Err(XmlError::UnsupportedEvent("Not expecting text here"));
                 }
+                Event::GeneralRef(_) => {
+                    return Err(::rustical_xml::XmlError::UnsupportedEvent("GeneralRef"));
+                }
                 Event::Decl(_) | Event::Comment(_) | Event::DocType(_) | Event::PI(_) => { /* ignore */
                 }
                 Event::End(_end) => {

crates/dav/src/xml/resourcetype.rs

@@ -16,7 +16,7 @@ mod tests {
     use super::{Resourcetype, ResourcetypeInner};
 
     #[derive(XmlSerialize, XmlRootTag)]
-    #[xml(root = b"document")]
+    #[xml(root = "document")]
     struct Document {
         resourcetype: Resourcetype,
     }

crates/dav/src/xml/sync_collection.rs

@@ -60,7 +60,7 @@ pub struct NresultsElement(#[xml(ty = "text")] u64);
 // <!ELEMENT sync-collection (sync-token, sync-level, limit?, prop)>
 //    <!-- DAV:limit defined in RFC 5323, Section 5.17 -->
 //    <!-- DAV:prop defined in RFC 4918, Section 14.18 -->
-#[xml(ns = "crate::namespace::NS_DAV", root = b"sync-collection")]
+#[xml(ns = "crate::namespace::NS_DAV", root = "sync-collection")]
 pub struct SyncCollectionRequest<PN: XmlDeserialize> {
     #[xml(ns = "crate::namespace::NS_DAV")]
     pub sync_token: String,

crates/dav/src/xml/tag_list.rs

@@ -13,8 +13,8 @@ impl XmlSerialize for TagList {
     fn serialize(
         &self,
         ns: Option<Namespace>,
-        tag: Option<&[u8]>,
-        namespaces: &HashMap<Namespace, &[u8]>,
+        tag: Option<&str>,
+        namespaces: &HashMap<Namespace, &str>,
         writer: &mut quick_xml::Writer<&mut Vec<u8>>,
     ) -> std::io::Result<()> {
         let prefix = ns
@@ -22,23 +22,18 @@ impl XmlSerialize for TagList {
             .unwrap_or(None)
             .map(|prefix| {
                 if !prefix.is_empty() {
-                    [*prefix, b":"].concat()
+                    format!("{prefix}:")
                 } else {
-                    Vec::new()
+                    String::new()
                 }
             });
         let has_prefix = prefix.is_some();
         let tagname = tag.map(|tag| [&prefix.unwrap_or_default(), tag].concat());
-        let qname = tagname
-            .as_ref()
-            .map(|tagname| ::quick_xml::name::QName(tagname));
 
-        if let Some(qname) = &qname {
-            let mut bytes_start = BytesStart::from(qname.to_owned());
-            if !has_prefix {
-                if let Some(ns) = &ns {
-                    bytes_start.push_attribute((b"xmlns".as_ref(), ns.as_ref()));
-                }
+        if let Some(tagname) = tagname.as_ref() {
+            let mut bytes_start = BytesStart::new(tagname);
+            if !has_prefix && let Some(ns) = &ns {
+                bytes_start.push_attribute((b"xmlns".as_ref(), ns.as_ref()));
             }
             writer.write_event(Event::Start(bytes_start))?;
         }
@@ -51,8 +46,8 @@ impl XmlSerialize for TagList {
             el.write_empty()?;
         }
 
-        if let Some(qname) = &qname {
-            writer.write_event(Event::End(BytesEnd::from(qname.to_owned())))?;
+        if let Some(tagname) = tagname.as_ref() {
+            writer.write_event(Event::End(BytesEnd::new(tagname)))?;
         }
         Ok(())
     }

crates/dav_push/src/lib.rs

@@ -25,10 +25,10 @@ pub struct ContentUpdate {
 }
 
 #[derive(XmlSerialize, XmlRootTag, Debug)]
-#[xml(root = b"push-message", ns = "rustical_dav::namespace::NS_DAVPUSH")]
+#[xml(root = "push-message", ns = "rustical_dav::namespace::NS_DAVPUSH")]
 #[xml(ns_prefix(
-    rustical_dav::namespace::NS_DAVPUSH = b"",
-    rustical_dav::namespace::NS_DAV = b"D",
+    rustical_dav::namespace::NS_DAVPUSH = "",
+    rustical_dav::namespace::NS_DAV = "D",
 ))]
 struct PushMessage {
     #[xml(ns = "rustical_dav::namespace::NS_DAVPUSH")]
@@ -183,6 +183,7 @@ impl<S: SubscriptionStore> DavPushController<S> {
             header::CONTENT_TYPE,
             HeaderValue::from_static("application/octet-stream"),
         );
+        hdrs.insert("TTL", HeaderValue::from(60));
         client.execute(request).await?;
 
         Ok(())

crates/dav_push/src/prop.rs

@@ -35,12 +35,12 @@ pub enum Trigger {
 
 #[derive(XmlSerialize, XmlDeserialize, PartialEq, Clone, Debug)]
 pub struct ContentUpdate(
-    #[xml(rename = b"depth", ns = "rustical_dav::namespace::NS_DAV")] pub Depth,
+    #[xml(rename = "depth", ns = "rustical_dav::namespace::NS_DAV")] pub Depth,
 );
 
 #[derive(XmlSerialize, PartialEq, Clone, Debug)]
 pub struct PropertyUpdate(
-    #[xml(rename = b"depth", ns = "rustical_dav::namespace::NS_DAV")] pub Depth,
+    #[xml(rename = "depth", ns = "rustical_dav::namespace::NS_DAV")] pub Depth,
 );
 
 impl XmlDeserialize for PropertyUpdate {
@@ -51,8 +51,8 @@ impl XmlDeserialize for PropertyUpdate {
     ) -> Result<Self, rustical_xml::XmlError> {
         #[derive(XmlDeserialize, PartialEq, Clone, Debug)]
         struct FakePropertyUpdate(
-            #[xml(rename = b"depth", ns = "rustical_dav::namespace::NS_DAV")] pub Depth,
-            #[xml(rename = b"prop", ns = "rustical_dav::namespace::NS_DAV")] pub Unparsed,
+            #[xml(rename = "depth", ns = "rustical_dav::namespace::NS_DAV")] pub Depth,
+            #[xml(rename = "prop", ns = "rustical_dav::namespace::NS_DAV")] pub Unparsed,
         );
         let FakePropertyUpdate(depth, _) = FakePropertyUpdate::deserialize(reader, start, empty)?;
         Ok(Self(depth))

crates/dav_push/src/register.rs

@@ -17,7 +17,7 @@ pub struct WebPushSubscription {
 
 #[derive(XmlDeserialize, Clone, Debug, PartialEq)]
 pub struct SubscriptionPublicKey {
-    #[xml(ty = "attr", rename = b"type")]
+    #[xml(ty = "attr", rename = "type")]
     pub ty: String,
     #[xml(ty = "text")]
     pub key: String,
@@ -33,7 +33,7 @@ pub struct SubscriptionElement {
 pub struct TriggerElement(#[xml(ty = "untagged", flatten)] Vec<Trigger>);
 
 #[derive(XmlDeserialize, XmlRootTag, Clone, Debug, PartialEq)]
-#[xml(root = b"push-register")]
+#[xml(root = "push-register")]
 #[xml(ns = "rustical_dav::namespace::NS_DAVPUSH")]
 pub struct PushRegister {
     #[xml(ns = "rustical_dav::namespace::NS_DAVPUSH")]

crates/frontend/js-components/deno.json

@@ -11,9 +11,8 @@
     ]
   },
   "imports": {
-    "@deno/vite-plugin": "npm:@deno/vite-plugin@^1.0.4",
-    "lit": "npm:lit@^3.2.1",
-    "vite": "npm:vite@^6.1.1",
-    "webdav": "npm:webdav@^5.8.0"
+    "@deno/vite-plugin": "npm:@deno/vite-plugin@^1.0.5",
+    "lit": "npm:lit@^3.3.1",
+    "vite": "npm:vite@^7.1.7"
   }
 }

crates/frontend/js-components/deno.lock

@@ -1,205 +1,276 @@
 {
-  "version": "4",
+  "version": "5",
   "specifiers": {
-    "npm:@deno/vite-plugin@^1.0.4": "1.0.4_vite@6.3.5__picomatch@4.0.2",
-    "npm:lit@^3.2.1": "3.3.0",
-    "npm:vite@*": "6.3.5_picomatch@4.0.2",
-    "npm:vite@^6.1.1": "6.3.5_picomatch@4.0.2",
-    "npm:webdav@^5.8.0": "5.8.0"
+    "npm:@deno/vite-plugin@^1.0.5": "1.0.5_vite@7.1.7__picomatch@4.0.3",
+    "npm:lit@^3.3.1": "3.3.1",
+    "npm:vite@*": "7.1.7_picomatch@4.0.3",
+    "npm:vite@^7.1.7": "7.1.7_picomatch@4.0.3"
   },
   "npm": {
-    "@buttercup/fetch@0.2.1": {
-      "integrity": "sha512-sCgECOx8wiqY8NN1xN22BqqKzXYIG2AicNLlakOAI4f0WgyLVUbAigMf8CZhBtJxdudTcB1gD5lciqi44jwJvg==",
-      "dependencies": [
-        "node-fetch"
-      ]
-    },
-    "@deno/vite-plugin@1.0.4_vite@6.3.5__picomatch@4.0.2": {
-      "integrity": "sha512-xg8YT8Wn2sGXSnJgiGTpBGX1Dov0c6fd1rAp8VsfrCUtyBRRWzwVMAnd3fQ4yq8h7LSVvJUxEFN4U421k/DQLA==",
+    "@deno/vite-plugin@1.0.5_vite@7.1.7__picomatch@4.0.3": {
+      "integrity": "sha512-tLja5n4dyMhcze1NzvSs2iiriBymfBlDCZIrjMTxb9O2ru0gvmV6mn5oBD2teNw5Sd92cj3YJzKwsAs8tMJXlg==",
       "dependencies": [
         "vite"
       ]
     },
-    "@esbuild/aix-ppc64@0.25.5": {
-      "integrity": "sha512-9o3TMmpmftaCMepOdA5k/yDw8SfInyzWWTjYTFCX3kPSDJMROQTb8jg+h9Cnwnmm1vOzvxN7gIfB5V2ewpjtGA=="
+    "@esbuild/aix-ppc64@0.25.10": {
+      "integrity": "sha512-0NFWnA+7l41irNuaSVlLfgNT12caWJVLzp5eAVhZ0z1qpxbockccEt3s+149rE64VUI3Ml2zt8Nv5JVc4QXTsw==",
+      "os": ["aix"],
+      "cpu": ["ppc64"]
     },
-    "@esbuild/android-arm64@0.25.5": {
-      "integrity": "sha512-VGzGhj4lJO+TVGV1v8ntCZWJktV7SGCs3Pn1GRWI1SBFtRALoomm8k5E9Pmwg3HOAal2VDc2F9+PM/rEY6oIDg=="
+    "@esbuild/android-arm64@0.25.10": {
+      "integrity": "sha512-LSQa7eDahypv/VO6WKohZGPSJDq5OVOo3UoFR1E4t4Gj1W7zEQMUhI+lo81H+DtB+kP+tDgBp+M4oNCwp6kffg==",
+      "os": ["android"],
+      "cpu": ["arm64"]
     },
-    "@esbuild/android-arm@0.25.5": {
-      "integrity": "sha512-AdJKSPeEHgi7/ZhuIPtcQKr5RQdo6OO2IL87JkianiMYMPbCtot9fxPbrMiBADOWWm3T2si9stAiVsGbTQFkbA=="
+    "@esbuild/android-arm@0.25.10": {
+      "integrity": "sha512-dQAxF1dW1C3zpeCDc5KqIYuZ1tgAdRXNoZP7vkBIRtKZPYe2xVr/d3SkirklCHudW1B45tGiUlz2pUWDfbDD4w==",
+      "os": ["android"],
+      "cpu": ["arm"]
     },
-    "@esbuild/android-x64@0.25.5": {
-      "integrity": "sha512-D2GyJT1kjvO//drbRT3Hib9XPwQeWd9vZoBJn+bu/lVsOZ13cqNdDeqIF/xQ5/VmWvMduP6AmXvylO/PIc2isw=="
+    "@esbuild/android-x64@0.25.10": {
+      "integrity": "sha512-MiC9CWdPrfhibcXwr39p9ha1x0lZJ9KaVfvzA0Wxwz9ETX4v5CHfF09bx935nHlhi+MxhA63dKRRQLiVgSUtEg==",
+      "os": ["android"],
+      "cpu": ["x64"]
     },
-    "@esbuild/darwin-arm64@0.25.5": {
-      "integrity": "sha512-GtaBgammVvdF7aPIgH2jxMDdivezgFu6iKpmT+48+F8Hhg5J/sfnDieg0aeG/jfSvkYQU2/pceFPDKlqZzwnfQ=="
+    "@esbuild/darwin-arm64@0.25.10": {
+      "integrity": "sha512-JC74bdXcQEpW9KkV326WpZZjLguSZ3DfS8wrrvPMHgQOIEIG/sPXEN/V8IssoJhbefLRcRqw6RQH2NnpdprtMA==",
+      "os": ["darwin"],
+      "cpu": ["arm64"]
     },
-    "@esbuild/darwin-x64@0.25.5": {
-      "integrity": "sha512-1iT4FVL0dJ76/q1wd7XDsXrSW+oLoquptvh4CLR4kITDtqi2e/xwXwdCVH8hVHU43wgJdsq7Gxuzcs6Iq/7bxQ=="
+    "@esbuild/darwin-x64@0.25.10": {
+      "integrity": "sha512-tguWg1olF6DGqzws97pKZ8G2L7Ig1vjDmGTwcTuYHbuU6TTjJe5FXbgs5C1BBzHbJ2bo1m3WkQDbWO2PvamRcg==",
+      "os": ["darwin"],
+      "cpu": ["x64"]
     },
-    "@esbuild/freebsd-arm64@0.25.5": {
-      "integrity": "sha512-nk4tGP3JThz4La38Uy/gzyXtpkPW8zSAmoUhK9xKKXdBCzKODMc2adkB2+8om9BDYugz+uGV7sLmpTYzvmz6Sw=="
+    "@esbuild/freebsd-arm64@0.25.10": {
+      "integrity": "sha512-3ZioSQSg1HT2N05YxeJWYR+Libe3bREVSdWhEEgExWaDtyFbbXWb49QgPvFH8u03vUPX10JhJPcz7s9t9+boWg==",
+      "os": ["freebsd"],
+      "cpu": ["arm64"]
     },
-    "@esbuild/freebsd-x64@0.25.5": {
-      "integrity": "sha512-PrikaNjiXdR2laW6OIjlbeuCPrPaAl0IwPIaRv+SMV8CiM8i2LqVUHFC1+8eORgWyY7yhQY+2U2fA55mBzReaw=="
+    "@esbuild/freebsd-x64@0.25.10": {
+      "integrity": "sha512-LLgJfHJk014Aa4anGDbh8bmI5Lk+QidDmGzuC2D+vP7mv/GeSN+H39zOf7pN5N8p059FcOfs2bVlrRr4SK9WxA==",
+      "os": ["freebsd"],
+      "cpu": ["x64"]
     },
-    "@esbuild/linux-arm64@0.25.5": {
-      "integrity": "sha512-Z9kfb1v6ZlGbWj8EJk9T6czVEjjq2ntSYLY2cw6pAZl4oKtfgQuS4HOq41M/BcoLPzrUbNd+R4BXFyH//nHxVg=="
+    "@esbuild/linux-arm64@0.25.10": {
+      "integrity": "sha512-5luJWN6YKBsawd5f9i4+c+geYiVEw20FVW5x0v1kEMWNq8UctFjDiMATBxLvmmHA4bf7F6hTRaJgtghFr9iziQ==",
+      "os": ["linux"],
+      "cpu": ["arm64"]
     },
-    "@esbuild/linux-arm@0.25.5": {
-      "integrity": "sha512-cPzojwW2okgh7ZlRpcBEtsX7WBuqbLrNXqLU89GxWbNt6uIg78ET82qifUy3W6OVww6ZWobWub5oqZOVtwolfw=="
+    "@esbuild/linux-arm@0.25.10": {
+      "integrity": "sha512-oR31GtBTFYCqEBALI9r6WxoU/ZofZl962pouZRTEYECvNF/dtXKku8YXcJkhgK/beU+zedXfIzHijSRapJY3vg==",
+      "os": ["linux"],
+      "cpu": ["arm"]
     },
-    "@esbuild/linux-ia32@0.25.5": {
-      "integrity": "sha512-sQ7l00M8bSv36GLV95BVAdhJ2QsIbCuCjh/uYrWiMQSUuV+LpXwIqhgJDcvMTj+VsQmqAHL2yYaasENvJ7CDKA=="
+    "@esbuild/linux-ia32@0.25.10": {
+      "integrity": "sha512-NrSCx2Kim3EnnWgS4Txn0QGt0Xipoumb6z6sUtl5bOEZIVKhzfyp/Lyw4C1DIYvzeW/5mWYPBFJU3a/8Yr75DQ==",
+      "os": ["linux"],
+      "cpu": ["ia32"]
     },
-    "@esbuild/linux-loong64@0.25.5": {
-      "integrity": "sha512-0ur7ae16hDUC4OL5iEnDb0tZHDxYmuQyhKhsPBV8f99f6Z9KQM02g33f93rNH5A30agMS46u2HP6qTdEt6Q1kg=="
+    "@esbuild/linux-loong64@0.25.10": {
+      "integrity": "sha512-xoSphrd4AZda8+rUDDfD9J6FUMjrkTz8itpTITM4/xgerAZZcFW7Dv+sun7333IfKxGG8gAq+3NbfEMJfiY+Eg==",
+      "os": ["linux"],
+      "cpu": ["loong64"]
     },
-    "@esbuild/linux-mips64el@0.25.5": {
-      "integrity": "sha512-kB/66P1OsHO5zLz0i6X0RxlQ+3cu0mkxS3TKFvkb5lin6uwZ/ttOkP3Z8lfR9mJOBk14ZwZ9182SIIWFGNmqmg=="
+    "@esbuild/linux-mips64el@0.25.10": {
+      "integrity": "sha512-ab6eiuCwoMmYDyTnyptoKkVS3k8fy/1Uvq7Dj5czXI6DF2GqD2ToInBI0SHOp5/X1BdZ26RKc5+qjQNGRBelRA==",
+      "os": ["linux"],
+      "cpu": ["mips64el"]
     },
-    "@esbuild/linux-ppc64@0.25.5": {
-      "integrity": "sha512-UZCmJ7r9X2fe2D6jBmkLBMQetXPXIsZjQJCjgwpVDz+YMcS6oFR27alkgGv3Oqkv07bxdvw7fyB71/olceJhkQ=="
+    "@esbuild/linux-ppc64@0.25.10": {
+      "integrity": "sha512-NLinzzOgZQsGpsTkEbdJTCanwA5/wozN9dSgEl12haXJBzMTpssebuXR42bthOF3z7zXFWH1AmvWunUCkBE4EA==",
+      "os": ["linux"],
+      "cpu": ["ppc64"]
     },
-    "@esbuild/linux-riscv64@0.25.5": {
-      "integrity": "sha512-kTxwu4mLyeOlsVIFPfQo+fQJAV9mh24xL+y+Bm6ej067sYANjyEw1dNHmvoqxJUCMnkBdKpvOn0Ahql6+4VyeA=="
+    "@esbuild/linux-riscv64@0.25.10": {
+      "integrity": "sha512-FE557XdZDrtX8NMIeA8LBJX3dC2M8VGXwfrQWU7LB5SLOajfJIxmSdyL/gU1m64Zs9CBKvm4UAuBp5aJ8OgnrA==",
+      "os": ["linux"],
+      "cpu": ["riscv64"]
     },
-    "@esbuild/linux-s390x@0.25.5": {
-      "integrity": "sha512-K2dSKTKfmdh78uJ3NcWFiqyRrimfdinS5ErLSn3vluHNeHVnBAFWC8a4X5N+7FgVE1EjXS1QDZbpqZBjfrqMTQ=="
+    "@esbuild/linux-s390x@0.25.10": {
+      "integrity": "sha512-3BBSbgzuB9ajLoVZk0mGu+EHlBwkusRmeNYdqmznmMc9zGASFjSsxgkNsqmXugpPk00gJ0JNKh/97nxmjctdew==",
+      "os": ["linux"],
+      "cpu": ["s390x"]
     },
-    "@esbuild/linux-x64@0.25.5": {
-      "integrity": "sha512-uhj8N2obKTE6pSZ+aMUbqq+1nXxNjZIIjCjGLfsWvVpy7gKCOL6rsY1MhRh9zLtUtAI7vpgLMK6DxjO8Qm9lJw=="
+    "@esbuild/linux-x64@0.25.10": {
+      "integrity": "sha512-QSX81KhFoZGwenVyPoberggdW1nrQZSvfVDAIUXr3WqLRZGZqWk/P4T8p2SP+de2Sr5HPcvjhcJzEiulKgnxtA==",
+      "os": ["linux"],
+      "cpu": ["x64"]
     },
-    "@esbuild/netbsd-arm64@0.25.5": {
-      "integrity": "sha512-pwHtMP9viAy1oHPvgxtOv+OkduK5ugofNTVDilIzBLpoWAM16r7b/mxBvfpuQDpRQFMfuVr5aLcn4yveGvBZvw=="
+    "@esbuild/netbsd-arm64@0.25.10": {
+      "integrity": "sha512-AKQM3gfYfSW8XRk8DdMCzaLUFB15dTrZfnX8WXQoOUpUBQ+NaAFCP1kPS/ykbbGYz7rxn0WS48/81l9hFl3u4A==",
+      "os": ["netbsd"],
+      "cpu": ["arm64"]
     },
-    "@esbuild/netbsd-x64@0.25.5": {
-      "integrity": "sha512-WOb5fKrvVTRMfWFNCroYWWklbnXH0Q5rZppjq0vQIdlsQKuw6mdSihwSo4RV/YdQ5UCKKvBy7/0ZZYLBZKIbwQ=="
+    "@esbuild/netbsd-x64@0.25.10": {
+      "integrity": "sha512-7RTytDPGU6fek/hWuN9qQpeGPBZFfB4zZgcz2VK2Z5VpdUxEI8JKYsg3JfO0n/Z1E/6l05n0unDCNc4HnhQGig==",
+      "os": ["netbsd"],
+      "cpu": ["x64"]
     },
-    "@esbuild/openbsd-arm64@0.25.5": {
-      "integrity": "sha512-7A208+uQKgTxHd0G0uqZO8UjK2R0DDb4fDmERtARjSHWxqMTye4Erz4zZafx7Di9Cv+lNHYuncAkiGFySoD+Mw=="
+    "@esbuild/openbsd-arm64@0.25.10": {
+      "integrity": "sha512-5Se0VM9Wtq797YFn+dLimf2Zx6McttsH2olUBsDml+lm0GOCRVebRWUvDtkY4BWYv/3NgzS8b/UM3jQNh5hYyw==",
+      "os": ["openbsd"],
+      "cpu": ["arm64"]
     },
-    "@esbuild/openbsd-x64@0.25.5": {
-      "integrity": "sha512-G4hE405ErTWraiZ8UiSoesH8DaCsMm0Cay4fsFWOOUcz8b8rC6uCvnagr+gnioEjWn0wC+o1/TAHt+It+MpIMg=="
+    "@esbuild/openbsd-x64@0.25.10": {
+      "integrity": "sha512-XkA4frq1TLj4bEMB+2HnI0+4RnjbuGZfet2gs/LNs5Hc7D89ZQBHQ0gL2ND6Lzu1+QVkjp3x1gIcPKzRNP8bXw==",
+      "os": ["openbsd"],
+      "cpu": ["x64"]
     },
-    "@esbuild/sunos-x64@0.25.5": {
-      "integrity": "sha512-l+azKShMy7FxzY0Rj4RCt5VD/q8mG/e+mDivgspo+yL8zW7qEwctQ6YqKX34DTEleFAvCIUviCFX1SDZRSyMQA=="
+    "@esbuild/openharmony-arm64@0.25.10": {
+      "integrity": "sha512-AVTSBhTX8Y/Fz6OmIVBip9tJzZEUcY8WLh7I59+upa5/GPhh2/aM6bvOMQySspnCCHvFi79kMtdJS1w0DXAeag==",
+      "os": ["openharmony"],
+      "cpu": ["arm64"]
     },
-    "@esbuild/win32-arm64@0.25.5": {
-      "integrity": "sha512-O2S7SNZzdcFG7eFKgvwUEZ2VG9D/sn/eIiz8XRZ1Q/DO5a3s76Xv0mdBzVM5j5R639lXQmPmSo0iRpHqUUrsxw=="
+    "@esbuild/sunos-x64@0.25.10": {
+      "integrity": "sha512-fswk3XT0Uf2pGJmOpDB7yknqhVkJQkAQOcW/ccVOtfx05LkbWOaRAtn5SaqXypeKQra1QaEa841PgrSL9ubSPQ==",
+      "os": ["sunos"],
+      "cpu": ["x64"]
     },
-    "@esbuild/win32-ia32@0.25.5": {
-      "integrity": "sha512-onOJ02pqs9h1iMJ1PQphR+VZv8qBMQ77Klcsqv9CNW2w6yLqoURLcgERAIurY6QE63bbLuqgP9ATqajFLK5AMQ=="
+    "@esbuild/win32-arm64@0.25.10": {
+      "integrity": "sha512-ah+9b59KDTSfpaCg6VdJoOQvKjI33nTaQr4UluQwW7aEwZQsbMCfTmfEO4VyewOxx4RaDT/xCy9ra2GPWmO7Kw==",
+      "os": ["win32"],
+      "cpu": ["arm64"]
     },
-    "@esbuild/win32-x64@0.25.5": {
-      "integrity": "sha512-TXv6YnJ8ZMVdX+SXWVBo/0p8LTcrUYngpWjvm91TMjjBQii7Oz11Lw5lbDV5Y0TzuhSJHwiH4hEtC1I42mMS0g=="
+    "@esbuild/win32-ia32@0.25.10": {
+      "integrity": "sha512-QHPDbKkrGO8/cz9LKVnJU22HOi4pxZnZhhA2HYHez5Pz4JeffhDjf85E57Oyco163GnzNCVkZK0b/n4Y0UHcSw==",
+      "os": ["win32"],
+      "cpu": ["ia32"]
     },
-    "@lit-labs/ssr-dom-shim@1.3.0": {
-      "integrity": "sha512-nQIWonJ6eFAvUUrSlwyHDm/aE8PBDu5kRpL0vHMg6K8fK3Diq1xdPjTnsJSwxABhaZ+5eBi1btQB5ShUTKo4nQ=="
+    "@esbuild/win32-x64@0.25.10": {
+      "integrity": "sha512-9KpxSVFCu0iK1owoez6aC/s/EdUQLDN3adTxGCqxMVhrPDj6bt5dbrHDXUuq+Bs2vATFBBrQS5vdQ/Ed2P+nbw==",
+      "os": ["win32"],
+      "cpu": ["x64"]
     },
-    "@lit/reactive-element@2.1.0": {
-      "integrity": "sha512-L2qyoZSQClcBmq0qajBVbhYEcG6iK0XfLn66ifLe/RfC0/ihpc+pl0Wdn8bJ8o+hj38cG0fGXRgSS20MuXn7qA==",
+    "@lit-labs/ssr-dom-shim@1.4.0": {
+      "integrity": "sha512-ficsEARKnmmW5njugNYKipTm4SFnbik7CXtoencDZzmzo/dQ+2Q0bgkzJuoJP20Aj0F+izzJjOqsnkd6F/o1bw=="
+    },
+    "@lit/reactive-element@2.1.1": {
+      "integrity": "sha512-N+dm5PAYdQ8e6UlywyyrgI2t++wFGXfHx+dSJ1oBrg6FAxUj40jId++EaRm80MKX5JnlH1sBsyZ5h0bcZKemCg==",
       "dependencies": [
         "@lit-labs/ssr-dom-shim"
       ]
     },
-    "@rollup/rollup-android-arm-eabi@4.43.0": {
-      "integrity": "sha512-Krjy9awJl6rKbruhQDgivNbD1WuLb8xAclM4IR4cN5pHGAs2oIMMQJEiC3IC/9TZJ+QZkmZhlMO/6MBGxPidpw=="
+    "@rollup/rollup-android-arm-eabi@4.52.2": {
+      "integrity": "sha512-o3pcKzJgSGt4d74lSZ+OCnHwkKBeAbFDmbEm5gg70eA8VkyCuC/zV9TwBnmw6VjDlRdF4Pshfb+WE9E6XY1PoQ==",
+      "os": ["android"],
+      "cpu": ["arm"]
     },
-    "@rollup/rollup-android-arm64@4.43.0": {
-      "integrity": "sha512-ss4YJwRt5I63454Rpj+mXCXicakdFmKnUNxr1dLK+5rv5FJgAxnN7s31a5VchRYxCFWdmnDWKd0wbAdTr0J5EA=="
+    "@rollup/rollup-android-arm64@4.52.2": {
+      "integrity": "sha512-cqFSWO5tX2vhC9hJTK8WAiPIm4Q8q/cU8j2HQA0L3E1uXvBYbOZMhE2oFL8n2pKB5sOCHY6bBuHaRwG7TkfJyw==",
+      "os": ["android"],
+      "cpu": ["arm64"]
     },
-    "@rollup/rollup-darwin-arm64@4.43.0": {
-      "integrity": "sha512-eKoL8ykZ7zz8MjgBenEF2OoTNFAPFz1/lyJ5UmmFSz5jW+7XbH1+MAgCVHy72aG59rbuQLcJeiMrP8qP5d/N0A=="
+    "@rollup/rollup-darwin-arm64@4.52.2": {
+      "integrity": "sha512-vngduywkkv8Fkh3wIZf5nFPXzWsNsVu1kvtLETWxTFf/5opZmflgVSeLgdHR56RQh71xhPhWoOkEBvbehwTlVA==",
+      "os": ["darwin"],
+      "cpu": ["arm64"]
     },
-    "@rollup/rollup-darwin-x64@4.43.0": {
-      "integrity": "sha512-SYwXJgaBYW33Wi/q4ubN+ldWC4DzQY62S4Ll2dgfr/dbPoF50dlQwEaEHSKrQdSjC6oIe1WgzosoaNoHCdNuMg=="
+    "@rollup/rollup-darwin-x64@4.52.2": {
+      "integrity": "sha512-h11KikYrUCYTrDj6h939hhMNlqU2fo/X4NB0OZcys3fya49o1hmFaczAiJWVAFgrM1NCP6RrO7lQKeVYSKBPSQ==",
+      "os": ["darwin"],
+      "cpu": ["x64"]
     },
-    "@rollup/rollup-freebsd-arm64@4.43.0": {
-      "integrity": "sha512-SV+U5sSo0yujrjzBF7/YidieK2iF6E7MdF6EbYxNz94lA+R0wKl3SiixGyG/9Klab6uNBIqsN7j4Y/Fya7wAjQ=="
+    "@rollup/rollup-freebsd-arm64@4.52.2": {
+      "integrity": "sha512-/eg4CI61ZUkLXxMHyVlmlGrSQZ34xqWlZNW43IAU4RmdzWEx0mQJ2mN/Cx4IHLVZFL6UBGAh+/GXhgvGb+nVxw==",
+      "os": ["freebsd"],
+      "cpu": ["arm64"]
     },
-    "@rollup/rollup-freebsd-x64@4.43.0": {
-      "integrity": "sha512-J7uCsiV13L/VOeHJBo5SjasKiGxJ0g+nQTrBkAsmQBIdil3KhPnSE9GnRon4ejX1XDdsmK/l30IYLiAaQEO0Cg=="
+    "@rollup/rollup-freebsd-x64@4.52.2": {
+      "integrity": "sha512-QOWgFH5X9+p+S1NAfOqc0z8qEpJIoUHf7OWjNUGOeW18Mx22lAUOiA9b6r2/vpzLdfxi/f+VWsYjUOMCcYh0Ng==",
+      "os": ["freebsd"],
+      "cpu": ["x64"]
     },
-    "@rollup/rollup-linux-arm-gnueabihf@4.43.0": {
-      "integrity": "sha512-gTJ/JnnjCMc15uwB10TTATBEhK9meBIY+gXP4s0sHD1zHOaIh4Dmy1X9wup18IiY9tTNk5gJc4yx9ctj/fjrIw=="
+    "@rollup/rollup-linux-arm-gnueabihf@4.52.2": {
+      "integrity": "sha512-kDWSPafToDd8LcBYd1t5jw7bD5Ojcu12S3uT372e5HKPzQt532vW+rGFFOaiR0opxePyUkHrwz8iWYEyH1IIQA==",
+      "os": ["linux"],
+      "cpu": ["arm"]
     },
-    "@rollup/rollup-linux-arm-musleabihf@4.43.0": {
-      "integrity": "sha512-ZJ3gZynL1LDSIvRfz0qXtTNs56n5DI2Mq+WACWZ7yGHFUEirHBRt7fyIk0NsCKhmRhn7WAcjgSkSVVxKlPNFFw=="
+    "@rollup/rollup-linux-arm-musleabihf@4.52.2": {
+      "integrity": "sha512-gKm7Mk9wCv6/rkzwCiUC4KnevYhlf8ztBrDRT9g/u//1fZLapSRc+eDZj2Eu2wpJ+0RzUKgtNijnVIB4ZxyL+w==",
+      "os": ["linux"],
+      "cpu": ["arm"]
     },
-    "@rollup/rollup-linux-arm64-gnu@4.43.0": {
-      "integrity": "sha512-8FnkipasmOOSSlfucGYEu58U8cxEdhziKjPD2FIa0ONVMxvl/hmONtX/7y4vGjdUhjcTHlKlDhw3H9t98fPvyA=="
+    "@rollup/rollup-linux-arm64-gnu@4.52.2": {
+      "integrity": "sha512-66lA8vnj5mB/rtDNwPgrrKUOtCLVQypkyDa2gMfOefXK6rcZAxKLO9Fy3GkW8VkPnENv9hBkNOFfGLf6rNKGUg==",
+      "os": ["linux"],
+      "cpu": ["arm64"]
     },
-    "@rollup/rollup-linux-arm64-musl@4.43.0": {
-      "integrity": "sha512-KPPyAdlcIZ6S9C3S2cndXDkV0Bb1OSMsX0Eelr2Bay4EsF9yi9u9uzc9RniK3mcUGCLhWY9oLr6er80P5DE6XA=="
+    "@rollup/rollup-linux-arm64-musl@4.52.2": {
+      "integrity": "sha512-s+OPucLNdJHvuZHuIz2WwncJ+SfWHFEmlC5nKMUgAelUeBUnlB4wt7rXWiyG4Zn07uY2Dd+SGyVa9oyLkVGOjA==",
+      "os": ["linux"],
+      "cpu": ["arm64"]
     },
-    "@rollup/rollup-linux-loongarch64-gnu@4.43.0": {
-      "integrity": "sha512-HPGDIH0/ZzAZjvtlXj6g+KDQ9ZMHfSP553za7o2Odegb/BEfwJcR0Sw0RLNpQ9nC6Gy8s+3mSS9xjZ0n3rhcYg=="
+    "@rollup/rollup-linux-loong64-gnu@4.52.2": {
+      "integrity": "sha512-8wTRM3+gVMDLLDdaT6tKmOE3lJyRy9NpJUS/ZRWmLCmOPIJhVyXwjBo+XbrrwtV33Em1/eCTd5TuGJm4+DmYjw==",
+      "os": ["linux"],
+      "cpu": ["loong64"]
     },
-    "@rollup/rollup-linux-powerpc64le-gnu@4.43.0": {
-      "integrity": "sha512-gEmwbOws4U4GLAJDhhtSPWPXUzDfMRedT3hFMyRAvM9Mrnj+dJIFIeL7otsv2WF3D7GrV0GIewW0y28dOYWkmw=="
+    "@rollup/rollup-linux-ppc64-gnu@4.52.2": {
+      "integrity": "sha512-6yqEfgJ1anIeuP2P/zhtfBlDpXUb80t8DpbYwXQ3bQd95JMvUaqiX+fKqYqUwZXqdJDd8xdilNtsHM2N0cFm6A==",
+      "os": ["linux"],
+      "cpu": ["ppc64"]
     },
-    "@rollup/rollup-linux-riscv64-gnu@4.43.0": {
-      "integrity": "sha512-XXKvo2e+wFtXZF/9xoWohHg+MuRnvO29TI5Hqe9xwN5uN8NKUYy7tXUG3EZAlfchufNCTHNGjEx7uN78KsBo0g=="
+    "@rollup/rollup-linux-riscv64-gnu@4.52.2": {
+      "integrity": "sha512-sshYUiYVSEI2B6dp4jMncwxbrUqRdNApF2c3bhtLAU0qA8Lrri0p0NauOsTWh3yCCCDyBOjESHMExonp7Nzc0w==",
+      "os": ["linux"],
+      "cpu": ["riscv64"]
     },
-    "@rollup/rollup-linux-riscv64-musl@4.43.0": {
-      "integrity": "sha512-ruf3hPWhjw6uDFsOAzmbNIvlXFXlBQ4nk57Sec8E8rUxs/AI4HD6xmiiasOOx/3QxS2f5eQMKTAwk7KHwpzr/Q=="
+    "@rollup/rollup-linux-riscv64-musl@4.52.2": {
+      "integrity": "sha512-duBLgd+3pqC4MMwBrKkFxaZerUxZcYApQVC5SdbF5/e/589GwVvlRUnyqMFbM8iUSb1BaoX/3fRL7hB9m2Pj8Q==",
+      "os": ["linux"],
+      "cpu": ["riscv64"]
     },
-    "@rollup/rollup-linux-s390x-gnu@4.43.0": {
-      "integrity": "sha512-QmNIAqDiEMEvFV15rsSnjoSmO0+eJLoKRD9EAa9rrYNwO/XRCtOGM3A5A0X+wmG+XRrw9Fxdsw+LnyYiZWWcVw=="
+    "@rollup/rollup-linux-s390x-gnu@4.52.2": {
+      "integrity": "sha512-tzhYJJidDUVGMgVyE+PmxENPHlvvqm1KILjjZhB8/xHYqAGeizh3GBGf9u6WdJpZrz1aCpIIHG0LgJgH9rVjHQ==",
+      "os": ["linux"],
+      "cpu": ["s390x"]
     },
-    "@rollup/rollup-linux-x64-gnu@4.43.0": {
-      "integrity": "sha512-jAHr/S0iiBtFyzjhOkAics/2SrXE092qyqEg96e90L3t9Op8OTzS6+IX0Fy5wCt2+KqeHAkti+eitV0wvblEoQ=="
+    "@rollup/rollup-linux-x64-gnu@4.52.2": {
+      "integrity": "sha512-opH8GSUuVcCSSyHHcl5hELrmnk4waZoVpgn/4FDao9iyE4WpQhyWJ5ryl5M3ocp4qkRuHfyXnGqg8M9oKCEKRA==",
+      "os": ["linux"],
+      "cpu": ["x64"]
     },
-    "@rollup/rollup-linux-x64-musl@4.43.0": {
-      "integrity": "sha512-3yATWgdeXyuHtBhrLt98w+5fKurdqvs8B53LaoKD7P7H7FKOONLsBVMNl9ghPQZQuYcceV5CDyPfyfGpMWD9mQ=="
+    "@rollup/rollup-linux-x64-musl@4.52.2": {
+      "integrity": "sha512-LSeBHnGli1pPKVJ79ZVJgeZWWZXkEe/5o8kcn23M8eMKCUANejchJbF/JqzM4RRjOJfNRhKJk8FuqL1GKjF5oQ==",
+      "os": ["linux"],
+      "cpu": ["x64"]
     },
-    "@rollup/rollup-win32-arm64-msvc@4.43.0": {
-      "integrity": "sha512-wVzXp2qDSCOpcBCT5WRWLmpJRIzv23valvcTwMHEobkjippNf+C3ys/+wf07poPkeNix0paTNemB2XrHr2TnGw=="
+    "@rollup/rollup-openharmony-arm64@4.52.2": {
+      "integrity": "sha512-uPj7MQ6/s+/GOpolavm6BPo+6CbhbKYyZHUDvZ/SmJM7pfDBgdGisFX3bY/CBDMg2ZO4utfhlApkSfZ92yXw7Q==",
+      "os": ["openharmony"],
+      "cpu": ["arm64"]
     },
-    "@rollup/rollup-win32-ia32-msvc@4.43.0": {
-      "integrity": "sha512-fYCTEyzf8d+7diCw8b+asvWDCLMjsCEA8alvtAutqJOJp/wL5hs1rWSqJ1vkjgW0L2NB4bsYJrpKkiIPRR9dvw=="
+    "@rollup/rollup-win32-arm64-msvc@4.52.2": {
+      "integrity": "sha512-Z9MUCrSgIaUeeHAiNkm3cQyst2UhzjPraR3gYYfOjAuZI7tcFRTOD+4cHLPoS/3qinchth+V56vtqz1Tv+6KPA==",
+      "os": ["win32"],
+      "cpu": ["arm64"]
     },
-    "@rollup/rollup-win32-x64-msvc@4.43.0": {
-      "integrity": "sha512-SnGhLiE5rlK0ofq8kzuDkM0g7FN1s5VYY+YSMTibP7CqShxCQvqtNxTARS4xX4PFJfHjG0ZQYX9iGzI3FQh5Aw=="
+    "@rollup/rollup-win32-ia32-msvc@4.52.2": {
+      "integrity": "sha512-+GnYBmpjldD3XQd+HMejo+0gJGwYIOfFeoBQv32xF/RUIvccUz20/V6Otdv+57NE70D5pa8W/jVGDoGq0oON4A==",
+      "os": ["win32"],
+      "cpu": ["ia32"]
     },
-    "@types/estree@1.0.7": {
-      "integrity": "sha512-w28IoSUCJpidD/TGviZwwMJckNESJZXFu7NBZ5YJ4mEUnNraUn9Pm8HSZm/jDF1pDWYKspWE7oVphigUPRakIQ=="
+    "@rollup/rollup-win32-x64-gnu@4.52.2": {
+      "integrity": "sha512-ApXFKluSB6kDQkAqZOKXBjiaqdF1BlKi+/eqnYe9Ee7U2K3pUDKsIyr8EYm/QDHTJIM+4X+lI0gJc3TTRhd+dA==",
+      "os": ["win32"],
+      "cpu": ["x64"]
+    },
+    "@rollup/rollup-win32-x64-msvc@4.52.2": {
+      "integrity": "sha512-ARz+Bs8kY6FtitYM96PqPEVvPXqEZmPZsSkXvyX19YzDqkCaIlhCieLLMI5hxO9SRZ2XtCtm8wxhy0iJ2jxNfw==",
+      "os": ["win32"],
+      "cpu": ["x64"]
+    },
+    "@types/estree@1.0.8": {
+      "integrity": "sha512-dWHzHa2WqEXI/O1E9OjrocMTKJl2mSrEolh1Iomrv6U+JuNwaHXsXx9bLu5gG7BUWFIN0skIQJQ/L1rIex4X6w=="
     },
     "@types/trusted-types@2.0.7": {
       "integrity": "sha512-ScaPdn1dQczgbl0QFTeTOmVHFULt394XJgOQNoyVhZ6r2vLnMLJfBPd53SB52T/3G36VI1/g2MZaX0cwDuXsfw=="
     },
-    "balanced-match@1.0.2": {
-      "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw=="
-    },
-    "base-64@1.0.0": {
-      "integrity": "sha512-kwDPIFCGx0NZHog36dj+tHiwP4QMzsZ3AgMViUBKI0+V5n4U0ufTCUMhnQ04diaRI8EX/QcPfql7zlhZ7j4zgg=="
-    },
-    "brace-expansion@2.0.2": {
-      "integrity": "sha512-Jt0vHyM+jmUBqojB7E1NIYadt0vI0Qxjxd2TErW94wDz+E2LAm5vKMXXwg6ZZBTHPuUlDgQHKXvjGBdfcF1ZDQ==",
-      "dependencies": [
-        "balanced-match"
-      ]
-    },
-    "byte-length@1.0.2": {
-      "integrity": "sha512-ovBpjmsgd/teRmgcPh23d4gJvxDoXtAzEL9xTfMU8Yc2kqCDb7L9jAG0XHl1nzuGl+h3ebCIF1i62UFyA9V/2Q=="
-    },
-    "charenc@0.0.2": {
-      "integrity": "sha512-yrLQ/yVUFXkzg7EDQsPieE/53+0RlaWTs+wBrvW36cyilJ2SaDWfl4Yj7MtLTXleV9uEKefbAGUPv2/iWSooRA=="
-    },
-    "crypt@0.0.2": {
-      "integrity": "sha512-mCxBlsHFYh9C+HVpiEacem8FEBnMXgU9gy4zmNC+SXAZNB/1idgp/aulFJ4FgCi7GPEVbfyng092GqL2k2rmow=="
-    },
-    "data-uri-to-buffer@4.0.1": {
-      "integrity": "sha512-0R9ikRb668HB7QDxT1vkpuUBtqc53YyAwMwGeUFKRojY/NWKvdZ+9UYtRfGmhqNbRkTSVpMbmyhXipFFv2cb/A=="
-    },
-    "entities@6.0.1": {
-      "integrity": "sha512-aN97NXWF6AWBTahfVOIrB/NShkzi5H7F9r1s9mD3cDj4Ko5f2qhhVoYMibXF7GlLveb/D2ioWay8lxI97Ven3g=="
-    },
-    "esbuild@0.25.5": {
-      "integrity": "sha512-P8OtKZRv/5J5hhz0cUAdu/cLuPIKXpQl1R9pZtvmHWQvrAUVd0UNIPT4IB4W3rNOqVO0rlqHmCIbSwxh/c9yUQ==",
-      "dependencies": [
+    "esbuild@0.25.10": {
+      "integrity": "sha512-9RiGKvCwaqxO2owP61uQ4BgNborAQskMR6QusfWzQqv7AZOg5oGehdY2pRJMTKuwxd1IDBP4rSbI5lHzU7SMsQ==",
+      "optionalDependencies": [
         "@esbuild/aix-ppc64",
         "@esbuild/android-arm",
         "@esbuild/android-arm64",
@@ -221,128 +292,75 @@
         "@esbuild/netbsd-x64",
         "@esbuild/openbsd-arm64",
         "@esbuild/openbsd-x64",
+        "@esbuild/openharmony-arm64",
         "@esbuild/sunos-x64",
         "@esbuild/win32-arm64",
         "@esbuild/win32-ia32",
         "@esbuild/win32-x64"
-      ]
+      ],
+      "scripts": true,
+      "bin": true
     },
-    "fast-xml-parser@4.5.3": {
-      "integrity": "sha512-RKihhV+SHsIUGXObeVy9AXiBbFwkVk7Syp8XgwN5U3JV416+Gwp/GO9i0JYKmikykgz/UHRrrV4ROuZEo/T0ig==",
-      "dependencies": [
-        "strnum"
-      ]
-    },
-    "fdir@6.4.6_picomatch@4.0.2": {
-      "integrity": "sha512-hiFoqpyZcfNm1yc4u8oWCf9A2c4D3QjCrks3zmoVKVxpQRzmPNar1hUJcBG2RQHvEVGDN+Jm81ZheVLAQMK6+w==",
+    "fdir@6.5.0_picomatch@4.0.3": {
+      "integrity": "sha512-tIbYtZbucOs0BRGqPJkshJUYdL+SDH7dVM8gjy+ERp3WAUjLEFJE+02kanyHtwjWOnwrKYBiwAmM0p4kLJAnXg==",
       "dependencies": [
         "picomatch"
+      ],
+      "optionalPeers": [
+        "picomatch"
       ]
     },
-    "fetch-blob@3.2.0": {
-      "integrity": "sha512-7yAQpD2UMJzLi1Dqv7qFYnPbaPx7ZfFK6PiIxQ4PfkGPyNyl2Ugx+a/umUonmKqjhM4DnfbMvdX6otXq83soQQ==",
-      "dependencies": [
-        "node-domexception",
-        "web-streams-polyfill"
-      ]
-    },
-    "formdata-polyfill@4.0.10": {
-      "integrity": "sha512-buewHzMvYL29jdeQTVILecSaZKnt/RJWjoZCF5OW60Z67/GmSLBkOFM7qh1PI3zFNtJbaZL5eQu1vLfazOwj4g==",
-      "dependencies": [
-        "fetch-blob"
-      ]
-    },
     "fsevents@2.3.3": {
-      "integrity": "sha512-5xoDfX+fL7faATnagmWPpbFtwh/R77WmMMqqHGS65C3vvB0YHrgF+B1YmZ3441tMj5n63k0212XNoJwzlhffQw=="
+      "integrity": "sha512-5xoDfX+fL7faATnagmWPpbFtwh/R77WmMMqqHGS65C3vvB0YHrgF+B1YmZ3441tMj5n63k0212XNoJwzlhffQw==",
+      "os": ["darwin"],
+      "scripts": true
     },
-    "hot-patcher@2.0.1": {
-      "integrity": "sha512-ECg1JFG0YzehicQaogenlcs2qg6WsXQsxtnbr1i696u5tLUjtJdQAh0u2g0Q5YV45f263Ta1GnUJsc8WIfJf4Q=="
-    },
-    "is-buffer@1.1.6": {
-      "integrity": "sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w=="
-    },
-    "layerr@3.0.0": {
-      "integrity": "sha512-tv754Ki2dXpPVApOrjTyRo4/QegVb9eVFq4mjqp4+NM5NaX7syQvN5BBNfV/ZpAHCEHV24XdUVrBAoka4jt3pA=="
-    },
-    "lit-element@4.2.0": {
-      "integrity": "sha512-MGrXJVAI5x+Bfth/pU9Kst1iWID6GHDLEzFEnyULB/sFiRLgkd8NPK/PeeXxktA3T6EIIaq8U3KcbTU5XFcP2Q==",
+    "lit-element@4.2.1": {
+      "integrity": "sha512-WGAWRGzirAgyphK2urmYOV72tlvnxw7YfyLDgQ+OZnM9vQQBQnumQ7jUJe6unEzwGU3ahFOjuz1iz1jjrpCPuw==",
       "dependencies": [
         "@lit-labs/ssr-dom-shim",
         "@lit/reactive-element",
         "lit-html"
       ]
     },
-    "lit-html@3.3.0": {
-      "integrity": "sha512-RHoswrFAxY2d8Cf2mm4OZ1DgzCoBKUKSPvA1fhtSELxUERq2aQQ2h05pO9j81gS1o7RIRJ+CePLogfyahwmynw==",
+    "lit-html@3.3.1": {
+      "integrity": "sha512-S9hbyDu/vs1qNrithiNyeyv64c9yqiW9l+DBgI18fL+MTvOtWoFR0FWiyq1TxaYef5wNlpEmzlXoBlZEO+WjoA==",
       "dependencies": [
         "@types/trusted-types"
       ]
     },
-    "lit@3.3.0": {
-      "integrity": "sha512-DGVsqsOIHBww2DqnuZzW7QsuCdahp50ojuDaBPC7jUDRpYoH0z7kHBBYZewRzer75FwtrkmkKk7iOAwSaWdBmw==",
+    "lit@3.3.1": {
+      "integrity": "sha512-Ksr/8L3PTapbdXJCk+EJVB78jDodUMaP54gD24W186zGRARvwrsPfS60wae/SSCTCNZVPd1chXqio1qHQmu4NA==",
       "dependencies": [
         "@lit/reactive-element",
         "lit-element",
         "lit-html"
       ]
     },
-    "md5@2.3.0": {
-      "integrity": "sha512-T1GITYmFaKuO91vxyoQMFETst+O71VUPEU3ze5GNzDm0OWdP8v1ziTaAEPUr/3kLsY3Sftgz242A1SetQiDL7g==",
-      "dependencies": [
-        "charenc",
-        "crypt",
-        "is-buffer"
-      ]
-    },
-    "minimatch@9.0.5": {
-      "integrity": "sha512-G6T0ZX48xgozx7587koeX9Ys2NYy6Gmv//P89sEte9V9whIapMNF4idKxnW2QtCcLiTWlb/wfCabAtAFWhhBow==",
-      "dependencies": [
-        "brace-expansion"
-      ]
-    },
     "nanoid@3.3.11": {
-      "integrity": "sha512-N8SpfPUnUp1bK+PMYW8qSWdl9U+wwNWI4QKxOYDy9JAro3WMX7p2OeVRF9v+347pnakNevPmiHhNmZ2HbFA76w=="
-    },
-    "nested-property@4.0.0": {
-      "integrity": "sha512-yFehXNWRs4cM0+dz7QxCd06hTbWbSkV0ISsqBfkntU6TOY4Qm3Q88fRRLOddkGh2Qq6dZvnKVAahfhjcUvLnyA=="
-    },
-    "node-domexception@1.0.0": {
-      "integrity": "sha512-/jKZoMpw0F8GRwl4/eLROPA3cfcXtLApP0QzLmUT/HuPCZWyB7IY9ZrMeKw2O/nFIqPQB3PVM9aYm0F312AXDQ=="
-    },
-    "node-fetch@3.3.2": {
-      "integrity": "sha512-dRB78srN/l6gqWulah9SrxeYnxeddIG30+GOqK/9OlLVyLg3HPnr6SqOWTWOXKRwC2eGYCkZ59NNuSgvSrpgOA==",
-      "dependencies": [
-        "data-uri-to-buffer",
-        "fetch-blob",
-        "formdata-polyfill"
-      ]
-    },
-    "path-posix@1.0.0": {
-      "integrity": "sha512-1gJ0WpNIiYcQydgg3Ed8KzvIqTsDpNwq+cjBCssvBtuTWjEqY1AW+i+OepiEMqDCzyro9B2sLAe4RBPajMYFiA=="
+      "integrity": "sha512-N8SpfPUnUp1bK+PMYW8qSWdl9U+wwNWI4QKxOYDy9JAro3WMX7p2OeVRF9v+347pnakNevPmiHhNmZ2HbFA76w==",
+      "bin": true
     },
     "picocolors@1.1.1": {
       "integrity": "sha512-xceH2snhtb5M9liqDsmEw56le376mTZkEX/jEb/RxNFyegNul7eNslCXP9FDj/Lcu0X8KEyMceP2ntpaHrDEVA=="
     },
-    "picomatch@4.0.2": {
-      "integrity": "sha512-M7BAV6Rlcy5u+m6oPhAPFgJTzAioX/6B0DxyvDlo9l8+T3nLKbrczg2WLUyzd45L8RqfUMyGPzekbMvX2Ldkwg=="
+    "picomatch@4.0.3": {
+      "integrity": "sha512-5gTmgEY/sqK6gFXLIsQNH19lWb4ebPDLA4SdLP7dsWkIXHWlG66oPuVvXSGFPppYZz8ZDZq0dYYrbHfBCVUb1Q=="
     },
-    "postcss@8.5.5": {
-      "integrity": "sha512-d/jtm+rdNT8tpXuHY5MMtcbJFBkhXE6593XVR9UoGCH8jSFGci7jGvMGH5RYd5PBJW+00NZQt6gf7CbagJCrhg==",
+    "postcss@8.5.6": {
+      "integrity": "sha512-3Ybi1tAuwAP9s0r1UQ2J4n5Y0G05bJkpUIO0/bI9MhwmD70S5aTWbXGBwxHrelT+XM1k6dM0pk+SwNkpTRN7Pg==",
       "dependencies": [
         "nanoid",
         "picocolors",
         "source-map-js"
       ]
     },
-    "querystringify@2.2.0": {
-      "integrity": "sha512-FIqgj2EUvTa7R50u0rGsyTftzjYmv/a3hO345bZNrqabNqjtgiDMgmo4mkUjd+nzU5oF3dClKqFIPUKybUyqoQ=="
-    },
-    "requires-port@1.0.0": {
-      "integrity": "sha512-KigOCHcocU3XODJxsu8i/j8T9tzT4adHiecwORRQ0ZZFcp7ahwXuRU1m+yuO90C5ZUyGeGfocHDI14M3L3yDAQ=="
-    },
-    "rollup@4.43.0": {
-      "integrity": "sha512-wdN2Kd3Twh8MAEOEJZsuxuLKCsBEo4PVNLK6tQWAn10VhsVewQLzcucMgLolRlhFybGxfclbPeEYBaP6RvUFGg==",
+    "rollup@4.52.2": {
+      "integrity": "sha512-I25/2QgoROE1vYV+NQ1En9T9UFB9Cmfm2CJ83zZOlaDpvz29wGQSZXWKw7MiNXau7wYgB/T9fVIdIuEQ+KbiiA==",
       "dependencies": [
+        "@types/estree"
+      ],
+      "optionalDependencies": [
         "@rollup/rollup-android-arm-eabi",
         "@rollup/rollup-android-arm64",
         "@rollup/rollup-darwin-arm64",
@@ -353,84 +371,53 @@
         "@rollup/rollup-linux-arm-musleabihf",
         "@rollup/rollup-linux-arm64-gnu",
         "@rollup/rollup-linux-arm64-musl",
-        "@rollup/rollup-linux-loongarch64-gnu",
-        "@rollup/rollup-linux-powerpc64le-gnu",
+        "@rollup/rollup-linux-loong64-gnu",
+        "@rollup/rollup-linux-ppc64-gnu",
         "@rollup/rollup-linux-riscv64-gnu",
         "@rollup/rollup-linux-riscv64-musl",
         "@rollup/rollup-linux-s390x-gnu",
         "@rollup/rollup-linux-x64-gnu",
         "@rollup/rollup-linux-x64-musl",
+        "@rollup/rollup-openharmony-arm64",
         "@rollup/rollup-win32-arm64-msvc",
         "@rollup/rollup-win32-ia32-msvc",
+        "@rollup/rollup-win32-x64-gnu",
         "@rollup/rollup-win32-x64-msvc",
-        "@types/estree",
         "fsevents"
-      ]
+      ],
+      "bin": true
     },
     "source-map-js@1.2.1": {
       "integrity": "sha512-UXWMKhLOwVKb728IUtQPXxfYU+usdybtUrK/8uGE8CQMvrhOpwvzDBwj0QhSL7MQc7vIsISBG8VQ8+IDQxpfQA=="
     },
-    "strnum@1.1.2": {
-      "integrity": "sha512-vrN+B7DBIoTTZjnPNewwhx6cBA/H+IS7rfW68n7XxC1y7uoiGQBxaKzqucGUgavX15dJgiGztLJ8vxuEzwqBdA=="
-    },
-    "tinyglobby@0.2.14_picomatch@4.0.2": {
-      "integrity": "sha512-tX5e7OM1HnYr2+a2C/4V0htOcSQcoSTH9KgJnVvNm5zm/cyEWKJ7j7YutsH9CxMdtOkkLFy2AHrMci9IM8IPZQ==",
+    "tinyglobby@0.2.15_picomatch@4.0.3": {
+      "integrity": "sha512-j2Zq4NyQYG5XMST4cbs02Ak8iJUdxRM0XI5QyxXuZOzKOINmWurp3smXu3y5wDcJrptwpSjgXHzIQxR0omXljQ==",
       "dependencies": [
         "fdir",
         "picomatch"
       ]
     },
-    "url-join@5.0.0": {
-      "integrity": "sha512-n2huDr9h9yzd6exQVnH/jU5mr+Pfx08LRXXZhkLLetAMESRj+anQsTAh940iMrIetKAmry9coFuZQ2jY8/p3WA=="
-    },
-    "url-parse@1.5.10": {
-      "integrity": "sha512-WypcfiRhfeUP9vvF0j6rw0J3hrWrw6iZv3+22h6iRMJ/8z1Tj6XfLP4DsUix5MhMPnXpiHDoKyoZ/bdCkwBCiQ==",
-      "dependencies": [
-        "querystringify",
-        "requires-port"
-      ]
-    },
-    "vite@6.3.5_picomatch@4.0.2": {
-      "integrity": "sha512-cZn6NDFE7wdTpINgs++ZJ4N49W2vRp8LCKrn3Ob1kYNtOo21vfDoaV5GzBfLU4MovSAB8uNRm4jgzVQZ+mBzPQ==",
+    "vite@7.1.7_picomatch@4.0.3": {
+      "integrity": "sha512-VbA8ScMvAISJNJVbRDTJdCwqQoAareR/wutevKanhR2/1EkoXVZVkkORaYm/tNVCjP/UDTKtcw3bAkwOUdedmA==",
       "dependencies": [
         "esbuild",
         "fdir",
-        "fsevents",
         "picomatch",
         "postcss",
         "rollup",
         "tinyglobby"
-      ]
-    },
-    "web-streams-polyfill@3.3.3": {
-      "integrity": "sha512-d2JWLCivmZYTSIoge9MsgFCZrt571BikcWGYkjC1khllbTeDlGqZ2D8vD8E/lJa8WGWbb7Plm8/XJYV7IJHZZw=="
-    },
-    "webdav@5.8.0": {
-      "integrity": "sha512-iuFG7NamJ41Oshg4930iQgfIpRrUiatPWIekeznYgEf2EOraTRcDPTjy7gIOMtkdpKTaqPk1E68NO5PAGtJahA==",
-      "dependencies": [
-        "@buttercup/fetch",
-        "base-64",
-        "byte-length",
-        "entities",
-        "fast-xml-parser",
-        "hot-patcher",
-        "layerr",
-        "md5",
-        "minimatch",
-        "nested-property",
-        "node-fetch",
-        "path-posix",
-        "url-join",
-        "url-parse"
-      ]
+      ],
+      "optionalDependencies": [
+        "fsevents"
+      ],
+      "bin": true
     }
   },
   "workspace": {
     "dependencies": [
-      "npm:@deno/vite-plugin@^1.0.4",
-      "npm:lit@^3.2.1",
-      "npm:vite@^6.1.1",
-      "npm:webdav@^5.8.0"
+      "npm:@deno/vite-plugin@^1.0.5",
+      "npm:lit@^3.3.1",
+      "npm:vite@^7.1.7"
     ]
   }
 }

crates/frontend/js-components/lib/delete-button.ts

@@ -17,7 +17,7 @@ export class DeleteButton extends LitElement {
   }
 
   protected render() {
-    let text = this.trash ? 'Move to trash' : 'Delete'
+    let text = this.trash ? 'Trash' : 'Delete'
     return html`<button class="delete" @click=${e => this._onClick(e)}>${text}</button>`
   }
 

crates/frontend/js-components/lib/edit-addressbook-form.ts

@@ -28,9 +28,9 @@ export class EditAddressbookForm extends LitElement {
 
   override render() {
     return html`
-      <button @click=${() => this.dialog.value.showModal()}>Edit addressbook</button>
+      <button @click=${() => this.dialog.value.showModal()}>Edit</button>
       <dialog ${ref(this.dialog)}>
-        <h3>Create addressbook</h3>
+        <h3>Edit addressbook</h3>
         <form @submit=${this.submit} ${ref(this.form)}>
           <label>
             Displayname

crates/frontend/js-components/lib/edit-calendar-form.ts

@@ -40,9 +40,9 @@ export class EditCalendarForm extends LitElement {
 
   override render() {
     return html`
-      <button @click=${() => this.dialog.value.showModal()}>Edit calendar</button>
+      <button @click=${() => this.dialog.value.showModal()}>Edit</button>
       <dialog ${ref(this.dialog)}>
-        <h3>Create calendar</h3>
+        <h3>Edit calendar</h3>
         <form @submit=${this.submit} ${ref(this.form)}>
           <label>
             Displayname
@@ -117,6 +117,7 @@ export class EditCalendarForm extends LitElement {
         </set>
         <remove>
           <prop>
+            ${!this.timezone_id ? `<CAL:calendar-timezone-id />` : ''}
             ${!this.description ? '<CAL:calendar-description />' : ''}
             ${!this.color ? '<ICAL:calendar-color />' : ''}
           </prop>

crates/frontend/js-components/lib/import-addressbook-form.ts

@@ -0,0 +1,92 @@
+import { html, LitElement } from "lit";
+import { customElement, property } from "lit/decorators.js";
+import { Ref, createRef, ref } from 'lit/directives/ref.js';
+
+@customElement("import-addressbook-form")
+export class ImportAddressbookForm extends LitElement {
+  constructor() {
+    super()
+  }
+
+  protected override createRenderRoot() {
+    return this
+  }
+
+  @property()
+  user: string = ''
+  @property()
+  principal: string
+  @property()
+  addressbook_id: string = self.crypto.randomUUID()
+
+  dialog: Ref<HTMLDialogElement> = createRef()
+  form: Ref<HTMLFormElement> = createRef()
+  file: File;
+
+
+  override render() {
+    return html`
+      <button @click=${() => this.dialog.value.showModal()}>Import addressbook</button>
+      <dialog ${ref(this.dialog)}>
+        <h3>Import addressbook</h3>
+        <form @submit=${this.submit} ${ref(this.form)}>
+          <label>
+            principal (for group addressbook)
+            <select name="principal" value=${this.user} @change=${e => this.principal = e.target.value}>
+              <option value=${this.user}>${this.user}</option>
+              ${window.rusticalUser.memberships.map(membership => html`
+                <option value=${membership}>${membership}</option>
+              `)}
+            </select>
+          </label>
+          <br>
+          <label>
+            id
+            <input type="text" name="id" value=${this.addressbook_id} @change=${e => this.addressbook_id = e.target.value} />
+          </label>
+          <br>
+          <label>
+            file
+            <input type="file" accept="text/vcard" name="file" @change=${e => this.file = e.target.files[0]} />
+          </label>
+          <button type="submit">Import</button>
+          <button type="submit" @click=${event => { event.preventDefault(); this.dialog.value.close(); this.form.value.reset() }} class="cancel">Cancel</button>
+      </form>
+      </dialog>
+        `
+  }
+
+  async submit(e: SubmitEvent) {
+    e.preventDefault()
+    this.principal ||= this.user
+    if (!this.principal) {
+      alert("Empty principal")
+      return
+    }
+    if (!this.addressbook_id) {
+      alert("Empty id")
+      return
+    }
+    let response = await fetch(`/carddav/principal/${this.principal}/${this.addressbook_id}`, {
+      method: 'IMPORT',
+      headers: {
+        'Content-Type': 'text/vcard'
+      },
+      body: this.file,
+    })
+
+    if (response.status >= 400) {
+      alert(`Error ${response.status}: ${await response.text()}`)
+      return null
+    }
+
+    window.location.reload()
+    return null
+  }
+}
+
+declare global {
+  interface HTMLElementTagNameMap {
+    'import-addressbook-form': ImportAddressbookForm
+  }
+}

crates/frontend/js-components/lib/import-calendar-form.ts

@@ -0,0 +1,92 @@
+import { html, LitElement } from "lit";
+import { customElement, property } from "lit/decorators.js";
+import { Ref, createRef, ref } from 'lit/directives/ref.js';
+
+@customElement("import-calendar-form")
+export class ImportCalendarForm extends LitElement {
+  constructor() {
+    super()
+  }
+
+  protected override createRenderRoot() {
+    return this
+  }
+
+  @property()
+  user: string = ''
+  @property()
+  principal: string
+  @property()
+  cal_id: string = self.crypto.randomUUID()
+
+  dialog: Ref<HTMLDialogElement> = createRef()
+  form: Ref<HTMLFormElement> = createRef()
+  file: File;
+
+
+  override render() {
+    return html`
+      <button @click=${() => this.dialog.value.showModal()}>Import calendar</button>
+      <dialog ${ref(this.dialog)}>
+        <h3>Import calendar</h3>
+        <form @submit=${this.submit} ${ref(this.form)}>
+          <label>
+            principal (for group calendars)
+            <select name="principal" value=${this.user} @change=${e => this.principal = e.target.value}>
+              <option value=${this.user}>${this.user}</option>
+              ${window.rusticalUser.memberships.map(membership => html`
+                <option value=${membership}>${membership}</option>
+              `)}
+            </select>
+          </label>
+          <br>
+          <label>
+            id
+            <input type="text" name="id" value=${this.cal_id} @change=${e => this.cal_id = e.target.value} />
+          </label>
+          <br>
+          <label>
+            file
+            <input type="file" accept="text/calendar" name="file" @change=${e => this.file = e.target.files[0]} />
+          </label>
+          <button type="submit">Import</button>
+          <button type="submit" @click=${event => { event.preventDefault(); this.dialog.value.close(); this.form.value.reset() }} class="cancel">Cancel</button>
+      </form>
+      </dialog>
+        `
+  }
+
+  async submit(e: SubmitEvent) {
+    e.preventDefault()
+    this.principal ||= this.user
+    if (!this.principal) {
+      alert("Empty principal")
+      return
+    }
+    if (!this.cal_id) {
+      alert("Empty id")
+      return
+    }
+    let response = await fetch(`/caldav/principal/${this.principal}/${this.cal_id}`, {
+      method: 'IMPORT',
+      headers: {
+        'Content-Type': 'text/calendar'
+      },
+      body: this.file,
+    })
+
+    if (response.status >= 400) {
+      alert(`Error ${response.status}: ${await response.text()}`)
+      return null
+    }
+
+    window.location.reload()
+    return null
+  }
+}
+
+declare global {
+  interface HTMLElementTagNameMap {
+    'import-calendar-form': ImportCalendarForm
+  }
+}

crates/frontend/js-components/vite.config.ts

@@ -16,8 +16,10 @@ export default defineConfig({
       input: [
         "lib/create-calendar-form.ts",
         "lib/edit-calendar-form.ts",
+        "lib/import-calendar-form.ts",
         "lib/create-addressbook-form.ts",
         "lib/edit-addressbook-form.ts",
+        "lib/import-addressbook-form.ts",
         "lib/delete-button.ts",
       ],
       output: {
@@ -25,7 +27,6 @@ export default defineConfig({
         format: "es",
         manualChunks: {
           lit: ["lit"],
-          // webdav: ["webdav"],
         }
       }
     },

crates/frontend/public/assets/js/create-addressbook-form.mjs

@@ -1,6 +1,7 @@
-import { i, x } from "./lit-z6_uA4GX.mjs";
-import { n as n$1, t } from "./property-D0NJdseG.mjs";
-import { e, n, a as escapeXml } from "./index-b86iLJlP.mjs";
+import { i, x } from "./lit-DkXrt_Iv.mjs";
+import { n as n$1, t } from "./property-B8WoKf1Y.mjs";
+import { e, n } from "./ref-BwbQvJBB.mjs";
+import { e as escapeXml } from "./index-_IB1wMbZ.mjs";
 var __defProp = Object.defineProperty;
 var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
 var __decorateClass = (decorators, target, key, kind) => {

crates/frontend/public/assets/js/create-calendar-form.mjs

@@ -1,6 +1,7 @@
-import { i, x } from "./lit-z6_uA4GX.mjs";
-import { n as n$1, t } from "./property-D0NJdseG.mjs";
-import { e, n, a as escapeXml } from "./index-b86iLJlP.mjs";
+import { i, x } from "./lit-DkXrt_Iv.mjs";
+import { n as n$1, t } from "./property-B8WoKf1Y.mjs";
+import { e, n } from "./ref-BwbQvJBB.mjs";
+import { e as escapeXml } from "./index-_IB1wMbZ.mjs";
 var __defProp = Object.defineProperty;
 var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
 var __decorateClass = (decorators, target, key, kind) => {

crates/frontend/public/assets/js/delete-button.mjs

@@ -1,5 +1,5 @@
-import { i, x } from "./lit-z6_uA4GX.mjs";
-import { n, t } from "./property-D0NJdseG.mjs";
+import { i, x } from "./lit-DkXrt_Iv.mjs";
+import { n, t } from "./property-B8WoKf1Y.mjs";
 var __defProp = Object.defineProperty;
 var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
 var __decorateClass = (decorators, target, key, kind) => {
@@ -19,7 +19,7 @@ let DeleteButton = class extends i {
     return this;
   }
   render() {
-    let text = this.trash ? "Move to trash" : "Delete";
+    let text = this.trash ? "Trash" : "Delete";
     return x`<button class="delete" @click=${(e) => this._onClick(e)}>${text}</button>`;
   }
   async _onClick(event) {

crates/frontend/public/assets/js/edit-addressbook-form.mjs

@@ -1,6 +1,7 @@
-import { i, x } from "./lit-z6_uA4GX.mjs";
-import { n as n$1, t } from "./property-D0NJdseG.mjs";
-import { e, n, a as escapeXml } from "./index-b86iLJlP.mjs";
+import { i, x } from "./lit-DkXrt_Iv.mjs";
+import { n as n$1, t } from "./property-B8WoKf1Y.mjs";
+import { e, n } from "./ref-BwbQvJBB.mjs";
+import { e as escapeXml } from "./index-_IB1wMbZ.mjs";
 var __defProp = Object.defineProperty;
 var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
 var __decorateClass = (decorators, target, key, kind) => {
@@ -26,9 +27,9 @@ let EditAddressbookForm = class extends i {
   }
   render() {
     return x`
-      <button @click=${() => this.dialog.value.showModal()}>Edit addressbook</button>
+      <button @click=${() => this.dialog.value.showModal()}>Edit</button>
       <dialog ${n(this.dialog)}>
-        <h3>Create addressbook</h3>
+        <h3>Edit addressbook</h3>
         <form @submit=${this.submit} ${n(this.form)}>
           <label>
             Displayname

crates/frontend/public/assets/js/edit-calendar-form.mjs

@@ -1,6 +1,7 @@
-import { i, x } from "./lit-z6_uA4GX.mjs";
-import { n as n$1, t } from "./property-D0NJdseG.mjs";
-import { e, n, a as escapeXml } from "./index-b86iLJlP.mjs";
+import { i, x } from "./lit-DkXrt_Iv.mjs";
+import { n as n$1, t } from "./property-B8WoKf1Y.mjs";
+import { e, n } from "./ref-BwbQvJBB.mjs";
+import { e as escapeXml } from "./index-_IB1wMbZ.mjs";
 var __defProp = Object.defineProperty;
 var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
 var __decorateClass = (decorators, target, key, kind) => {
@@ -27,9 +28,9 @@ let EditCalendarForm = class extends i {
   }
   render() {
     return x`
-      <button @click=${() => this.dialog.value.showModal()}>Edit calendar</button>
+      <button @click=${() => this.dialog.value.showModal()}>Edit</button>
       <dialog ${n(this.dialog)}>
-        <h3>Create calendar</h3>
+        <h3>Edit calendar</h3>
         <form @submit=${this.submit} ${n(this.form)}>
           <label>
             Displayname
@@ -107,6 +108,7 @@ let EditCalendarForm = class extends i {
         </set>
         <remove>
           <prop>
+            ${!this.timezone_id ? `<CAL:calendar-timezone-id />` : ""}
             ${!this.description ? "<CAL:calendar-description />" : ""}
             ${!this.color ? "<ICAL:calendar-color />" : ""}
           </prop>

crates/frontend/public/assets/js/import-addressbook-form.mjs

@@ -0,0 +1,100 @@
+import { i, x } from "./lit-DkXrt_Iv.mjs";
+import { n as n$1, t } from "./property-B8WoKf1Y.mjs";
+import { e, n } from "./ref-BwbQvJBB.mjs";
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __decorateClass = (decorators, target, key, kind) => {
+  var result = kind > 1 ? void 0 : kind ? __getOwnPropDesc(target, key) : target;
+  for (var i2 = decorators.length - 1, decorator; i2 >= 0; i2--)
+    if (decorator = decorators[i2])
+      result = (kind ? decorator(target, key, result) : decorator(result)) || result;
+  if (kind && result) __defProp(target, key, result);
+  return result;
+};
+let ImportAddressbookForm = class extends i {
+  constructor() {
+    super();
+    this.user = "";
+    this.addressbook_id = self.crypto.randomUUID();
+    this.dialog = e();
+    this.form = e();
+  }
+  createRenderRoot() {
+    return this;
+  }
+  render() {
+    return x`
+      <button @click=${() => this.dialog.value.showModal()}>Import addressbook</button>
+      <dialog ${n(this.dialog)}>
+        <h3>Import addressbook</h3>
+        <form @submit=${this.submit} ${n(this.form)}>
+          <label>
+            principal (for group addressbook)
+            <select name="principal" value=${this.user} @change=${(e2) => this.principal = e2.target.value}>
+              <option value=${this.user}>${this.user}</option>
+              ${window.rusticalUser.memberships.map((membership) => x`
+                <option value=${membership}>${membership}</option>
+              `)}
+            </select>
+          </label>
+          <br>
+          <label>
+            id
+            <input type="text" name="id" value=${this.addressbook_id} @change=${(e2) => this.addressbook_id = e2.target.value} />
+          </label>
+          <br>
+          <label>
+            file
+            <input type="file" accept="text/vcard" name="file" @change=${(e2) => this.file = e2.target.files[0]} />
+          </label>
+          <button type="submit">Import</button>
+          <button type="submit" @click=${(event) => {
+      event.preventDefault();
+      this.dialog.value.close();
+      this.form.value.reset();
+    }} class="cancel">Cancel</button>
+      </form>
+      </dialog>
+        `;
+  }
+  async submit(e2) {
+    e2.preventDefault();
+    this.principal ||= this.user;
+    if (!this.principal) {
+      alert("Empty principal");
+      return;
+    }
+    if (!this.addressbook_id) {
+      alert("Empty id");
+      return;
+    }
+    let response = await fetch(`/carddav/principal/${this.principal}/${this.addressbook_id}`, {
+      method: "IMPORT",
+      headers: {
+        "Content-Type": "text/vcard"
+      },
+      body: this.file
+    });
+    if (response.status >= 400) {
+      alert(`Error ${response.status}: ${await response.text()}`);
+      return null;
+    }
+    window.location.reload();
+    return null;
+  }
+};
+__decorateClass([
+  n$1()
+], ImportAddressbookForm.prototype, "user", 2);
+__decorateClass([
+  n$1()
+], ImportAddressbookForm.prototype, "principal", 2);
+__decorateClass([
+  n$1()
+], ImportAddressbookForm.prototype, "addressbook_id", 2);
+ImportAddressbookForm = __decorateClass([
+  t("import-addressbook-form")
+], ImportAddressbookForm);
+export {
+  ImportAddressbookForm
+};

crates/frontend/public/assets/js/import-calendar-form.mjs

@@ -0,0 +1,100 @@
+import { i, x } from "./lit-DkXrt_Iv.mjs";
+import { n as n$1, t } from "./property-B8WoKf1Y.mjs";
+import { e, n } from "./ref-BwbQvJBB.mjs";
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __decorateClass = (decorators, target, key, kind) => {
+  var result = kind > 1 ? void 0 : kind ? __getOwnPropDesc(target, key) : target;
+  for (var i2 = decorators.length - 1, decorator; i2 >= 0; i2--)
+    if (decorator = decorators[i2])
+      result = (kind ? decorator(target, key, result) : decorator(result)) || result;
+  if (kind && result) __defProp(target, key, result);
+  return result;
+};
+let ImportCalendarForm = class extends i {
+  constructor() {
+    super();
+    this.user = "";
+    this.cal_id = self.crypto.randomUUID();
+    this.dialog = e();
+    this.form = e();
+  }
+  createRenderRoot() {
+    return this;
+  }
+  render() {
+    return x`
+      <button @click=${() => this.dialog.value.showModal()}>Import calendar</button>
+      <dialog ${n(this.dialog)}>
+        <h3>Import calendar</h3>
+        <form @submit=${this.submit} ${n(this.form)}>
+          <label>
+            principal (for group calendars)
+            <select name="principal" value=${this.user} @change=${(e2) => this.principal = e2.target.value}>
+              <option value=${this.user}>${this.user}</option>
+              ${window.rusticalUser.memberships.map((membership) => x`
+                <option value=${membership}>${membership}</option>
+              `)}
+            </select>
+          </label>
+          <br>
+          <label>
+            id
+            <input type="text" name="id" value=${this.cal_id} @change=${(e2) => this.cal_id = e2.target.value} />
+          </label>
+          <br>
+          <label>
+            file
+            <input type="file" accept="text/calendar" name="file" @change=${(e2) => this.file = e2.target.files[0]} />
+          </label>
+          <button type="submit">Import</button>
+          <button type="submit" @click=${(event) => {
+      event.preventDefault();
+      this.dialog.value.close();
+      this.form.value.reset();
+    }} class="cancel">Cancel</button>
+      </form>
+      </dialog>
+        `;
+  }
+  async submit(e2) {
+    e2.preventDefault();
+    this.principal ||= this.user;
+    if (!this.principal) {
+      alert("Empty principal");
+      return;
+    }
+    if (!this.cal_id) {
+      alert("Empty id");
+      return;
+    }
+    let response = await fetch(`/caldav/principal/${this.principal}/${this.cal_id}`, {
+      method: "IMPORT",
+      headers: {
+        "Content-Type": "text/calendar"
+      },
+      body: this.file
+    });
+    if (response.status >= 400) {
+      alert(`Error ${response.status}: ${await response.text()}`);
+      return null;
+    }
+    window.location.reload();
+    return null;
+  }
+};
+__decorateClass([
+  n$1()
+], ImportCalendarForm.prototype, "user", 2);
+__decorateClass([
+  n$1()
+], ImportCalendarForm.prototype, "principal", 2);
+__decorateClass([
+  n$1()
+], ImportCalendarForm.prototype, "cal_id", 2);
+ImportCalendarForm = __decorateClass([
+  t("import-calendar-form")
+], ImportCalendarForm);
+export {
+  ImportCalendarForm
+};

crates/frontend/public/assets/js/index-_IB1wMbZ.mjs

@@ -0,0 +1,6 @@
+function escapeXml(unsafe) {
+  return unsafe.replace(/&/g, "&amp;").replace(/</g, "&lt;").replace(/>/g, "&gt;").replace(/"/g, "&quot;").replace(/'/g, "&apos;");
+}
+export {
+  escapeXml as e
+};

crates/frontend/public/assets/js/lit-DkXrt_Iv.mjs

@@ -3,7 +3,6 @@
  * Copyright 2019 Google LLC
  * SPDX-License-Identifier: BSD-3-Clause
  */
-var _a;
 const t$1 = globalThis, e$2 = t$1.ShadowRoot && (void 0 === t$1.ShadyCSS || t$1.ShadyCSS.nativeShadow) && "adoptedStyleSheets" in Document.prototype && "replace" in CSSStyleSheet.prototype, s$2 = Symbol(), o$3 = /* @__PURE__ */ new WeakMap();
 let n$2 = class n {
   constructor(t2, e2, o2) {
@@ -24,7 +23,7 @@ let n$2 = class n {
   }
 };
 const r$2 = (t2) => new n$2("string" == typeof t2 ? t2 : t2 + "", void 0, s$2), S$1 = (s2, o2) => {
-  if (e$2) s2.adoptedStyleSheets = o2.map((t2) => t2 instanceof CSSStyleSheet ? t2 : t2.styleSheet);
+  if (e$2) s2.adoptedStyleSheets = o2.map(((t2) => t2 instanceof CSSStyleSheet ? t2 : t2.styleSheet));
   else for (const e2 of o2) {
     const o3 = document.createElement("style"), n3 = t$1.litNonce;
     void 0 !== n3 && o3.setAttribute("nonce", n3), o3.textContent = e2.cssText, s2.appendChild(o3);
@@ -68,10 +67,10 @@ const { is: i$2, defineProperty: e$1, getOwnPropertyDescriptor: h$1, getOwnPrope
   }
   return i2;
 } }, f$1 = (t2, s2) => !i$2(t2, s2), b = { attribute: true, type: String, converter: u$1, reflect: false, useDefault: false, hasChanged: f$1 };
-Symbol.metadata ?? (Symbol.metadata = Symbol("metadata")), a$1.litPropertyMetadata ?? (a$1.litPropertyMetadata = /* @__PURE__ */ new WeakMap());
+Symbol.metadata ??= Symbol("metadata"), a$1.litPropertyMetadata ??= /* @__PURE__ */ new WeakMap();
 let y$1 = class y extends HTMLElement {
   static addInitializer(t2) {
-    this._$Ei(), (this.l ?? (this.l = [])).push(t2);
+    this._$Ei(), (this.l ??= []).push(t2);
   }
   static get observedAttributes() {
     return this.finalize(), this._$Eh && [...this._$Eh.keys()];
@@ -89,8 +88,8 @@ let y$1 = class y extends HTMLElement {
       this[s2] = t3;
     } };
     return { get: e2, set(s3) {
-      const h2 = e2 == null ? void 0 : e2.call(this);
-      r2 == null ? void 0 : r2.call(this, s3), this.requestUpdate(t2, h2, i2);
+      const h2 = e2?.call(this);
+      r2?.call(this, s3), this.requestUpdate(t2, h2, i2);
     }, configurable: true, enumerable: true };
   }
   static getPropertyOptions(t2) {
@@ -135,16 +134,13 @@ let y$1 = class y extends HTMLElement {
     super(), this._$Ep = void 0, this.isUpdatePending = false, this.hasUpdated = false, this._$Em = null, this._$Ev();
   }
   _$Ev() {
-    var _a2;
-    this._$ES = new Promise((t2) => this.enableUpdating = t2), this._$AL = /* @__PURE__ */ new Map(), this._$E_(), this.requestUpdate(), (_a2 = this.constructor.l) == null ? void 0 : _a2.forEach((t2) => t2(this));
+    this._$ES = new Promise(((t2) => this.enableUpdating = t2)), this._$AL = /* @__PURE__ */ new Map(), this._$E_(), this.requestUpdate(), this.constructor.l?.forEach(((t2) => t2(this)));
   }
   addController(t2) {
-    var _a2;
-    (this._$EO ?? (this._$EO = /* @__PURE__ */ new Set())).add(t2), void 0 !== this.renderRoot && this.isConnected && ((_a2 = t2.hostConnected) == null ? void 0 : _a2.call(t2));
+    (this._$EO ??= /* @__PURE__ */ new Set()).add(t2), void 0 !== this.renderRoot && this.isConnected && t2.hostConnected?.();
   }
   removeController(t2) {
-    var _a2;
-    (_a2 = this._$EO) == null ? void 0 : _a2.delete(t2);
+    this._$EO?.delete(t2);
   }
   _$E_() {
     const t2 = /* @__PURE__ */ new Map(), s2 = this.constructor.elementProperties;
@@ -156,51 +152,42 @@ let y$1 = class y extends HTMLElement {
     return S$1(t2, this.constructor.elementStyles), t2;
   }
   connectedCallback() {
-    var _a2;
-    this.renderRoot ?? (this.renderRoot = this.createRenderRoot()), this.enableUpdating(true), (_a2 = this._$EO) == null ? void 0 : _a2.forEach((t2) => {
-      var _a3;
-      return (_a3 = t2.hostConnected) == null ? void 0 : _a3.call(t2);
-    });
+    this.renderRoot ??= this.createRenderRoot(), this.enableUpdating(true), this._$EO?.forEach(((t2) => t2.hostConnected?.()));
   }
   enableUpdating(t2) {
   }
   disconnectedCallback() {
-    var _a2;
-    (_a2 = this._$EO) == null ? void 0 : _a2.forEach((t2) => {
-      var _a3;
-      return (_a3 = t2.hostDisconnected) == null ? void 0 : _a3.call(t2);
-    });
+    this._$EO?.forEach(((t2) => t2.hostDisconnected?.()));
   }
   attributeChangedCallback(t2, s2, i2) {
     this._$AK(t2, i2);
   }
   _$ET(t2, s2) {
-    var _a2;
     const i2 = this.constructor.elementProperties.get(t2), e2 = this.constructor._$Eu(t2, i2);
     if (void 0 !== e2 && true === i2.reflect) {
-      const h2 = (void 0 !== ((_a2 = i2.converter) == null ? void 0 : _a2.toAttribute) ? i2.converter : u$1).toAttribute(s2, i2.type);
+      const h2 = (void 0 !== i2.converter?.toAttribute ? i2.converter : u$1).toAttribute(s2, i2.type);
       this._$Em = t2, null == h2 ? this.removeAttribute(e2) : this.setAttribute(e2, h2), this._$Em = null;
     }
   }
   _$AK(t2, s2) {
-    var _a2, _b;
     const i2 = this.constructor, e2 = i2._$Eh.get(t2);
     if (void 0 !== e2 && this._$Em !== e2) {
-      const t3 = i2.getPropertyOptions(e2), h2 = "function" == typeof t3.converter ? { fromAttribute: t3.converter } : void 0 !== ((_a2 = t3.converter) == null ? void 0 : _a2.fromAttribute) ? t3.converter : u$1;
-      this._$Em = e2, this[e2] = h2.fromAttribute(s2, t3.type) ?? ((_b = this._$Ej) == null ? void 0 : _b.get(e2)) ?? null, this._$Em = null;
+      const t3 = i2.getPropertyOptions(e2), h2 = "function" == typeof t3.converter ? { fromAttribute: t3.converter } : void 0 !== t3.converter?.fromAttribute ? t3.converter : u$1;
+      this._$Em = e2;
+      const r2 = h2.fromAttribute(s2, t3.type);
+      this[e2] = r2 ?? this._$Ej?.get(e2) ?? r2, this._$Em = null;
     }
   }
   requestUpdate(t2, s2, i2) {
-    var _a2;
     if (void 0 !== t2) {
       const e2 = this.constructor, h2 = this[t2];
-      if (i2 ?? (i2 = e2.getPropertyOptions(t2)), !((i2.hasChanged ?? f$1)(h2, s2) || i2.useDefault && i2.reflect && h2 === ((_a2 = this._$Ej) == null ? void 0 : _a2.get(t2)) && !this.hasAttribute(e2._$Eu(t2, i2)))) return;
+      if (i2 ??= e2.getPropertyOptions(t2), !((i2.hasChanged ?? f$1)(h2, s2) || i2.useDefault && i2.reflect && h2 === this._$Ej?.get(t2) && !this.hasAttribute(e2._$Eu(t2, i2)))) return;
       this.C(t2, s2, i2);
     }
     false === this.isUpdatePending && (this._$ES = this._$EP());
   }
   C(t2, s2, { useDefault: i2, reflect: e2, wrapped: h2 }, r2) {
-    i2 && !(this._$Ej ?? (this._$Ej = /* @__PURE__ */ new Map())).has(t2) && (this._$Ej.set(t2, r2 ?? s2 ?? this[t2]), true !== h2 || void 0 !== r2) || (this._$AL.has(t2) || (this.hasUpdated || i2 || (s2 = void 0), this._$AL.set(t2, s2)), true === e2 && this._$Em !== t2 && (this._$Eq ?? (this._$Eq = /* @__PURE__ */ new Set())).add(t2));
+    i2 && !(this._$Ej ??= /* @__PURE__ */ new Map()).has(t2) && (this._$Ej.set(t2, r2 ?? s2 ?? this[t2]), true !== h2 || void 0 !== r2) || (this._$AL.has(t2) || (this.hasUpdated || i2 || (s2 = void 0), this._$AL.set(t2, s2)), true === e2 && this._$Em !== t2 && (this._$Eq ??= /* @__PURE__ */ new Set()).add(t2));
   }
   async _$EP() {
     this.isUpdatePending = true;
@@ -216,10 +203,9 @@ let y$1 = class y extends HTMLElement {
     return this.performUpdate();
   }
   performUpdate() {
-    var _a2;
     if (!this.isUpdatePending) return;
     if (!this.hasUpdated) {
-      if (this.renderRoot ?? (this.renderRoot = this.createRenderRoot()), this._$Ep) {
+      if (this.renderRoot ??= this.createRenderRoot(), this._$Ep) {
         for (const [t4, s3] of this._$Ep) this[t4] = s3;
         this._$Ep = void 0;
       }
@@ -232,10 +218,7 @@ let y$1 = class y extends HTMLElement {
     let t2 = false;
     const s2 = this._$AL;
     try {
-      t2 = this.shouldUpdate(s2), t2 ? (this.willUpdate(s2), (_a2 = this._$EO) == null ? void 0 : _a2.forEach((t3) => {
-        var _a3;
-        return (_a3 = t3.hostUpdate) == null ? void 0 : _a3.call(t3);
-      }), this.update(s2)) : this._$EM();
+      t2 = this.shouldUpdate(s2), t2 ? (this.willUpdate(s2), this._$EO?.forEach(((t3) => t3.hostUpdate?.())), this.update(s2)) : this._$EM();
     } catch (s3) {
       throw t2 = false, this._$EM(), s3;
     }
@@ -244,11 +227,7 @@ let y$1 = class y extends HTMLElement {
   willUpdate(t2) {
   }
   _$AE(t2) {
-    var _a2;
-    (_a2 = this._$EO) == null ? void 0 : _a2.forEach((t3) => {
-      var _a3;
-      return (_a3 = t3.hostUpdated) == null ? void 0 : _a3.call(t3);
-    }), this.hasUpdated || (this.hasUpdated = true, this.firstUpdated(t2)), this.updated(t2);
+    this._$EO?.forEach(((t3) => t3.hostUpdated?.())), this.hasUpdated || (this.hasUpdated = true, this.firstUpdated(t2)), this.updated(t2);
   }
   _$EM() {
     this._$AL = /* @__PURE__ */ new Map(), this.isUpdatePending = false;
@@ -263,20 +242,20 @@ let y$1 = class y extends HTMLElement {
     return true;
   }
   update(t2) {
-    this._$Eq && (this._$Eq = this._$Eq.forEach((t3) => this._$ET(t3, this[t3]))), this._$EM();
+    this._$Eq &&= this._$Eq.forEach(((t3) => this._$ET(t3, this[t3]))), this._$EM();
   }
   updated(t2) {
   }
   firstUpdated(t2) {
   }
 };
-y$1.elementStyles = [], y$1.shadowRootOptions = { mode: "open" }, y$1[d$1("elementProperties")] = /* @__PURE__ */ new Map(), y$1[d$1("finalized")] = /* @__PURE__ */ new Map(), p$1 == null ? void 0 : p$1({ ReactiveElement: y$1 }), (a$1.reactiveElementVersions ?? (a$1.reactiveElementVersions = [])).push("2.1.0");
+y$1.elementStyles = [], y$1.shadowRootOptions = { mode: "open" }, y$1[d$1("elementProperties")] = /* @__PURE__ */ new Map(), y$1[d$1("finalized")] = /* @__PURE__ */ new Map(), p$1?.({ ReactiveElement: y$1 }), (a$1.reactiveElementVersions ??= []).push("2.1.1");
 /**
  * @license
  * Copyright 2017 Google LLC
  * SPDX-License-Identifier: BSD-3-Clause
  */
-const t = globalThis, i$1 = t.trustedTypes, s$1 = i$1 ? i$1.createPolicy("lit-html", { createHTML: (t2) => t2 }) : void 0, e = "$lit$", h = `lit$${Math.random().toFixed(9).slice(2)}$`, o$1 = "?" + h, n2 = `<${o$1}>`, r = document, l = () => r.createComment(""), c = (t2) => null === t2 || "object" != typeof t2 && "function" != typeof t2, a = Array.isArray, u = (t2) => a(t2) || "function" == typeof (t2 == null ? void 0 : t2[Symbol.iterator]), d = "[ 	\n\f\r]", f = /<(?:(!--|\/[^a-zA-Z])|(\/?[a-zA-Z][^>\s]*)|(\/?$))/g, v = /-->/g, _ = />/g, m = RegExp(`>|${d}(?:([^\\s"'>=/]+)(${d}*=${d}*(?:[^ 	
+const t = globalThis, i$1 = t.trustedTypes, s$1 = i$1 ? i$1.createPolicy("lit-html", { createHTML: (t2) => t2 }) : void 0, e = "$lit$", h = `lit$${Math.random().toFixed(9).slice(2)}$`, o$1 = "?" + h, n2 = `<${o$1}>`, r = document, l = () => r.createComment(""), c = (t2) => null === t2 || "object" != typeof t2 && "function" != typeof t2, a = Array.isArray, u = (t2) => a(t2) || "function" == typeof t2?.[Symbol.iterator], d = "[ 	\n\f\r]", f = /<(?:(!--|\/[^a-zA-Z])|(\/?[a-zA-Z][^>\s]*)|(\/?$))/g, v = /-->/g, _ = />/g, m = RegExp(`>|${d}(?:([^\\s"'>=/]+)(${d}*=${d}*(?:[^ 	
 \f\r"'\`<>=]|("|')|))|$)`, "g"), p = /'/g, g = /"/g, $ = /^(?:script|style|textarea|title)$/i, y2 = (t2) => (i2, ...s2) => ({ _$litType$: t2, strings: i2, values: s2 }), x = y2(1), T = Symbol.for("lit-noChange"), E = Symbol.for("lit-nothing"), A = /* @__PURE__ */ new WeakMap(), C = r.createTreeWalker(r, 129);
 function P(t2, i2) {
   if (!a(t2) || !t2.hasOwnProperty("raw")) throw Error("invalid template strings array");
@@ -332,11 +311,10 @@ class N {
   }
 }
 function S(t2, i2, s2 = t2, e2) {
-  var _a2, _b;
   if (i2 === T) return i2;
-  let h2 = void 0 !== e2 ? (_a2 = s2._$Co) == null ? void 0 : _a2[e2] : s2._$Cl;
+  let h2 = void 0 !== e2 ? s2._$Co?.[e2] : s2._$Cl;
   const o2 = c(i2) ? void 0 : i2._$litDirective$;
-  return (h2 == null ? void 0 : h2.constructor) !== o2 && ((_b = h2 == null ? void 0 : h2._$AO) == null ? void 0 : _b.call(h2, false), void 0 === o2 ? h2 = void 0 : (h2 = new o2(t2), h2._$AT(t2, s2, e2)), void 0 !== e2 ? (s2._$Co ?? (s2._$Co = []))[e2] = h2 : s2._$Cl = h2), void 0 !== h2 && (i2 = S(t2, h2._$AS(t2, i2.values), h2, e2)), i2;
+  return h2?.constructor !== o2 && (h2?._$AO?.(false), void 0 === o2 ? h2 = void 0 : (h2 = new o2(t2), h2._$AT(t2, s2, e2)), void 0 !== e2 ? (s2._$Co ??= [])[e2] = h2 : s2._$Cl = h2), void 0 !== h2 && (i2 = S(t2, h2._$AS(t2, i2.values), h2, e2)), i2;
 }
 class M {
   constructor(t2, i2) {
@@ -349,7 +327,7 @@ class M {
     return this._$AM._$AU;
   }
   u(t2) {
-    const { el: { content: i2 }, parts: s2 } = this._$AD, e2 = ((t2 == null ? void 0 : t2.creationScope) ?? r).importNode(i2, true);
+    const { el: { content: i2 }, parts: s2 } = this._$AD, e2 = (t2?.creationScope ?? r).importNode(i2, true);
     C.currentNode = e2;
     let h2 = C.nextNode(), o2 = 0, n3 = 0, l2 = s2[0];
     for (; void 0 !== l2; ) {
@@ -357,7 +335,7 @@ class M {
         let i3;
         2 === l2.type ? i3 = new R(h2, h2.nextSibling, this, t2) : 1 === l2.type ? i3 = new l2.ctor(h2, l2.name, l2.strings, this, t2) : 6 === l2.type && (i3 = new z(h2, this, t2)), this._$AV.push(i3), l2 = s2[++n3];
       }
-      o2 !== (l2 == null ? void 0 : l2.index) && (h2 = C.nextNode(), o2++);
+      o2 !== l2?.index && (h2 = C.nextNode(), o2++);
     }
     return C.currentNode = r, e2;
   }
@@ -368,16 +346,15 @@ class M {
 }
 class R {
   get _$AU() {
-    var _a2;
-    return ((_a2 = this._$AM) == null ? void 0 : _a2._$AU) ?? this._$Cv;
+    return this._$AM?._$AU ?? this._$Cv;
   }
   constructor(t2, i2, s2, e2) {
-    this.type = 2, this._$AH = E, this._$AN = void 0, this._$AA = t2, this._$AB = i2, this._$AM = s2, this.options = e2, this._$Cv = (e2 == null ? void 0 : e2.isConnected) ?? true;
+    this.type = 2, this._$AH = E, this._$AN = void 0, this._$AA = t2, this._$AB = i2, this._$AM = s2, this.options = e2, this._$Cv = e2?.isConnected ?? true;
   }
   get parentNode() {
     let t2 = this._$AA.parentNode;
     const i2 = this._$AM;
-    return void 0 !== i2 && 11 === (t2 == null ? void 0 : t2.nodeType) && (t2 = i2.parentNode), t2;
+    return void 0 !== i2 && 11 === t2?.nodeType && (t2 = i2.parentNode), t2;
   }
   get startNode() {
     return this._$AA;
@@ -398,9 +375,8 @@ class R {
     this._$AH !== E && c(this._$AH) ? this._$AA.nextSibling.data = t2 : this.T(r.createTextNode(t2)), this._$AH = t2;
   }
   $(t2) {
-    var _a2;
     const { values: i2, _$litType$: s2 } = t2, e2 = "number" == typeof s2 ? this._$AC(t2) : (void 0 === s2.el && (s2.el = N.createElement(P(s2.h, s2.h[0]), this.options)), s2);
-    if (((_a2 = this._$AH) == null ? void 0 : _a2._$AD) === e2) this._$AH.p(i2);
+    if (this._$AH?._$AD === e2) this._$AH.p(i2);
     else {
       const t3 = new M(e2, this), s3 = t3.u(this.options);
       t3.p(i2), this.T(s3), this._$AH = t3;
@@ -418,15 +394,13 @@ class R {
     e2 < i2.length && (this._$AR(s2 && s2._$AB.nextSibling, e2), i2.length = e2);
   }
   _$AR(t2 = this._$AA.nextSibling, i2) {
-    var _a2;
-    for ((_a2 = this._$AP) == null ? void 0 : _a2.call(this, false, true, i2); t2 && t2 !== this._$AB; ) {
+    for (this._$AP?.(false, true, i2); t2 !== this._$AB; ) {
       const i3 = t2.nextSibling;
       t2.remove(), t2 = i3;
     }
   }
   setConnected(t2) {
-    var _a2;
-    void 0 === this._$AM && (this._$Cv = t2, (_a2 = this._$AP) == null ? void 0 : _a2.call(this, t2));
+    void 0 === this._$AM && (this._$Cv = t2, this._$AP?.(t2));
   }
 }
 class k {
@@ -446,7 +420,7 @@ class k {
     else {
       const e3 = t2;
       let n3, r2;
-      for (t2 = h2[0], n3 = 0; n3 < h2.length - 1; n3++) r2 = S(this, e3[s2 + n3], i2, n3), r2 === T && (r2 = this._$AH[n3]), o2 || (o2 = !c(r2) || r2 !== this._$AH[n3]), r2 === E ? t2 = E : t2 !== E && (t2 += (r2 ?? "") + h2[n3 + 1]), this._$AH[n3] = r2;
+      for (t2 = h2[0], n3 = 0; n3 < h2.length - 1; n3++) r2 = S(this, e3[s2 + n3], i2, n3), r2 === T && (r2 = this._$AH[n3]), o2 ||= !c(r2) || r2 !== this._$AH[n3], r2 === E ? t2 = E : t2 !== E && (t2 += (r2 ?? "") + h2[n3 + 1]), this._$AH[n3] = r2;
     }
     o2 && !e2 && this.j(t2);
   }
@@ -480,8 +454,7 @@ class L extends k {
     e2 && this.element.removeEventListener(this.name, this, s2), h2 && this.element.addEventListener(this.name, this, t2), this._$AH = t2;
   }
   handleEvent(t2) {
-    var _a2;
-    "function" == typeof this._$AH ? this._$AH.call(((_a2 = this.options) == null ? void 0 : _a2.host) ?? this.element, t2) : this._$AH.handleEvent(t2);
+    "function" == typeof this._$AH ? this._$AH.call(this.options?.host ?? this.element, t2) : this._$AH.handleEvent(t2);
   }
 }
 class z {
@@ -496,12 +469,12 @@ class z {
   }
 }
 const j = t.litHtmlPolyfillSupport;
-j == null ? void 0 : j(N, R), (t.litHtmlVersions ?? (t.litHtmlVersions = [])).push("3.3.0");
+j?.(N, R), (t.litHtmlVersions ??= []).push("3.3.1");
 const B = (t2, i2, s2) => {
-  const e2 = (s2 == null ? void 0 : s2.renderBefore) ?? i2;
+  const e2 = s2?.renderBefore ?? i2;
   let h2 = e2._$litPart$;
   if (void 0 === h2) {
-    const t3 = (s2 == null ? void 0 : s2.renderBefore) ?? null;
+    const t3 = s2?.renderBefore ?? null;
     e2._$litPart$ = h2 = new R(i2.insertBefore(l(), t3), t3, void 0, s2 ?? {});
   }
   return h2._$AI(t2), h2;
@@ -517,30 +490,27 @@ class i extends y$1 {
     super(...arguments), this.renderOptions = { host: this }, this._$Do = void 0;
   }
   createRenderRoot() {
-    var _a2;
     const t2 = super.createRenderRoot();
-    return (_a2 = this.renderOptions).renderBefore ?? (_a2.renderBefore = t2.firstChild), t2;
+    return this.renderOptions.renderBefore ??= t2.firstChild, t2;
   }
   update(t2) {
     const r2 = this.render();
     this.hasUpdated || (this.renderOptions.isConnected = this.isConnected), super.update(t2), this._$Do = B(r2, this.renderRoot, this.renderOptions);
   }
   connectedCallback() {
-    var _a2;
-    super.connectedCallback(), (_a2 = this._$Do) == null ? void 0 : _a2.setConnected(true);
+    super.connectedCallback(), this._$Do?.setConnected(true);
   }
   disconnectedCallback() {
-    var _a2;
-    super.disconnectedCallback(), (_a2 = this._$Do) == null ? void 0 : _a2.setConnected(false);
+    super.disconnectedCallback(), this._$Do?.setConnected(false);
   }
   render() {
     return T;
   }
 }
-i._$litElement$ = true, i["finalized"] = true, (_a = s.litElementHydrateSupport) == null ? void 0 : _a.call(s, { LitElement: i });
+i._$litElement$ = true, i["finalized"] = true, s.litElementHydrateSupport?.({ LitElement: i });
 const o = s.litElementPolyfillSupport;
-o == null ? void 0 : o({ LitElement: i });
-(s.litElementVersions ?? (s.litElementVersions = [])).push("4.2.0");
+o?.({ LitElement: i });
+(s.litElementVersions ??= []).push("4.2.1");
 export {
   E,
   f$1 as f,

crates/frontend/public/assets/js/property-B8WoKf1Y.mjs

@@ -1,13 +1,13 @@
-import { f, u } from "./lit-z6_uA4GX.mjs";
+import { f, u } from "./lit-DkXrt_Iv.mjs";
 /**
  * @license
  * Copyright 2017 Google LLC
  * SPDX-License-Identifier: BSD-3-Clause
  */
 const t = (t2) => (e, o2) => {
-  void 0 !== o2 ? o2.addInitializer(() => {
+  void 0 !== o2 ? o2.addInitializer((() => {
     customElements.define(t2, e);
-  }) : customElements.define(t2, e);
+  })) : customElements.define(t2, e);
 };
 /**
  * @license

crates/frontend/public/assets/js/ref-BwbQvJBB.mjs

@@ -1,4 +1,4 @@
-import { E } from "./lit-z6_uA4GX.mjs";
+import { E } from "./lit-DkXrt_Iv.mjs";
 /**
  * @license
  * Copyright 2020 Google LLC
@@ -33,17 +33,16 @@ class i {
  * SPDX-License-Identifier: BSD-3-Clause
  */
 const s = (i2, t2) => {
-  var _a;
   const e2 = i2._$AN;
   if (void 0 === e2) return false;
-  for (const i3 of e2) (_a = i3._$AO) == null ? void 0 : _a.call(i3, t2, false), s(i3, t2);
+  for (const i3 of e2) i3._$AO?.(t2, false), s(i3, t2);
   return true;
 }, o$1 = (i2) => {
   let t2, e2;
   do {
     if (void 0 === (t2 = i2._$AM)) break;
     e2 = t2._$AN, e2.delete(i2), i2 = t2;
-  } while (0 === (e2 == null ? void 0 : e2.size));
+  } while (0 === e2?.size);
 }, r = (i2) => {
   for (let t2; t2 = i2._$AM; i2 = t2) {
     let e2 = t2._$AN;
@@ -62,7 +61,7 @@ function n$1(i2, t2 = false, e2 = 0) {
   else s(this, i2);
 }
 const c = (i2) => {
-  i2.type == t.CHILD && (i2._$AP ?? (i2._$AP = n$1), i2._$AQ ?? (i2._$AQ = h$1));
+  i2.type == t.CHILD && (i2._$AP ??= n$1, i2._$AQ ??= h$1);
 };
 class f extends i {
   constructor() {
@@ -72,8 +71,7 @@ class f extends i {
     super._$AT(i2, t2, e2), r(this), this.isConnected = i2._$AU;
   }
   _$AO(i2, t2 = true) {
-    var _a, _b;
-    i2 !== this.isConnected && (this.isConnected = i2, i2 ? (_a = this.reconnected) == null ? void 0 : _a.call(this) : (_b = this.disconnected) == null ? void 0 : _b.call(this)), t2 && (s(this, i2), o$1(this));
+    i2 !== this.isConnected && (this.isConnected = i2, i2 ? this.reconnected?.() : this.disconnected?.()), t2 && (s(this, i2), o$1(this));
   }
   setValue(t2) {
     if (f$1(this._$Ct)) this._$Ct._$AI(t2, this);
@@ -100,9 +98,8 @@ const o = /* @__PURE__ */ new WeakMap(), n = e$1(class extends f {
     return E;
   }
   update(i2, [s2]) {
-    var _a;
     const e2 = s2 !== this.G;
-    return e2 && void 0 !== this.G && this.rt(void 0), (e2 || this.lt !== this.ct) && (this.G = s2, this.ht = (_a = i2.options) == null ? void 0 : _a.host, this.rt(this.ct = i2.element)), E;
+    return e2 && void 0 !== this.G && this.rt(void 0), (e2 || this.lt !== this.ct) && (this.G = s2, this.ht = i2.options?.host, this.rt(this.ct = i2.element)), E;
   }
   rt(t2) {
     if (this.isConnected || (t2 = void 0), "function" == typeof this.G) {
@@ -112,8 +109,7 @@ const o = /* @__PURE__ */ new WeakMap(), n = e$1(class extends f {
     } else this.G.value = t2;
   }
   get lt() {
-    var _a, _b;
-    return "function" == typeof this.G ? (_a = o.get(this.ht ?? globalThis)) == null ? void 0 : _a.get(this.G) : (_b = this.G) == null ? void 0 : _b.value;
+    return "function" == typeof this.G ? o.get(this.ht ?? globalThis)?.get(this.G) : this.G?.value;
   }
   disconnected() {
     this.lt === this.ct && this.rt(void 0);
@@ -122,11 +118,7 @@ const o = /* @__PURE__ */ new WeakMap(), n = e$1(class extends f {
     this.rt(this.ct);
   }
 });
-function escapeXml(unsafe) {
-  return unsafe.replace(/&/g, "&amp;").replace(/</g, "&lt;").replace(/>/g, "&gt;").replace(/"/g, "&quot;").replace(/'/g, "&apos;");
-}
 export {
-  escapeXml as a,
   e,
   n
 };

crates/frontend/public/assets/style.css

@@ -290,6 +290,7 @@ ul.collection-list {
       .color-chip {
         background: var(--color);
         grid-area: color-chip;
+        margin-left: 8px;
       }
 
       .actions {
@@ -317,6 +318,10 @@ dialog {
   padding: 32px;
 }
 
+dialog::backdrop {
+  background: color-mix(in srgb, var(--background-color), transparent 50%);
+}
+
 footer {
   display: flex;
   justify-content: center;
@@ -342,6 +347,17 @@ select {
   }
 }
 
+form {
+
+  input[type="text"],
+  input[type="password"],
+  input[type="color"],
+  textarea,
+  select {
+    width: 100%;
+  }
+}
+
 svg.icon {
   stroke-width: 2px;
   color: var(--text-on-background-color);

crates/frontend/public/templates/components/sections/addressbooks_section.html

@@ -65,4 +65,5 @@
 {% endif %}
 
 <create-addressbook-form user="{{ user.id }}"></create-addressbook-form>
+<import-addressbook-form user="{{ user.id }}"></import-addressbook-form>
 

crates/frontend/public/templates/components/sections/calendars_section.html

@@ -1,13 +1,13 @@
 <h2>{{ user.id }}'s Calendars</h2>
 <ul class="collection-list">
   {% for (meta, calendar) in calendars %}
-  {% let color = calendar.color.to_owned().unwrap_or("transparent".to_owned()) %}
+  {% let color = calendar.meta.color.to_owned().unwrap_or("transparent".to_owned()) %}
   <li class="collection-list-item" style="--color: {{ color }}">
     <a href="/frontend/user/{{ calendar.principal }}/calendar/{{ calendar.id }}"></a>
     <div class="inner">
       <span class="title">
         {%- if calendar.principal != user.id -%}{{ calendar.principal }}/{%- endif -%}
-        {{ calendar.displayname.to_owned().unwrap_or(calendar.id.to_owned()) }}
+        {{ calendar.meta.displayname.to_owned().unwrap_or(calendar.id.to_owned()) }}
         <div class="comps">
           {% for comp in calendar.components %}
           <span>{{ comp }}</span>
@@ -15,7 +15,7 @@
         </div>
       </span>
       <span class="description">
-        {% if let Some(description) = calendar.description %}{{ description }}{% endif %}
+        {% if let Some(description) = calendar.meta.description %}{{ description }}{% endif %}
       </span>
       {% if let Some(subscription_url) = calendar.subscription_url %}
       <span class="subscription-url">{{ subscription_url }}</span>
@@ -29,9 +29,9 @@
           principal="{{ calendar.principal }}"
           cal_id="{{ calendar.id }}"
           timezone_id="{{ calendar.timezone_id.as_deref().unwrap_or_default() }}"
-          displayname="{{ calendar.displayname.as_deref().unwrap_or_default() }}"
-          description="{{ calendar.description.as_deref().unwrap_or_default() }}"
-          color="{{ calendar.color.as_deref().unwrap_or_default() }}"
+          displayname="{{ calendar.meta.displayname.as_deref().unwrap_or_default() }}"
+          description="{{ calendar.meta.description.as_deref().unwrap_or_default() }}"
+          color="{{ calendar.meta.color.as_deref().unwrap_or_default() }}"
           components="{{ calendar.components | json }}"
         ></edit-calendar-form>
         <delete-button trash href="/caldav/principal/{{ calendar.principal }}/{{ calendar.id }}"></delete-button>
@@ -51,13 +51,13 @@
 <h3>Deleted Calendars</h3>
 <ul class="collection-list">
   {% for (meta, calendar) in deleted_calendars %}
-  {% let color = calendar.color.to_owned().unwrap_or("transparent".to_owned()) %}
+  {% let color = calendar.meta.color.to_owned().unwrap_or("transparent".to_owned()) %}
   <li class="collection-list-item" style="--color: {{ color }}">
     <a href="/frontend/user/{{ calendar.principal }}/calendar/{{ calendar.id}}"></a>
     <div class="inner">
       <span class="title">
         {%- if calendar.principal != user.id -%}{{ calendar.principal }}/{%- endif -%}
-        {{ calendar.displayname.to_owned().unwrap_or(calendar.id.to_owned()) }}
+        {{ calendar.meta.displayname.to_owned().unwrap_or(calendar.id.to_owned()) }}
         <div class="comps">
           {% for comp in calendar.components %}
           <span>{{ comp }}</span>
@@ -65,7 +65,7 @@
         </div>
       </span>
       <span class="description">
-        {% if let Some(description) = calendar.description %}{{ description }}{% endif %}
+        {% if let Some(description) = calendar.meta.description %}{{ description }}{% endif %}
       </span>
       <div class="actions">
         <form action="/frontend/user/{{ calendar.principal }}/calendar/{{ calendar.id}}/restore" method="POST"
@@ -84,4 +84,5 @@
 </ul>
 {% endif %}
 <create-calendar-form user="{{ user.id }}"></create-calendar-form>
+<import-calendar-form user="{{ user.id }}"></import-calendar-form>
 

crates/frontend/public/templates/pages/calendar.html

@@ -4,9 +4,9 @@
 {% endblock %}
 
 {% block content %}
-{% let name = calendar.displayname.to_owned().unwrap_or(calendar.id.to_owned()) %}
+{% let name = calendar.meta.displayname.to_owned().unwrap_or(calendar.id.to_owned()) %}
 <h1>{{ calendar.principal }}/{{ name }}</h1>
-{% if let Some(description) = calendar.description %}<p>{{ description }}</p>{% endif%}
+{% if let Some(description) = calendar.meta.description %}<p>{{ description }}</p>{% endif%}
 
 {% if let Some(subscription_url) = calendar.subscription_url %}
 <h2>Subscription URL</h2>
@@ -25,9 +25,6 @@
 {% if let Some(timezone_id) = calendar.timezone_id %}
 <p>{{ timezone_id }}</p>
 {% endif %}
-{% if let Some(timezone) = calendar.timezone %}
-<textarea rows="16" readonly>{{ timezone }}</textarea>
-{% endif %}
 
 <pre>{{ calendar|json }}</pre>
 

crates/frontend/public/templates/pages/user.html

@@ -7,8 +7,10 @@ window.rusticalUser = JSON.parse(document.querySelector('#data-rustical-user').i
 </script>
 <script type="module" src="/frontend/assets/js/create-calendar-form.mjs" async></script>
 <script type="module" src="/frontend/assets/js/edit-calendar-form.mjs" async></script>
+<script type="module" src="/frontend/assets/js/import-calendar-form.mjs" async></script>
 <script type="module" src="/frontend/assets/js/create-addressbook-form.mjs" async></script>
 <script type="module" src="/frontend/assets/js/edit-addressbook-form.mjs" async></script>
+<script type="module" src="/frontend/assets/js/import-addressbook-form.mjs" async></script>
 <script type="module" src="/frontend/assets/js/delete-button.mjs" async></script>
 {% endblock %}
 {% block header_center %}

crates/frontend/src/assets.rs

@@ -13,6 +13,7 @@ use tower::Service;
 
 #[derive(Clone, RustEmbed, Default)]
 #[folder = "public/assets"]
+#[allow(dead_code)] // Since this is not used with the frontend-dev feature
 pub struct Assets;
 
 #[derive(Clone, Default)]

crates/frontend/src/lib.rs

@@ -45,38 +45,38 @@ pub fn frontend_router<AP: AuthenticationProvider, CS: CalendarStore, AS: Addres
     frontend_config: FrontendConfig,
     oidc_config: Option<OidcConfig>,
 ) -> Router {
-    let mut router = Router::new();
-    router = router
-        .route("/", get(route_root))
-        .route("/user", get(route_get_home))
-        .route("/user/{user}", get(route_user_named::<CS, AS, AP>))
+    let user_router = Router::new()
+        .route("/", get(route_get_home))
+        .route("/{user}", get(route_user_named::<CS, AS, AP>))
         // App token management
-        .route("/user/{user}/app_token", post(route_post_app_token::<AP>))
+        .route("/{user}/app_token", post(route_post_app_token::<AP>))
         .route(
             // POST because HTML5 forms don't support DELETE method
-            "/user/{user}/app_token/{id}/delete",
+            "/{user}/app_token/{id}/delete",
             post(route_delete_app_token::<AP>),
         )
         // Calendar
-        .route("/user/{user}/calendar", get(route_calendars::<CS>))
+        .route("/{user}/calendar", get(route_calendars::<CS>))
+        .route("/{user}/calendar/{calendar}", get(route_calendar::<CS>))
         .route(
-            "/user/{user}/calendar/{calendar}",
-            get(route_calendar::<CS>),
-        )
-        .route(
-            "/user/{user}/calendar/{calendar}/restore",
+            "/{user}/calendar/{calendar}/restore",
             post(route_calendar_restore::<CS>),
         )
         // Addressbook
-        .route("/user/{user}/addressbook", get(route_addressbooks::<AS>))
+        .route("/{user}/addressbook", get(route_addressbooks::<AS>))
         .route(
-            "/user/{user}/addressbook/{addressbook}",
+            "/{user}/addressbook/{addressbook}",
             get(route_addressbook::<AS>),
         )
         .route(
-            "/user/{user}/addressbook/{addressbook}/restore",
+            "/{user}/addressbook/{addressbook}/restore",
             post(route_addressbook_restore::<AS>),
         )
+        .layer(middleware::from_fn(unauthorized_handler));
+
+    let router = Router::new()
+        .route("/", get(route_root))
+        .nest("/user", user_router)
         .route("/login", get(route_get_login).post(route_post_login::<AP>))
         .route("/logout", post(route_post_logout));
 
@@ -109,8 +109,7 @@ pub fn frontend_router<AP: AuthenticationProvider, CS: CalendarStore, AS: Addres
         .layer(Extension(cal_store.clone()))
         .layer(Extension(addr_store.clone()))
         .layer(Extension(frontend_config.clone()))
-        .layer(Extension(oidc_config.clone()))
-        .layer(middleware::from_fn(unauthorized_handler));
+        .layer(Extension(oidc_config.clone()));
 
     Router::new()
         .nest(prefix, router)

crates/frontend/src/routes/login.rs

@@ -13,7 +13,7 @@ use http::StatusCode;
 use rustical_store::auth::AuthenticationProvider;
 use serde::Deserialize;
 use tower_sessions::Session;
-use tracing::instrument;
+use tracing::{instrument, warn};
 use url::Url;
 
 #[derive(Template, WebTemplate)]
@@ -98,6 +98,7 @@ pub async fn route_post_login<AP: AuthenticationProvider>(
         session.insert("user", user.id).await.unwrap();
         Redirect::to(&redirect_uri).into_response()
     } else {
+        warn!("Failed password login attempt as {username}");
         StatusCode::UNAUTHORIZED.into_response()
     }
 }

crates/ical/src/address_object.rs

@@ -20,19 +20,21 @@ impl TryFrom<VcardContact> for AddressObject {
     type Error = Error;
 
     fn try_from(vcard: VcardContact) -> Result<Self, Self::Error> {
-        let id = vcard
-            .get_property("UID")
-            .ok_or(Error::InvalidData("Missing UID".to_owned()))?
-            .value
-            .clone()
-            .ok_or(Error::InvalidData("Missing UID".to_owned()))?;
+        let uid = vcard
+            .get_uid()
+            .ok_or(Error::InvalidData("missing UID".to_owned()))?
+            .to_owned();
         let vcf = vcard.generate();
-        Ok(Self { id, vcf, vcard })
+        Ok(Self {
+            vcf,
+            vcard,
+            id: uid,
+        })
     }
 }
 
 impl AddressObject {
-    pub fn from_vcf(object_id: String, vcf: String) -> Result<Self, Error> {
+    pub fn from_vcf(id: String, vcf: String) -> Result<Self, Error> {
         let mut parser = vcard::VcardParser::new(BufReader::new(vcf.as_bytes()));
         let vcard = parser.next().ok_or(Error::MissingContact)??;
         if parser.next().is_some() {
@@ -40,11 +42,7 @@ impl AddressObject {
                 "multiple vcards, only one allowed".to_owned(),
             ));
         }
-        Ok(Self {
-            id: object_id,
-            vcf,
-            vcard,
-        })
+        Ok(Self { id, vcf, vcard })
     }
 
     pub fn get_id(&self) -> &str {
@@ -53,7 +51,7 @@ impl AddressObject {
 
     pub fn get_etag(&self) -> String {
         let mut hasher = Sha256::new();
-        hasher.update(&self.id);
+        hasher.update(self.get_id());
         hasher.update(self.get_vcf());
         format!("\"{:x}\"", hasher.finalize())
     }
@@ -95,10 +93,8 @@ impl AddressObject {
                 let uid = format!("{}-anniversary", self.get_id());
 
                 let year_suffix = year.map(|year| format!(" ({year})")).unwrap_or_default();
-                Some(CalendarObject::from_ics(
-                    uid.clone(),
-                    format!(
-                        r#"BEGIN:VCALENDAR
+                Some(CalendarObject::from_ics(format!(
+                    r#"BEGIN:VCALENDAR
 VERSION:2.0
 CALSCALE:GREGORIAN
 PRODID:-//github.com/lennart-k/rustical birthday calendar//EN
@@ -116,8 +112,7 @@ DESCRIPTION:💍 {fullname}{year_suffix}
 END:VALARM
 END:VEVENT
 END:VCALENDAR"#,
-                    ),
-                )?)
+                ))?)
             } else {
                 None
             },
@@ -139,10 +134,8 @@ END:VCALENDAR"#,
                 let uid = format!("{}-birthday", self.get_id());
 
                 let year_suffix = year.map(|year| format!(" ({year})")).unwrap_or_default();
-                Some(CalendarObject::from_ics(
-                    uid.clone(),
-                    format!(
-                        r#"BEGIN:VCALENDAR
+                Some(CalendarObject::from_ics(format!(
+                    r#"BEGIN:VCALENDAR
 VERSION:2.0
 CALSCALE:GREGORIAN
 PRODID:-//github.com/lennart-k/rustical birthday calendar//EN
@@ -160,8 +153,7 @@ DESCRIPTION:🎂 {fullname}{year_suffix}
 END:VALARM
 END:VEVENT
 END:VCALENDAR"#,
-                    ),
-                )?)
+                ))?)
             } else {
                 None
             },

crates/ical/src/duration.rs

@@ -1,53 +0,0 @@
-use crate::CalDateTimeError;
-use chrono::Duration;
-use lazy_static::lazy_static;
-
-lazy_static! {
-    static ref RE_DURATION: regex::Regex = regex::Regex::new(r"^(?<sign>[+-])?P((?P<W>\d+)W)?((?P<D>\d+)D)?(T((?P<H>\d+)H)?((?P<M>\d+)M)?((?P<S>\d+)S)?)?$").unwrap();
-}
-
-pub fn parse_duration(string: &str) -> Result<Duration, CalDateTimeError> {
-    let captures = RE_DURATION
-        .captures(string)
-        .ok_or(CalDateTimeError::InvalidDurationFormat(string.to_string()))?;
-
-    let mut duration = Duration::zero();
-    if let Some(weeks) = captures.name("W") {
-        duration += Duration::weeks(weeks.as_str().parse().unwrap());
-    }
-    if let Some(days) = captures.name("D") {
-        duration += Duration::days(days.as_str().parse().unwrap());
-    }
-    if let Some(hours) = captures.name("H") {
-        duration += Duration::hours(hours.as_str().parse().unwrap());
-    }
-    if let Some(minutes) = captures.name("M") {
-        duration += Duration::minutes(minutes.as_str().parse().unwrap());
-    }
-    if let Some(seconds) = captures.name("S") {
-        duration += Duration::seconds(seconds.as_str().parse().unwrap());
-    }
-    if let Some(sign) = captures.name("sign") {
-        if sign.as_str() == "-" {
-            duration = -duration;
-        }
-    }
-
-    Ok(duration)
-}
-
-#[cfg(test)]
-mod tests {
-    use chrono::Duration;
-
-    use crate::parse_duration;
-
-    #[test]
-    fn test_parse_duration() {
-        assert_eq!(parse_duration("P12W").unwrap(), Duration::weeks(12));
-        assert_eq!(parse_duration("P12D").unwrap(), Duration::days(12));
-        assert_eq!(parse_duration("PT12H").unwrap(), Duration::hours(12));
-        assert_eq!(parse_duration("PT12M").unwrap(), Duration::minutes(12));
-        assert_eq!(parse_duration("PT12S").unwrap(), Duration::seconds(12));
-    }
-}

crates/ical/src/icalendar/event.rs

@@ -1,24 +1,26 @@
+use crate::CalDateTime;
 use crate::Error;
-use crate::{CalDateTime, ComponentMut, parse_duration};
 use chrono::{DateTime, Duration, Utc};
-use ical::{
-    generator::IcalEvent,
-    parser::{Component, ical::component::IcalTimeZone},
-    property::Property,
-};
+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)]
+#[derive(Debug, Clone, Default)]
 pub struct EventObject {
     pub event: IcalEvent,
-    pub timezones: HashMap<String, IcalTimeZone>,
-    pub(crate) ics: String,
+    // 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 {
+    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_property("DTSTART") {
+        if let Some(dtstart) = self.event.get_dtstart() {
             Ok(Some(CalDateTime::parse_prop(dtstart, &self.timezones)?))
         } else {
             Ok(None)
@@ -26,7 +28,7 @@ impl EventObject {
     }
 
     pub fn get_dtend(&self) -> Result<Option<CalDateTime>, Error> {
-        if let Some(dtend) = self.event.get_property("DTEND") {
+        if let Some(dtend) = self.event.get_dtend() {
             Ok(Some(CalDateTime::parse_prop(dtend, &self.timezones)?))
         } else {
             Ok(None)
@@ -34,33 +36,21 @@ impl EventObject {
     }
 
     pub fn get_last_occurence(&self) -> Result<Option<CalDateTime>, Error> {
-        if let Some(_rrule) = self.event.get_property("RRULE") {
+        if self.event.get_rrule().is_some() {
             // TODO: understand recurrence rules
             return Ok(None);
         }
 
-        if let Some(dtend) = self.event.get_property("DTEND") {
-            return Ok(Some(CalDateTime::parse_prop(dtend, &self.timezones)?));
+        if let Some(dtend) = self.get_dtend()? {
+            return Ok(Some(dtend));
         };
 
-        let duration = self.get_duration()?.unwrap_or(Duration::days(1));
+        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 get_duration(&self) -> Result<Option<Duration>, Error> {
-        if let Some(Property {
-            value: Some(duration),
-            ..
-        }) = self.event.get_property("DURATION")
-        {
-            Ok(Some(parse_duration(duration)?))
-        } else {
-            Ok(None)
-        }
-    }
-
     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()? {
@@ -106,6 +96,7 @@ impl EventObject {
         &self,
         start: Option<DateTime<Utc>>,
         end: Option<DateTime<Utc>>,
+        overrides: &[EventObject],
     ) -> Result<Vec<IcalEvent>, Error> {
         if let Some(mut rrule_set) = self.recurrence_ruleset()? {
             if let Some(start) = start {
@@ -121,14 +112,31 @@ impl EventObject {
                 .get_dtend()?
                 .map(|dtend| dtend.as_datetime().into_owned() - dtstart.as_datetime().into_owned());
 
-            for date in dates {
+            'recurrence: for date in dates {
                 let date = CalDateTime::from(date);
                 let dateformat = if dtstart.is_date() {
                     date.format_date()
                 } else {
                     date.format()
                 };
-                let mut ev = self.event.clone();
+
+                for _override in overrides {
+                    if let Some(override_id) = &_override
+                        .event
+                        .get_recurrence_id()
+                        .as_ref()
+                        .expect("overrides have a recurrence id")
+                        .value
+                        && override_id == &dateformat
+                    {
+                        // We have an override for this occurence
+                        //
+                        events.push(_override.event.clone());
+                        continue 'recurrence;
+                    }
+                }
+
+                let mut ev = self.event.clone().mutable();
                 ev.remove_property("RRULE");
                 ev.remove_property("RDATE");
                 ev.remove_property("EXDATE");
@@ -163,7 +171,7 @@ impl EventObject {
                         params: dtstart_prop.params,
                     });
                 }
-                events.push(ev);
+                events.push(ev.verify()?);
             }
             Ok(events)
         } else {
@@ -242,15 +250,19 @@ END:VEVENT\r\n",
 
     #[test]
     fn test_expand_recurrence() {
-        let event = CalendarObject::from_ics(
-            "318ec6503573d9576818daf93dac07317058d95c".to_string(),
-            ICS.to_string(),
-        )
-        .unwrap();
-        let event = event.event().unwrap();
+        let event = CalendarObject::from_ics(ICS.to_string()).unwrap();
+        let (event, overrides) = if let crate::CalendarObjectComponent::Event(
+            main_event,
+            overrides,
+        ) = event.get_data()
+        {
+            (main_event, overrides)
+        } else {
+            panic!()
+        };
 
         let events: Vec<String> = event
-            .expand_recurrence(None, None)
+            .expand_recurrence(None, None, overrides)
             .unwrap()
             .into_iter()
             .map(|event| Emitter::generate(&event))

crates/ical/src/icalendar/journal.rs

@@ -1,7 +0,0 @@
-use ical::parser::ical::component::IcalJournal;
-
-#[derive(Debug, Clone)]
-pub struct JournalObject {
-    pub journal: IcalJournal,
-    pub(crate) ics: String,
-}

crates/ical/src/icalendar/mod.rs

@@ -1,9 +1,5 @@
 mod event;
-mod journal;
 mod object;
-mod todo;
 
 pub use event::*;
-pub use journal::*;
 pub use object::*;
-pub use todo::*;

crates/ical/src/icalendar/object.rs

@@ -1,18 +1,20 @@
-use super::{EventObject, JournalObject, TodoObject};
+use super::EventObject;
 use crate::CalDateTime;
 use crate::Error;
 use chrono::DateTime;
 use chrono::Utc;
 use derive_more::Display;
-use ical::{
-    generator::{Emitter, IcalCalendar},
-    parser::{Component, ical::component::IcalTimeZone},
-};
+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, PartialEq, Eq, Display)]
+#[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")]
@@ -47,8 +49,7 @@ impl rustical_xml::ValueDeserialize for CalendarObjectType {
             "VJOURNAL" => Ok(Self::Journal),
             _ => Err(rustical_xml::XmlError::InvalidValue(
                 rustical_xml::ParseValueError::Other(format!(
-                    "Invalid value '{}', must be VEVENT, VTODO, or VJOURNAL",
-                    val
+                    "Invalid value '{val}', must be VEVENT, VTODO, or VJOURNAL"
                 )),
             )),
         }
@@ -57,20 +58,94 @@ impl rustical_xml::ValueDeserialize for CalendarObjectType {
 
 #[derive(Debug, Clone)]
 pub enum CalendarObjectComponent {
-    Event(EventObject),
-    Todo(TodoObject),
-    Journal(JournalObject),
+    Event(EventObject, Vec<EventObject>),
+    Todo(IcalTodo, Vec<IcalTodo>),
+    Journal(IcalJournal, Vec<IcalJournal>),
+}
+
+impl From<&CalendarObjectComponent> for CalendarObjectType {
+    fn from(value: &CalendarObjectComponent) -> Self {
+        match value {
+            CalendarObjectComponent::Event(..) => CalendarObjectType::Event,
+            CalendarObjectComponent::Todo(..) => CalendarObjectType::Todo,
+            CalendarObjectComponent::Journal(..) => CalendarObjectType::Journal,
+        }
+    }
+}
+
+impl CalendarObjectComponent {
+    fn from_events(mut events: Vec<EventObject>) -> Result<Self, Error> {
+        let main_event = events
+            .extract_if(.., |event| event.event.get_recurrence_id().is_none())
+            .next()
+            .expect("there must be one main event");
+        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> {
+        let main_todo = todos
+            .extract_if(.., |todo| todo.get_recurrence_id().is_none())
+            .next()
+            .expect("there must be one main event");
+        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> {
+        let main_journal = journals
+            .extract_if(.., |journal| journal.get_recurrence_id().is_none())
+            .next()
+            .expect("there must be one main event");
+        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))
+    }
 }
 
 #[derive(Debug, Clone)]
 pub struct CalendarObject {
-    id: String,
     data: CalendarObjectComponent,
-    cal: IcalCalendar,
+    properties: Vec<Property>,
+    ics: String,
+    vtimezones: HashMap<String, IcalTimeZone>,
 }
 
 impl CalendarObject {
-    pub fn from_ics(object_id: String, ics: String) -> Result<Self, Error> {
+    pub fn from_ics(ics: 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() {
@@ -78,65 +153,63 @@ impl CalendarObject {
                 "multiple calendars, only one allowed".to_owned(),
             ));
         }
-        if cal.events.len()
-            + cal.alarms.len()
-            + cal.todos.len()
-            + cal.journals.len()
-            + cal.free_busys.len()
+
+        if !cal.events.is_empty() as u8
+            + !cal.todos.is_empty() as u8
+            + !cal.journals.is_empty() as u8
+            + !cal.free_busys.is_empty() as u8
             != 1
         {
             // https://datatracker.ietf.org/doc/html/rfc4791#section-4.1
             return Err(Error::InvalidData(
-                "iCalendar object is only allowed to have exactly one component".to_owned(),
+                "iCalendar object must have exactly one component type".to_owned(),
             ));
         }
 
-        let timezones: HashMap<String, IcalTimeZone> = cal
+        let timezones: HashMap<String, Option<chrono_tz::Tz>> = cal
             .timezones
             .clone()
             .into_iter()
-            .filter_map(|timezone| {
-                let timezone_prop = timezone.get_property("TZID")?.to_owned();
-                let tzid = timezone_prop.value?;
-                Some((tzid, timezone))
-            })
+            .map(|timezone| (timezone.get_tzid().to_owned(), (&timezone).try_into().ok()))
             .collect();
 
-        if let Some(event) = cal.events.first() {
-            return Ok(CalendarObject {
-                id: object_id,
-                cal: cal.clone(),
-                data: CalendarObjectComponent::Event(EventObject {
-                    event: event.clone(),
-                    timezones,
-                    ics,
-                }),
-            });
-        }
-        if let Some(todo) = cal.todos.first() {
-            return Ok(CalendarObject {
-                id: object_id,
-                cal: cal.clone(),
-                data: CalendarObjectComponent::Todo(TodoObject {
-                    todo: todo.clone(),
-                    ics,
-                }),
-            });
-        }
-        if let Some(journal) = cal.journals.first() {
-            return Ok(CalendarObject {
-                id: object_id,
-                cal: cal.clone(),
-                data: CalendarObjectComponent::Journal(JournalObject {
-                    journal: journal.clone(),
-                    ics,
-                }),
-            });
-        }
+        let vtimezones = cal
+            .timezones
+            .clone()
+            .into_iter()
+            .map(|timezone| (timezone.get_tzid().to_owned(), timezone))
+            .collect();
 
-        Err(Error::InvalidData(
-            "iCalendar component type not supported :(".to_owned(),
-        ))
+        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 {
+            data,
+            properties: cal.properties,
+            ics,
+            vtimezones,
+        })
+    }
+
+    pub fn get_vtimezones(&self) -> &HashMap<String, IcalTimeZone> {
+        &self.vtimezones
     }
 
     pub fn get_data(&self) -> &CalendarObjectComponent {
@@ -144,60 +217,62 @@ impl CalendarObject {
     }
 
     pub fn get_id(&self) -> &str {
-        &self.id
+        match &self.data {
+            // We've made sure before that the first component exists and all components share the
+            // same UID
+            CalendarObjectComponent::Todo(todo, _) => todo.get_uid(),
+            CalendarObjectComponent::Event(event, _) => event.event.get_uid(),
+            CalendarObjectComponent::Journal(journal, _) => journal.get_uid(),
+        }
     }
+
     pub fn get_etag(&self) -> String {
         let mut hasher = Sha256::new();
-        hasher.update(&self.id);
+        hasher.update(self.get_id());
         hasher.update(self.get_ics());
         format!("\"{:x}\"", hasher.finalize())
     }
 
     pub fn get_ics(&self) -> &str {
-        match &self.data {
-            CalendarObjectComponent::Todo(todo) => &todo.ics,
-            CalendarObjectComponent::Event(event) => &event.ics,
-            CalendarObjectComponent::Journal(journal) => &journal.ics,
-        }
+        &self.ics
     }
 
     pub fn get_component_name(&self) -> &str {
-        match self.data {
-            CalendarObjectComponent::Todo(_) => "VTODO",
-            CalendarObjectComponent::Event(_) => "VEVENT",
-            CalendarObjectComponent::Journal(_) => "VJOURNAL",
-        }
+        self.get_object_type().as_str()
     }
 
     pub fn get_object_type(&self) -> CalendarObjectType {
-        match self.data {
-            CalendarObjectComponent::Todo(_) => CalendarObjectType::Todo,
-            CalendarObjectComponent::Event(_) => CalendarObjectType::Event,
-            CalendarObjectComponent::Journal(_) => CalendarObjectType::Journal,
-        }
+        (&self.data).into()
     }
 
     pub fn get_first_occurence(&self) -> Result<Option<CalDateTime>, Error> {
         match &self.data {
-            CalendarObjectComponent::Event(event) => event.get_dtstart(),
+            CalendarObjectComponent::Event(main_event, overrides) => Ok(overrides
+                .iter()
+                .chain([main_event].into_iter())
+                .map(|event| event.get_dtstart())
+                .collect::<Result<Vec<_>, _>>()?
+                .into_iter()
+                .flatten()
+                .min()),
             _ => Ok(None),
         }
     }
 
     pub fn get_last_occurence(&self) -> Result<Option<CalDateTime>, Error> {
         match &self.data {
-            CalendarObjectComponent::Event(event) => event.get_last_occurence(),
+            CalendarObjectComponent::Event(main_event, overrides) => Ok(overrides
+                .iter()
+                .chain([main_event].into_iter())
+                .map(|event| event.get_last_occurence())
+                .collect::<Result<Vec<_>, _>>()?
+                .into_iter()
+                .flatten()
+                .max()),
             _ => Ok(None),
         }
     }
 
-    pub fn event(&self) -> Option<&EventObject> {
-        match &self.data {
-            CalendarObjectComponent::Event(event) => Some(event),
-            _ => None,
-        }
-    }
-
     pub fn expand_recurrence(
         &self,
         start: Option<DateTime<Utc>>,
@@ -205,9 +280,12 @@ impl CalendarObject {
     ) -> Result<String, Error> {
         // Only events can be expanded
         match &self.data {
-            CalendarObjectComponent::Event(event) => {
-                let mut cal = self.cal.clone();
-                cal.events = event.expand_recurrence(start, end)?;
+            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()),

crates/ical/src/icalendar/todo.rs

@@ -1,7 +0,0 @@
-use ical::parser::ical::component::IcalTodo;
-
-#[derive(Debug, Clone)]
-pub struct TodoObject {
-    pub todo: IcalTodo,
-    pub(crate) ics: String,
-}

crates/ical/src/lib.rs

@@ -1,14 +1,8 @@
-mod property_ext;
-pub use property_ext::*;
-
 mod timestamp;
 mod timezone;
 pub use timestamp::*;
 pub use timezone::*;
 
-mod duration;
-pub use duration::parse_duration;
-
 mod icalendar;
 pub use icalendar::*;
 

crates/ical/src/property_ext.rs

@@ -1,46 +0,0 @@
-use ical::{generator::IcalEvent, property::Property};
-
-pub trait IcalProperty {
-    fn get_param(&self, name: &str) -> Option<Vec<&str>>;
-    fn get_value_type(&self) -> Option<&str>;
-    fn get_tzid(&self) -> Option<&str>;
-}
-
-impl IcalProperty for ical::property::Property {
-    fn get_param(&self, name: &str) -> Option<Vec<&str>> {
-        self.params
-            .as_ref()?
-            .iter()
-            .find(|(key, _)| name == key)
-            .map(|(_, value)| value.iter().map(String::as_str).collect())
-    }
-
-    fn get_value_type(&self) -> Option<&str> {
-        self.get_param("VALUE")
-            .and_then(|params| params.into_iter().next())
-    }
-
-    fn get_tzid(&self) -> Option<&str> {
-        self.get_param("TZID")
-            .and_then(|params| params.into_iter().next())
-    }
-}
-
-pub trait ComponentMut {
-    fn remove_property(&mut self, name: &str);
-    fn set_property(&mut self, prop: Property);
-    fn push_property(&mut self, prop: Property);
-}
-
-impl ComponentMut for IcalEvent {
-    fn remove_property(&mut self, name: &str) {
-        self.properties.retain(|prop| prop.name != name);
-    }
-    fn set_property(&mut self, prop: Property) {
-        self.remove_property(&prop.name);
-        self.push_property(prop);
-    }
-    fn push_property(&mut self, prop: Property) {
-        self.properties.push(prop);
-    }
-}