nikdoof/rustical
1
1
Fork 0
mirror of https://github.com/lennart-k/rustical.git synced 2026-01-30 06:58:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

carddav addressbook: Add supported-collation-set

Browse Source
This commit is contained in:
Lennart
2025-12-31 12:25:35 +01:00
parent 17ba8faef2
commit 5c6f63a5f3
4 changed files with 55 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
crates/carddav/src/addressbook/prop.rs
View File

@@ -1,6 +1,7 @@
use derive_more::{From, Into};
use rustical_dav::{
extensions::{CommonPropertiesProp, SyncTokenExtensionProp},
xml::SupportedReportSet,
xml::{SupportedReportSet, TextCollation},
};
use rustical_dav_push::DavPushExtensionProp;
use rustical_xml::{EnumVariants, PropName, XmlDeserialize, XmlSerialize};
@@ -14,6 +15,8 @@ pub enum AddressbookProp {
AddressbookDescription(Option<String>),
#[xml(ns = "rustical_dav::namespace::NS_CARDDAV", skip_deserializing)]
SupportedAddressData(SupportedAddressData),
#[xml(ns = "rustical_dav::namespace::NS_CARDDAV", skip_deserializing)]
SupportedCollationSet(SupportedCollationSet),
#[xml(ns = "rustical_dav::namespace::NS_DAV", skip_deserializing)]
SupportedReportSet(SupportedReportSet<ReportMethod>),
#[xml(ns = "rustical_dav::namespace::NS_DAV")]
@@ -60,6 +63,29 @@ impl Default for SupportedAddressData {
}
}
#[derive(Debug, Clone, XmlSerialize, XmlDeserialize, PartialEq, Eq, From, Into)]
pub struct SupportedCollation(#[xml(ty = "text")] pub TextCollation);
#[derive(Debug, Clone, XmlSerialize, XmlDeserialize, PartialEq, Eq)]
pub struct SupportedCollationSet(
#[xml(
ns = "rustical_dav::namespace::NS_CARDDAV",
flatten,
rename = "supported-collation"
)]
pub Vec<SupportedCollation>,
);
impl Default for SupportedCollationSet {
fn default() -> Self {
Self(vec![
SupportedCollation(TextCollation::AsciiCasemap),
SupportedCollation(TextCollation::UnicodeCasemap),
SupportedCollation(TextCollation::Octet),
])
}
}
#[derive(Debug, Clone, XmlSerialize, PartialEq, Eq, VariantArray)]
pub enum ReportMethod {
#[xml(ns = "rustical_dav::namespace::NS_CARDDAV")]

6
crates/carddav/src/addressbook/resource.rs
View File

@@ -2,6 +2,7 @@ use super::prop::SupportedAddressData;
use crate::Error;
use crate::addressbook::prop::{
AddressbookProp, AddressbookPropName, AddressbookPropWrapper, AddressbookPropWrapperName,
SupportedCollationSet,
};
use derive_more::derive::{From, Into};
use rustical_dav::extensions::{CommonPropertiesExtension, SyncTokenExtension};
@@ -62,6 +63,9 @@ impl Resource for AddressbookResource {
AddressbookPropName::MaxResourceSize => {
AddressbookProp::MaxResourceSize(10_000_000)
}
AddressbookPropName::SupportedCollationSet => {
AddressbookProp::SupportedCollationSet(SupportedCollationSet::default())
}
AddressbookPropName::SupportedReportSet => {
AddressbookProp::SupportedReportSet(SupportedReportSet::all())
}
@@ -94,6 +98,7 @@ impl Resource for AddressbookResource {
Ok(())
}
AddressbookProp::MaxResourceSize(_)
| AddressbookProp::SupportedCollationSet(_)
| AddressbookProp::SupportedReportSet(_)
| AddressbookProp::SupportedAddressData(_) => {
Err(rustical_dav::Error::PropReadOnly)
@@ -116,6 +121,7 @@ impl Resource for AddressbookResource {
Ok(())
}
AddressbookPropName::MaxResourceSize
| AddressbookPropName::SupportedCollationSet
| AddressbookPropName::SupportedReportSet
| AddressbookPropName::SupportedAddressData => {
Err(rustical_dav::Error::PropReadOnly)

17
crates/carddav/src/addressbook/snapshots/rustical_carddav__addressbook__tests__propfind-2.snap
View File

@@ -31,6 +31,23 @@ ResponseElement {
},
),
),
Addressbook(
SupportedCollationSet(
SupportedCollationSet(
[
SupportedCollation(
AsciiCasemap,
),
SupportedCollation(
UnicodeCasemap,
),
SupportedCollation(
Octet,
),
],
),
),
),
Addressbook(
SupportedReportSet(
SupportedReportSet {

5
crates/carddav/src/addressbook/snapshots/rustical_carddav__addressbook__tests__propfind-3.snap
View File

@@ -11,6 +11,11 @@ expression: response.serialize_to_string().unwrap()
<address-data-type xmlns="urn:ietf:params:xml:ns:carddav" content-type="text/vcard" version="3.0"/>
<address-data-type xmlns="urn:ietf:params:xml:ns:carddav" content-type="text/vcard" version="4.0"/>
</supported-address-data>
<supported-collation-set xmlns="urn:ietf:params:xml:ns:carddav">
<supported-collation xmlns="urn:ietf:params:xml:ns:carddav">i;ascii-casemap</supported-collation>
<supported-collation xmlns="urn:ietf:params:xml:ns:carddav">i;unicode-casemap</supported-collation>
<supported-collation xmlns="urn:ietf:params:xml:ns:carddav">i;octet</supported-collation>
</supported-collation-set>
<supported-report-set xmlns="DAV:">
<supported-report xmlns="DAV:">
<report xmlns="DAV:">