nikdoof/rustical
1
1
Fork 0
mirror of https://github.com/lennart-k/rustical.git synced 2025-12-13 19:22:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

dav: Convert is_collection const to function which will make filesystem access easier

Browse Source
This commit is contained in:
Lennart
2025-06-14 15:21:10 +02:00
parent ca5891314c
commit 529f36ad99
8 changed files with 23 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -97,7 +97,9 @@ impl Resource for CalendarResource {
type Error = Error; type Error = Error;
type Principal = User; type Principal = User;
const IS_COLLECTION: bool = true; fn is_collection(&self) -> bool {
true
}
fn get_resourcetype(&self) -> Resourcetype { fn get_resourcetype(&self) -> Resourcetype {
if self.cal.subscription_url.is_none() { if self.cal.subscription_url.is_none() {

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

@@ -27,7 +27,9 @@ impl Resource for CalendarObjectResource {
type Error = Error; type Error = Error;
type Principal = User; type Principal = User;
const IS_COLLECTION: bool = false; fn is_collection(&self) -> bool {
false
}
fn get_resourcetype(&self) -> Resourcetype { fn get_resourcetype(&self) -> Resourcetype {
Resourcetype(&[]) Resourcetype(&[])

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

@@ -29,7 +29,9 @@ impl Resource for PrincipalResource {
type Error = Error; type Error = Error;
type Principal = User; type Principal = User;
const IS_COLLECTION: bool = true; fn is_collection(&self) -> bool {
true
}
fn get_resourcetype(&self) -> Resourcetype { fn get_resourcetype(&self) -> Resourcetype {
Resourcetype(&[ Resourcetype(&[

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

@@ -32,7 +32,9 @@ impl Resource for AddressObjectResource {
type Error = Error; type Error = Error;
type Principal = User; type Principal = User;
const IS_COLLECTION: bool = false; fn is_collection(&self) -> bool {
false
}
fn get_resourcetype(&self) -> Resourcetype { fn get_resourcetype(&self) -> Resourcetype {
Resourcetype(&[]) Resourcetype(&[])

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

@@ -38,7 +38,9 @@ impl Resource for AddressbookResource {
type Error = Error; type Error = Error;
type Principal = User; type Principal = User;
const IS_COLLECTION: bool = true; fn is_collection(&self) -> bool {
true
}
fn get_resourcetype(&self) -> Resourcetype { fn get_resourcetype(&self) -> Resourcetype {
Resourcetype(&[ Resourcetype(&[

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

@@ -29,7 +29,9 @@ impl Resource for PrincipalResource {
type Error = Error; type Error = Error;
type Principal = User; type Principal = User;
const IS_COLLECTION: bool = true; fn is_collection(&self) -> bool {
true
}
fn get_resourcetype(&self) -> Resourcetype { fn get_resourcetype(&self) -> Resourcetype {
Resourcetype(&[ Resourcetype(&[

4
crates/dav/src/resource/mod.rs
View File

@@ -37,7 +37,7 @@ pub trait Resource: Clone + Send + 'static {
type Error: From<crate::Error>; type Error: From<crate::Error>;
type Principal: Principal; type Principal: Principal;
const IS_COLLECTION: bool; fn is_collection(&self) -> bool;
fn get_resourcetype(&self) -> Resourcetype; fn get_resourcetype(&self) -> Resourcetype;
@@ -111,7 +111,7 @@ pub trait Resource: Clone + Send + 'static {
) -> Result<ResponseElement<Self::Prop>, Self::Error> { ) -> Result<ResponseElement<Self::Prop>, Self::Error> {
// Collections have a trailing slash // Collections have a trailing slash
let mut path = path.to_string(); let mut path = path.to_string();
if Self::IS_COLLECTION && !path.ends_with('/') { if self.is_collection() && !path.ends_with('/') {
path.push('/'); path.push('/');
} }

4
crates/dav/src/resources/root.rs
View File

@@ -24,7 +24,9 @@ impl<PR: Resource, P: Principal> Resource for RootResource<PR, P> {
type Error = PR::Error; type Error = PR::Error;
type Principal = P; type Principal = P;
const IS_COLLECTION: bool = true; fn is_collection(&self) -> bool {
true
}
fn get_resourcetype(&self) -> Resourcetype { fn get_resourcetype(&self) -> Resourcetype {
Resourcetype(&[ResourcetypeInner( Resourcetype(&[ResourcetypeInner(