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

fix: exclude invalid prop from allprop

Browse Source
This commit is contained in:
Lennart
2024-12-23 12:06:01 +01:00
parent fa2851dc81
commit 3e870bcbe6
6 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -86,6 +86,7 @@ pub enum CalendarProp {
Source(Option<HrefElement>), Source(Option<HrefElement>),
#[serde(other)] #[serde(other)]
#[strum_discriminants(strum(disabled))]
#[default] #[default]
Invalid, Invalid,
} }

1
crates/caldav/src/calendar_object/resource.rs
View File

@@ -36,6 +36,7 @@ pub enum CalendarObjectProp {
CalendarData(String), CalendarData(String),
#[serde(other)] #[serde(other)]
#[strum_discriminants(strum(disabled))]
#[default] #[default]
Invalid, Invalid,
} }

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

@@ -43,6 +43,7 @@ pub enum PrincipalProp {
CalendarUserAddressSet(HrefElement), CalendarUserAddressSet(HrefElement),
#[serde(other)] #[serde(other)]
#[strum_discriminants(strum(disabled))]
#[default] #[default]
Invalid, Invalid,
} }

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

@@ -37,6 +37,7 @@ pub enum AddressObjectProp {
AddressData(String), AddressData(String),
#[serde(other)] #[serde(other)]
#[strum_discriminants(strum(disabled))]
#[default] #[default]
Invalid, Invalid,
} }

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

@@ -1,5 +1,5 @@
use super::methods::mkcol::route_mkcol; use super::methods::mkcol::route_mkcol;
use super::methods::report::route_report_addressbook; // use super::methods::report::route_report_addressbook;
use super::prop::{SupportedAddressData, SupportedReportSet}; use super::prop::{SupportedAddressData, SupportedReportSet};
use crate::address_object::resource::AddressObjectResource; use crate::address_object::resource::AddressObjectResource;
use crate::principal::PrincipalResource; use crate::principal::PrincipalResource;
@@ -60,6 +60,7 @@ pub enum AddressbookProp {
Getctag(String), Getctag(String),
#[serde(other)] #[serde(other)]
#[strum_discriminants(strum(disabled))]
#[default] #[default]
Invalid, Invalid,
} }
@@ -241,8 +242,9 @@ impl<AS: AddressbookStore + ?Sized> ResourceService for AddressbookResourceServi
#[inline] #[inline]
fn actix_additional_routes(res: actix_web::Resource) -> actix_web::Resource { fn actix_additional_routes(res: actix_web::Resource) -> actix_web::Resource {
let mkcol_method = web::method(Method::from_str("MKCOL").unwrap()); let mkcol_method = web::method(Method::from_str("MKCOL").unwrap());
let report_method = web::method(Method::from_str("REPORT").unwrap()); // TODO: Re-enable REPORT
// let report_method = web::method(Method::from_str("REPORT").unwrap());
res.route(mkcol_method.to(route_mkcol::<AS>)) res.route(mkcol_method.to(route_mkcol::<AS>))
.route(report_method.to(route_report_addressbook::<AS>)) // .route(report_method.to(route_report_addressbook::<AS>))
} }
} }

1
crates/carddav/src/principal/mod.rs
View File

@@ -43,6 +43,7 @@ pub enum PrincipalProp {
PrincipalAddress(Option<HrefElement>), PrincipalAddress(Option<HrefElement>),
#[serde(other)] #[serde(other)]
#[strum_discriminants(strum(disabled))]
#[default] #[default]
Invalid, Invalid,
} }