From cf3e2138948f752e5fd2fdb774cc0ce3315a8382 Mon Sep 17 00:00:00 2001 From: Lennart <18233294+lennart-k@users.noreply.github.com> Date: Mon, 2 Jun 2025 22:36:40 +0200 Subject: [PATCH] Comment out some code snippets that might break things at the moment --- crates/ical/src/rrule/iter.rs | 16 +++---- crates/store/src/calendar/event.rs | 68 ++++++++++++++--------------- crates/store/src/calendar/object.rs | 10 ++--- 3 files changed, 47 insertions(+), 47 deletions(-) diff --git a/crates/ical/src/rrule/iter.rs b/crates/ical/src/rrule/iter.rs index 85b1746..541cd2f 100644 --- a/crates/ical/src/rrule/iter.rs +++ b/crates/ical/src/rrule/iter.rs @@ -199,13 +199,13 @@ impl RecurrenceRule { #[cfg(test)] mod tests { - use crate::{CalDateTime, rrule::RecurrenceRule}; + // use crate::{CalDateTime, rrule::RecurrenceRule}; - #[test] - fn test_between() { - // Example: Last workday of the month - let rrule = RecurrenceRule::parse("FREQ=MONTHLY;BYDAY=MO,TU,WE,TH,FR;BYSETPOS=-1").unwrap(); - let start = CalDateTime::parse("20250516T133000Z", None).unwrap(); - assert_eq!(rrule.between(start, None, Some(4)), vec![]); - } + // #[test] + // fn test_between() { + // // Example: Last workday of the month + // let rrule = RecurrenceRule::parse("FREQ=MONTHLY;BYDAY=MO,TU,WE,TH,FR;BYSETPOS=-1").unwrap(); + // let start = CalDateTime::parse("20250516T133000Z", None).unwrap(); + // assert_eq!(rrule.between(start, None, Some(4)), vec![]); + // } } diff --git a/crates/store/src/calendar/event.rs b/crates/store/src/calendar/event.rs index 2bbec76..89ea14a 100644 --- a/crates/store/src/calendar/event.rs +++ b/crates/store/src/calendar/event.rs @@ -67,40 +67,40 @@ impl EventObject { RecurrenceRule::parse(rrule).map(Some) } - pub fn expand_recurrence(&self) -> Result, Error> { - if let Some(rrule) = self.recurrence_rule()? { - let mut events = vec![]; - let first_occurence = self.get_first_occurence()?.unwrap(); - let dates = rrule.between(first_occurence, None, None); - - for date in dates { - let dtstart_utc = date; - let mut ev = self.event.clone(); - ev.remove_property("RRULE"); - ev.set_property(Property { - name: "RECURRENCE-ID".to_string(), - value: Some(dtstart_utc.format()), - params: None, - }); - ev.set_property(Property { - name: "DTSTART".to_string(), - value: Some(dtstart_utc.format()), - params: None, - }); - if let Some(duration) = self.get_duration()? { - ev.set_property(Property { - name: "DTEND".to_string(), - value: Some((dtstart_utc + duration).format()), - params: None, - }); - } - events.push(ev); - } - Ok(events) - } else { - Ok(vec![self.event.clone()]) - } - } + // pub fn expand_recurrence(&self) -> Result, Error> { + // if let Some(rrule) = self.recurrence_rule()? { + // let mut events = vec![]; + // let first_occurence = self.get_first_occurence()?.unwrap(); + // let dates = rrule.between(first_occurence, None, None); + // + // for date in dates { + // let dtstart_utc = date; + // let mut ev = self.event.clone(); + // ev.remove_property("RRULE"); + // ev.set_property(Property { + // name: "RECURRENCE-ID".to_string(), + // value: Some(dtstart_utc.format()), + // params: None, + // }); + // ev.set_property(Property { + // name: "DTSTART".to_string(), + // value: Some(dtstart_utc.format()), + // params: None, + // }); + // if let Some(duration) = self.get_duration()? { + // ev.set_property(Property { + // name: "DTEND".to_string(), + // value: Some((dtstart_utc + duration).format()), + // params: None, + // }); + // } + // events.push(ev); + // } + // Ok(events) + // } else { + // Ok(vec![self.event.clone()]) + // } + // } } #[cfg(test)] diff --git a/crates/store/src/calendar/object.rs b/crates/store/src/calendar/object.rs index 4fb7e5b..18094b1 100644 --- a/crates/store/src/calendar/object.rs +++ b/crates/store/src/calendar/object.rs @@ -184,11 +184,11 @@ impl CalendarObject { pub fn expand_recurrence(&self) -> Result { // Only events can be expanded match &self.data { - CalendarObjectComponent::Event(event) => { - let mut cal = self.cal.clone(); - cal.events = event.expand_recurrence()?; - Ok(cal.generate()) - } + // CalendarObjectComponent::Event(event) => { + // let mut cal = self.cal.clone(); + // cal.events = event.expand_recurrence()?; + // Ok(cal.generate()) + // } _ => Ok(self.get_ics().to_string()), } }