birthday calendar, lots of refactoring

crates/carddav/src/address_object/resource.rs

@@ -76,11 +76,6 @@ impl Resource for AddressObjectResource {
         })
     }
 
-    #[inline]
-    fn resource_name() -> &'static str {
-        "carddav_address_object"
-    }
-
     fn get_owner(&self) -> Option<&str> {
         Some(&self.principal)
     }

crates/carddav/src/addressbook/methods/report/addressbook_multiget.rs

@@ -1,6 +1,5 @@
 use crate::{
     address_object::resource::{AddressObjectProp, AddressObjectResource},
-    principal::PrincipalResource,
     Error,
 };
 use actix_web::{
@@ -10,8 +9,7 @@ use actix_web::{
 };
 use rustical_dav::{
     resource::{CommonPropertiesProp, EitherProp, Resource},
-    xml::{multistatus::ResponseElement, MultistatusElement},
-    xml::{PropElement, PropfindType},
+    xml::{multistatus::ResponseElement, MultistatusElement, PropElement, PropfindType},
 };
 use rustical_store::{auth::User, AddressObject, AddressbookStore};
 use rustical_xml::XmlDeserialize;
@@ -27,13 +25,12 @@ pub struct AddressbookMultigetRequest {
 
 pub async fn get_objects_addressbook_multiget<AS: AddressbookStore + ?Sized>(
     addressbook_multiget: &AddressbookMultigetRequest,
-    principal_url: &str,
+    path: &str,
     principal: &str,
     addressbook_id: &str,
     store: &AS,
 ) -> Result<(Vec<AddressObject>, Vec<String>), Error> {
-    let resource_def =
-        ResourceDef::prefix(principal_url).join(&ResourceDef::new("/{addressbook_id}/{object_id}"));
+    let resource_def = ResourceDef::prefix(path).join(&ResourceDef::new("/{object_id}"));
 
     let mut result = vec![];
     let mut not_found = vec![];
@@ -67,15 +64,9 @@ pub async fn handle_addressbook_multiget<AS: AddressbookStore + ?Sized>(
     addr_store: &AS,
 ) -> Result<MultistatusElement<EitherProp<AddressObjectProp, CommonPropertiesProp>, String>, Error>
 {
-    let principal_url = PrincipalResource::get_url(req.resource_map(), vec![principal]).unwrap();
-    let (objects, not_found) = get_objects_addressbook_multiget(
-        &addr_multiget,
-        &principal_url,
-        principal,
-        cal_id,
-        addr_store,
-    )
-    .await?;
+    let (objects, not_found) =
+        get_objects_addressbook_multiget(&addr_multiget, req.path(), principal, cal_id, addr_store)
+            .await?;
 
     let props = match addr_multiget.prop {
         PropfindType::Allprop => {

crates/carddav/src/addressbook/methods/report/sync_collection.rs

@@ -83,11 +83,7 @@ pub async fn handle_sync_collection<AS: AddressbookStore + ?Sized>(
 
     let mut responses = Vec::new();
     for object in new_objects {
-        let path = AddressObjectResource::get_url(
-            req.resource_map(),
-            vec![principal, addressbook_id, &object.get_id()],
-        )
-        .unwrap();
+        let path = format!("{}/{}", req.path().trim_end_matches('/'), object.get_id());
         responses.push(
             AddressObjectResource {
                 object,
@@ -98,11 +94,7 @@ pub async fn handle_sync_collection<AS: AddressbookStore + ?Sized>(
     }
 
     for object_id in deleted_objects {
-        let path = AddressObjectResource::get_url(
-            req.resource_map(),
-            vec![principal, addressbook_id, &object_id],
-        )
-        .unwrap();
+        let path = format!("{}/{}", req.path().trim_end_matches('/'), object_id);
         responses.push(ResponseElement {
             href: path,
             status: Some(StatusCode::NOT_FOUND),

crates/carddav/src/addressbook/resource.rs

@@ -143,11 +143,6 @@ impl Resource for AddressbookResource {
         }
     }
 
-    #[inline]
-    fn resource_name() -> &'static str {
-        "carddav_addressbook"
-    }
-
     fn get_owner(&self) -> Option<&str> {
         Some(&self.0.principal)
     }
@@ -179,7 +174,6 @@ impl<AS: AddressbookStore + ?Sized> ResourceService for AddressbookResourceServi
     async fn get_members(
         &self,
         (principal, addressbook_id): &Self::PathComponents,
-        rmap: &ResourceMap,
     ) -> Result<Vec<(String, Self::MemberType)>, Self::Error> {
         Ok(self
             .addr_store
@@ -188,11 +182,7 @@ impl<AS: AddressbookStore + ?Sized> ResourceService for AddressbookResourceServi
             .into_iter()
             .map(|object| {
                 (
-                    AddressObjectResource::get_url(
-                        rmap,
-                        vec![principal, addressbook_id, object.get_id()],
-                    )
-                    .unwrap(),
+                    object.get_id().to_string(),
                     AddressObjectResource {
                         object,
                         principal: principal.to_owned(),

crates/carddav/src/lib.rs

@@ -12,7 +12,7 @@ use address_object::resource::AddressObjectResourceService;
 use addressbook::resource::AddressbookResourceService;
 pub use error::Error;
 use principal::{PrincipalResource, PrincipalResourceService};
-use rustical_dav::resource::ResourceService;
+use rustical_dav::resource::{NamedRoute, ResourceService};
 use rustical_dav::resources::RootResourceService;
 use rustical_store::{
     auth::{AuthenticationMiddleware, AuthenticationProvider},
@@ -62,7 +62,11 @@ pub fn configure_dav<AP: AuthenticationProvider, A: AddressbookStore + ?Sized>(
             .service(
                 web::scope("/user").service(
                     web::scope("/{principal}")
-                        .service(PrincipalResourceService::<A>::new(store.clone()).actix_resource())
+                        .service(
+                            PrincipalResourceService::new(store.clone())
+                                .actix_resource()
+                                .name(PrincipalResource::route_name()),
+                        )
                         .service(
                             web::scope("/{addressbook}")
                                 .service(

crates/carddav/src/principal/mod.rs

@@ -3,7 +3,7 @@ use crate::Error;
 use actix_web::dev::ResourceMap;
 use async_trait::async_trait;
 use rustical_dav::privileges::UserPrivilegeSet;
-use rustical_dav::resource::{Resource, ResourceService};
+use rustical_dav::resource::{NamedRoute, Resource, ResourceService};
 use rustical_dav::xml::{HrefElement, Resourcetype, ResourcetypeInner};
 use rustical_store::auth::User;
 use rustical_store::AddressbookStore;
@@ -52,6 +52,12 @@ impl PrincipalResource {
     }
 }
 
+impl NamedRoute for PrincipalResource {
+    fn route_name() -> &'static str {
+        "carddav_principal"
+    }
+}
+
 impl Resource for PrincipalResource {
     type PropName = PrincipalPropName;
     type Prop = PrincipalProp;
@@ -82,11 +88,6 @@ impl Resource for PrincipalResource {
         })
     }
 
-    #[inline]
-    fn resource_name() -> &'static str {
-        "carddav_principal"
-    }
-
     fn get_owner(&self) -> Option<&str> {
         Some(&self.principal)
     }
@@ -115,17 +116,11 @@ impl<A: AddressbookStore + ?Sized> ResourceService for PrincipalResourceService<
     async fn get_members(
         &self,
         (principal,): &Self::PathComponents,
-        rmap: &ResourceMap,
     ) -> Result<Vec<(String, Self::MemberType)>, Self::Error> {
         let addressbooks = self.addr_store.get_addressbooks(principal).await?;
         Ok(addressbooks
             .into_iter()
-            .map(|addressbook| {
-                (
-                    AddressbookResource::get_url(rmap, vec![principal, &addressbook.id]).unwrap(),
-                    addressbook.into(),
-                )
-            })
+            .map(|addressbook| (addressbook.id.to_owned(), addressbook.into()))
             .collect())
     }
 }