mirror of
https://github.com/lennart-k/rustical.git
synced 2025-12-13 20:32:48 +00:00
Comment out some code snippets that might break things at the moment
This commit is contained in:
@@ -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![]);
|
||||
// }
|
||||
}
|
||||
|
||||
@@ -67,40 +67,40 @@ impl EventObject {
|
||||
RecurrenceRule::parse(rrule).map(Some)
|
||||
}
|
||||
|
||||
pub fn expand_recurrence(&self) -> Result<Vec<IcalEvent>, 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<Vec<IcalEvent>, 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)]
|
||||
|
||||
@@ -184,11 +184,11 @@ impl CalendarObject {
|
||||
pub fn expand_recurrence(&self) -> Result<String, Error> {
|
||||
// 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()),
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user