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

RRULE expansion: Fix timezone

Browse Source
This commit is contained in:
Lennart
2025-06-09 23:14:25 +02:00
parent 49aab931d0
commit 5ee789bec1
1 changed files with 11 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
crates/ical/src/icalendar/event.rs
View File

@@ -63,6 +63,11 @@ impl EventObject {
pub fn recurrence_ruleset(&self) -> Result<Option<rrule::RRuleSet>, Error> { pub fn recurrence_ruleset(&self) -> Result<Option<rrule::RRuleSet>, Error> {
let dtstart: DateTime<rrule::Tz> = if let Some(dtstart) = self.get_first_occurence()? { let dtstart: DateTime<rrule::Tz> = if let Some(dtstart) = self.get_first_occurence()? {
if let Some(dtend) = self.get_dtend()? {
// DTSTART and DTEND MUST have the same timezone
assert_eq!(dtstart.timezone(), dtend.timezone());
}
dtstart dtstart
.as_datetime() .as_datetime()
.with_timezone(&dtstart.timezone().into()) .with_timezone(&dtstart.timezone().into())
@@ -125,10 +130,13 @@ impl EventObject {
ev.remove_property("RDATE"); ev.remove_property("RDATE");
ev.remove_property("EXDATE"); ev.remove_property("EXDATE");
ev.remove_property("EXRULE"); ev.remove_property("EXRULE");
let dtstart_prop = ev
.get_property("DTSTART")
.expect("We must have a DTSTART here")
.clone();
ev.remove_property("DTSTART"); ev.remove_property("DTSTART");
ev.remove_property("DTEND"); ev.remove_property("DTEND");
// TODO: Recurrence does not seem to properly include the start // TODO: Recurrence does not seem to properly include the start
// TODO: Timezone fixing
ev.set_property(Property { ev.set_property(Property {
name: "RECURRENCE-ID".to_string(), name: "RECURRENCE-ID".to_string(),
value: Some(date.format()), value: Some(date.format()),
@@ -137,13 +145,13 @@ impl EventObject {
ev.set_property(Property { ev.set_property(Property {
name: "DTSTART".to_string(), name: "DTSTART".to_string(),
value: Some(date.format()), value: Some(date.format()),
params: None, params: dtstart_prop.params.clone(),
}); });
if let Some(duration) = computed_duration { if let Some(duration) = computed_duration {
ev.set_property(Property { ev.set_property(Property {
name: "DTEND".to_string(), name: "DTEND".to_string(),
value: Some((date + duration).format()), value: Some((date + duration).format()),
params: None, params: dtstart_prop.params,
}); });
} }
events.push(ev); events.push(ev);