dav: Move displayname to common properties

crates/caldav/src/calendar/resource.rs

@@ -19,10 +19,6 @@ use std::str::FromStr;
 #[derive(XmlDeserialize, XmlSerialize, PartialEq, Clone, EnumVariants, PropName)]
 #[xml(unit_variants_ident = "CalendarPropName")]
 pub enum CalendarProp {
-    // WebDAV (RFC 2518)
-    #[xml(ns = "rustical_dav::namespace::NS_DAV")]
-    Displayname(Option<String>),
-
     // CalDAV (RFC 4791)
     #[xml(ns = "rustical_dav::namespace::NS_ICAL")]
     CalendarColor(Option<String>),
@@ -127,9 +123,6 @@ impl Resource for CalendarResource {
     ) -> Result<Self::Prop, Self::Error> {
         Ok(match prop {
             CalendarPropWrapperName::Calendar(prop) => CalendarPropWrapper::Calendar(match prop {
-                CalendarPropName::Displayname => {
-                    CalendarProp::Displayname(self.cal.displayname.clone())
-                }
                 CalendarPropName::CalendarColor => {
                     CalendarProp::CalendarColor(self.cal.color.clone())
                 }
@@ -187,10 +180,6 @@ impl Resource for CalendarResource {
         }
         match prop {
             CalendarPropWrapper::Calendar(prop) => match prop {
-                CalendarProp::Displayname(displayname) => {
-                    self.cal.displayname = displayname;
-                    Ok(())
-                }
                 CalendarProp::CalendarColor(color) => {
                     self.cal.color = color;
                     Ok(())
@@ -247,10 +236,6 @@ impl Resource for CalendarResource {
         }
         match prop {
             CalendarPropWrapperName::Calendar(prop) => match prop {
-                CalendarPropName::Displayname => {
-                    self.cal.displayname = None;
-                    Ok(())
-                }
                 CalendarPropName::CalendarColor => {
                     self.cal.color = None;
                     Ok(())
@@ -291,6 +276,14 @@ impl Resource for CalendarResource {
         }
     }
 
+    fn get_displayname(&self) -> Option<&str> {
+        self.cal.displayname.as_deref()
+    }
+    fn set_displayname(&mut self, name: Option<String>) -> Result<(), rustical_dav::Error> {
+        self.cal.displayname = name;
+        Ok(())
+    }
+
     fn get_owner(&self) -> Option<&str> {
         Some(&self.cal.principal)
     }

crates/caldav/src/calendar_object/resource.rs

@@ -66,6 +66,11 @@ impl Resource for CalendarObjectResource {
         })
     }
 
+    fn get_displayname(&self) -> Option<&str> {
+        // TODO: Extract summary from object
+        None
+    }
+
     fn get_owner(&self) -> Option<&str> {
         Some(&self.principal)
     }

crates/caldav/src/principal/mod.rs

@@ -56,12 +56,6 @@ impl Resource for PrincipalResource {
                     PrincipalPropName::CalendarUserType => {
                         PrincipalProp::CalendarUserType(self.principal.principal_type.to_owned())
                     }
-                    PrincipalPropName::Displayname => PrincipalProp::Displayname(
-                        self.principal
-                            .displayname
-                            .to_owned()
-                            .unwrap_or(self.principal.id.to_owned()),
-                    ),
                     PrincipalPropName::PrincipalUrl => {
                         PrincipalProp::PrincipalUrl(principal_url.into())
                     }
@@ -77,6 +71,15 @@ impl Resource for PrincipalResource {
         })
     }
 
+    fn get_displayname(&self) -> Option<&str> {
+        Some(
+            self.principal
+                .displayname
+                .as_ref()
+                .unwrap_or(&self.principal.id),
+        )
+    }
+
     fn get_owner(&self) -> Option<&str> {
         Some(&self.principal.id)
     }

crates/caldav/src/principal/prop.rs

@@ -5,9 +5,6 @@ use rustical_xml::{EnumVariants, PropName, XmlDeserialize, XmlSerialize};
 #[derive(XmlDeserialize, XmlSerialize, PartialEq, Clone, EnumVariants, PropName)]
 #[xml(unit_variants_ident = "PrincipalPropName")]
 pub enum PrincipalProp {
-    #[xml(ns = "rustical_dav::namespace::NS_DAV")]
-    Displayname(String),
-
     // Scheduling Extensions to CalDAV (RFC 6638)
     #[xml(ns = "rustical_dav::namespace::NS_CALDAV", skip_deserializing)]
     CalendarUserType(PrincipalType),