Expand recurring caldav events

Fixes #2186

Author: bim9262

Cargo.lock

@@ -43,7 +43,7 @@ env_logger = "0.11"
 futures = { version = "0.3.31", default-features = false }
 glob = { version = "0.3.1", optional = true }
 iana-time-zone = "0.1.60"
-icalendar = { version = "0.16.2", features = ["chrono-tz"] }
+icalendar = { git = "https://github.com/hoodie/icalendar", rev = "46b9a8859b81854c42d823ed21773d77afac63a7", features = ["chrono-tz", "recurrence"] }
 icu_calendar = { version = "1.3.0", optional = true }
 icu_datetime = { version = "1.3.0", optional = true }
 icu_locid = { version = "1.3.0", optional = true }

Cargo.toml

@@ -139,6 +139,7 @@ words:
   - retval
   - rofi
   - rofication
+  - rrule
   - rsplit
   - rtattr
   - rtattrs

cspell.yaml

@@ -1,7 +1,7 @@
 use std::{str::FromStr as _, time::Duration, vec};
 
-use chrono::{DateTime, Local, Utc};
-use icalendar::{Component as _, EventLike as _};
+use chrono::{DateTime, Datelike as _, Local, TimeZone as _, Timelike as _, Utc};
+use icalendar::{Component as _, EventLike as _, rrule::Tz};
 use reqwest::{
     self, ClientBuilder, Method, Url,
     header::{CONTENT_TYPE, HeaderMap, HeaderValue},
@@ -301,20 +301,57 @@ fn parse_events(multi_status: Multistatus) -> Result<Vec<Event>, CalendarError>
                     icalendar::Calendar::from_str(&data).map_err(CalendarError::Parsing)?;
                 for component in calendar.components {
                     if let icalendar::CalendarComponent::Event(event) = component {
-                        let start_at = event.get_start().and_then(|d| match d {
+                        let mut start_at = event.get_start().and_then(|d| match d {
                             icalendar::DatePerhapsTime::DateTime(dt) => dt.try_into_utc(),
                             icalendar::DatePerhapsTime::Date(d) => d
                                 .and_hms_opt(0, 0, 0)
                                 .and_then(|d| d.and_local_timezone(Local).earliest())
                                 .map(|d| d.to_utc()),
                         });
-                        let end_at = event.get_end().and_then(|d| match d {
+                        let mut end_at = event.get_end().and_then(|d| match d {
                             icalendar::DatePerhapsTime::DateTime(dt) => dt.try_into_utc(),
                             icalendar::DatePerhapsTime::Date(d) => d
                                 .and_hms_opt(23, 59, 59)
                                 .and_then(|d| d.and_local_timezone(Local).earliest())
                                 .map(|d| d.to_utc()),
                         });
+
+                        let today_dt = Local::now()
+                            .date_naive()
+                            .and_hms_opt(0, 0, 0)
+                            .expect("A valid time")
+                            .and_local_timezone(Local)
+                            .earliest()
+                            .expect("A valid datetime")
+                            .to_utc();
+                        let today_rrule_dt = Tz::UTC
+                            .with_ymd_and_hms(
+                                today_dt.year(),
+                                today_dt.month(),
+                                today_dt.day(),
+                                today_dt.hour(),
+                                today_dt.minute(),
+                                today_dt.second(),
+                            )
+                            .earliest()
+                            .unwrap();
+
+                        if let Some(s) = start_at
+                            && let Some(rrule_set) = event.get_recurrence()
+                            && let Some(new_start) = rrule_set
+                                .after(today_rrule_dt)
+                                .all(1)
+                                .dates
+                                .first()
+                                .map(|dt| dt.to_utc())
+                        {
+                            start_at.replace(new_start);
+                            if let Some(e) = end_at {
+                                let duration = e - s;
+                                end_at.replace(new_start + duration);
+                            }
+                        }
+
                         result.push(Event {
                             uid: event.get_uid().map(Into::into),
                             summary: event.get_summary().map(Into::into),