nikdoof/rustical
1
1
Fork 0
mirror of https://github.com/lennart-k/rustical.git synced 2025-12-14 12:52:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

store: Refactoring to split calendar and addressbook

Browse Source
This commit is contained in:
Lennart
2024-10-28 17:44:22 +01:00
parent a44cbeb687
commit db01df5cb8
29 changed files with 40 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
crates/carddav/src/address_object/methods.rs
View File

@@ -6,8 +6,7 @@ use actix_web::web::{Data, Path};
use actix_web::HttpRequest;
use actix_web::HttpResponse;
use rustical_store::auth::User;
use rustical_store::model::AddressObject;
use rustical_store::AddressbookStore;
use rustical_store::{AddressObject, AddressbookStore};
use tracing::instrument;
use tracing_actix_web::RootSpan;

2
crates/carddav/src/address_object/resource.rs
View File

@@ -3,7 +3,7 @@ use actix_web::{dev::ResourceMap, web::Data, HttpRequest};
use async_trait::async_trait;
use derive_more::derive::{From, Into};
use rustical_dav::resource::{InvalidProperty, Resource, ResourceService};
use rustical_store::{model::AddressObject, AddressbookStore};
use rustical_store::{AddressObject, AddressbookStore};
use serde::{Deserialize, Serialize};
use std::sync::Arc;
use strum::{EnumString, VariantNames};

3
crates/carddav/src/addressbook/methods/mkcol.rs
View File

@@ -1,8 +1,7 @@
use crate::Error;
use actix_web::web::Path;
use actix_web::{web::Data, HttpResponse};
use rustical_store::model::Addressbook;
use rustical_store::{auth::User, AddressbookStore};
use rustical_store::{auth::User, Addressbook, AddressbookStore};
use serde::{Deserialize, Serialize};
#[derive(Deserialize, Serialize, Clone, Debug)]

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

@@ -16,7 +16,7 @@ use rustical_dav::{
MultistatusElement,
},
};
use rustical_store::{model::AddressObject, AddressbookStore};
use rustical_store::{AddressObject, AddressbookStore};
use serde::Deserialize;
#[derive(Deserialize, Clone, Debug)]

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

@@ -12,7 +12,7 @@ use rustical_dav::{
},
};
use rustical_store::{
model::addressbook::{format_synctoken, parse_synctoken},
addressbook::{format_synctoken, parse_synctoken},
AddressbookStore,
};
use serde::Deserialize;

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

@@ -12,8 +12,7 @@ use async_trait::async_trait;
use derive_more::derive::{From, Into};
use rustical_dav::resource::{InvalidProperty, Resource, ResourceService};
use rustical_dav::xml::HrefElement;
use rustical_store::model::Addressbook;
use rustical_store::AddressbookStore;
use rustical_store::{Addressbook, AddressbookStore};
use serde::{Deserialize, Serialize};
use std::str::FromStr;
use std::sync::Arc;