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

caldav: Refactoring to for consistent terminology between resources and resource services

Browse Source
This commit is contained in:
Lennart
2024-09-29 14:00:06 +02:00
parent 7f164da438
commit 2a347f0616
8 changed files with 58 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
crates/caldav/src/principal/mod.rs
View File

@@ -11,16 +11,16 @@ use std::sync::Arc;
use strum::{EnumString, VariantNames};
use tokio::sync::RwLock;
use crate::calendar::resource::CalendarFile;
use crate::calendar::resource::CalendarResource;
pub struct PrincipalResource<C: CalendarStore + ?Sized> {
pub struct PrincipalResourceService<C: CalendarStore + ?Sized> {
principal: String,
path: String,
cal_store: Arc<RwLock<C>>,
}
#[derive(Clone)]
pub struct PrincipalFile {
pub struct PrincipalResource {
principal: String,
}
@@ -63,7 +63,7 @@ pub enum PrincipalPropName {
CalendarUserAddressSet,
}
impl Resource for PrincipalFile {
impl Resource for PrincipalResource {
type PropName = PrincipalPropName;
type Prop = PrincipalProp;
type Error = Error;
@@ -85,10 +85,10 @@ impl Resource for PrincipalFile {
}
#[async_trait(?Send)]
impl<C: CalendarStore + ?Sized> ResourceService for PrincipalResource<C> {
impl<C: CalendarStore + ?Sized> ResourceService for PrincipalResourceService<C> {
type PathComponents = (String,);
type MemberType = CalendarFile;
type File = PrincipalFile;
type MemberType = CalendarResource;
type File = PrincipalResource;
type Error = Error;
async fn new(
@@ -113,7 +113,7 @@ impl<C: CalendarStore + ?Sized> ResourceService for PrincipalResource<C> {
}
async fn get_file(&self) -> Result<Self::File, Self::Error> {
Ok(PrincipalFile {
Ok(PrincipalResource {
principal: self.principal.to_owned(),
})
}