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

Make AddressObject object_id an extrinsic property

Browse Source
This commit is contained in:
Lennart K
2026-01-07 12:19:30 +01:00
parent a9f3833a32
commit 758793a11a
15 changed files with 98 additions and 94 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
crates/carddav/src/addressbook/methods/report/addressbook_multiget.rs
View File

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

4
crates/carddav/src/addressbook/methods/report/addressbook_query/mod.rs
View File

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

2
crates/carddav/src/addressbook/methods/report/addressbook_query/tests.rs
View File

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

7
crates/carddav/src/addressbook/methods/report/mod.rs
View File

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

5
crates/carddav/src/addressbook/methods/report/sync_collection.rs
View File

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