From 351f0e057bcd11a840601e0544d2163f893fc73d Mon Sep 17 00:00:00 2001 From: Astro Date: Wed, 26 May 2021 20:16:25 +0200 Subject: [PATCH] fix RRULE --- libticker/src/ics/parser.rs | 2 ++ ticker-update/src/main.rs | 8 +------- 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/libticker/src/ics/parser.rs b/libticker/src/ics/parser.rs index f673ce0..ebf1df3 100644 --- a/libticker/src/ics/parser.rs +++ b/libticker/src/ics/parser.rs @@ -87,6 +87,7 @@ mod test { p.feed(b"BEGIN:VEVENT SUMMARY:Test event DTSTART:19700101 +RRULE:FREQ=YEARLY END:VEVENT ", |o| { @@ -96,6 +97,7 @@ END:VEVENT assert_eq!(obj, Some(Object { name: "VEVENT".to_owned(), content: [("SUMMARY", "Test event"), + ("RRULE", "FREQ=YEARLY"), ("DTSTART", "19700101")] .iter() .cloned() diff --git a/ticker-update/src/main.rs b/ticker-update/src/main.rs index 00cd3c7..26e6e09 100644 --- a/ticker-update/src/main.rs +++ b/ticker-update/src/main.rs @@ -62,7 +62,7 @@ fn obj_to_events(calendar: String, obj: &Object) -> Vec { } }; - let rrule_str: Option<&str> = obj.get("rrule"); + let rrule_str: Option<&str> = obj.get("RRULE"); let rrule = rrule_str.and_then( |rrule_str| RRule::from_str( &format!("DTSTART:{}\nRRULE:{}", dtstart_str, rrule_str) @@ -74,12 +74,6 @@ fn obj_to_events(calendar: String, obj: &Object) -> Vec { let now = Utc::now(); let start = now - Duration::days(RRULE_LOOKBACK); let end = now + Duration::days(RRULE_LOOKAHEAD); - println!("rrule {}:\n{:?}", rrule_str.unwrap_or(""), rrule.into_iter() - .skip_while(|d| *d < start) - .take_while(|d| *d <= end) - .map(|dtstart| dtstart.naive_utc()) - .collect::>() - ); rrule.into_iter() .skip_while(|d| *d < start) .take_while(|d| *d <= end)