From ff727ea02ce5019d22f407ee872ead26479ffc2a Mon Sep 17 00:00:00 2001
From: Ruben Pollan
Date: Tue, 27 Nov 2018 10:26:54 -0600
Subject: Convert periodic into iterator

---
 src/calendar.rs | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

(limited to 'src/calendar.rs')

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
-- 
cgit v1.2.3