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

calendarobject: Rename get_id to get_uid

Browse Source
This commit is contained in:
Lennart
2025-11-01 21:23:55 +01:00
parent a53c333f1f
commit db144ebcae
7 changed files with 12 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
crates/caldav/src/calendar/methods/report/mod.rs
View File

@@ -61,7 +61,7 @@ fn objects_response(
) -> Result<MultistatusElement<CalendarObjectPropWrapper, String>, Error> {
let mut responses = Vec::new();
for object in objects {
let path = format!("{}/{}.ics", path, object.get_id());
let path = format!("{}/{}.ics", path, object.get_uid());
responses.push(
CalendarObjectResource {
object,

2
crates/caldav/src/calendar/methods/report/sync_collection.rs
View File

@@ -33,7 +33,7 @@ pub async fn handle_sync_collection<C: CalendarStore>(
let mut responses = Vec::new();
for object in new_objects {
let path = format!("{}/{}.ics", path, object.get_id());
let path = format!("{}/{}.ics", path, object.get_uid());
responses.push(
CalendarObjectResource {
object,

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

@@ -82,10 +82,10 @@ pub async fn put_event<C: CalendarStore>(
debug!("invalid calendar data:\n{body}");
return Err(Error::PreconditionFailed(Precondition::ValidCalendarData));
};
if object.get_id() != object_id {
if object.get_uid() != object_id {
error!(
"Calendar object UID and file name not matching: UID={}, filename={}",
object.get_id(),
object.get_uid(),
object_id
);
return Err(Error::PreconditionFailed(Precondition::MatchingUid));

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

@@ -21,7 +21,7 @@ pub struct CalendarObjectResource {
impl ResourceName for CalendarObjectResource {
fn get_name(&self) -> String {
format!("{}.ics", self.object.get_id())
format!("{}.ics", self.object.get_uid())
}
}