nikdoof/rustical
1
1
Fork 0
mirror of https://github.com/lennart-k/rustical.git synced 2025-12-13 22:52:22 +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

14
crates/caldav/src/calendar/resource.rs
View File

@@ -1,4 +1,4 @@
use crate::event::resource::EventFile;
use crate::event::resource::EventResource;
use crate::Error;
use actix_web::{web::Data, HttpRequest};
use anyhow::anyhow;
@@ -19,7 +19,7 @@ use super::prop::{
SupportedReportSet, UserPrivilegeSet,
};
pub struct CalendarResource<C: CalendarStore + ?Sized> {
pub struct CalendarResourceService<C: CalendarStore + ?Sized> {
pub cal_store: Arc<RwLock<C>>,
pub path: String,
pub principal: String,
@@ -89,9 +89,9 @@ impl InvalidProperty for CalendarProp {
}
#[derive(Clone, Debug, From, Into)]
pub struct CalendarFile(Calendar);
pub struct CalendarResource(Calendar);
impl Resource for CalendarFile {
impl Resource for CalendarResource {
type PropName = CalendarPropName;
type Prop = CalendarProp;
type Error = Error;
@@ -226,10 +226,10 @@ impl Resource for CalendarFile {
}
#[async_trait(?Send)]
impl<C: CalendarStore + ?Sized> ResourceService for CalendarResource<C> {
type MemberType = EventFile;
impl<C: CalendarStore + ?Sized> ResourceService for CalendarResourceService<C> {
type MemberType = EventResource;
type PathComponents = (String, String); // principal, calendar_id
type File = CalendarFile;
type File = CalendarResource;
type Error = Error;
async fn get_file(&self) -> Result<Self::File, Error> {