aboutsummaryrefslogtreecommitdiff
path: root/src/calendar.rs
diff options
context:
space:
mode:
Diffstat (limited to 'src/calendar.rs')
-rw-r--r--src/calendar.rs6
1 files changed, 5 insertions, 1 deletions
diff --git a/src/calendar.rs b/src/calendar.rs
index ab465ea..a835480 100644
--- a/src/calendar.rs
+++ b/src/calendar.rs
@@ -65,7 +65,11 @@ impl Calendar {
pub fn get(&self, first: &Date, last: &Date) -> Vec<Event> {
let mut events = event::get(&self.single, first, last).to_vec();
for p in &self.periodic {
- events.append(&mut p.get(first, last));
+ let mut p_events = p.iter()
+ .skip_while(|e| e.end_date() < *first)
+ .take_while(|e| e.start <= *last)
+ .collect();
+ events.append(&mut p_events);
}
events.sort_by_key(|k| k.start);
events