make khevent.event private

4 files changed, 9 insertions, 6 deletions

diff --git a/src/khevent.rs b/src/khevent.rs
index bade6af..ff4acc1 100644
--- a/src/khevent.rs
+++ b/src/khevent.rs
@@ -1,6 +1,7 @@
 use std::path::PathBuf;
 
 use crate::icalwrap::IcalTime;
+use crate::icalwrap::IcalProperty;
 use crate::icalwrap::IcalTimeZone;
 use crate::icalwrap::IcalDuration;
 use crate::icalwrap::IcalVEvent;
@@ -8,7 +9,7 @@ use crate::icalwrap::IcalComponent;
 
 pub struct KhEvent {
   //TODO event should be private
-  pub event: IcalVEvent,
+  event: IcalVEvent,
   instance_timestamp: Option<IcalTime>,
 }
 
@@ -125,6 +126,10 @@ impl KhEvent {
     self.event.get_recur_datetimes()
   }
 
+  pub fn get_properties_by_name(&self, property_name: &str) -> Vec<IcalProperty> {
+    self.event.get_properties_by_name(property_name)
+  }
+
   pub fn from_event(event: IcalVEvent) -> Self {
     Self {
       event,
diff --git a/src/khline.rs b/src/khline.rs
index 3702fe5..8cf324f 100644
--- a/src/khline.rs
+++ b/src/khline.rs
@@ -75,7 +75,7 @@ impl From<&IcalVEvent> for KhLine {
 
 impl From<&KhEvent> for KhLine {
   fn from(event: &KhEvent) -> Self {
-    let path = event.event.get_parent().unwrap().get_path().unwrap().to_path_buf();
+    let path = event.get_path().unwrap().to_path_buf();
     let time = event.get_start();
 
     KhLine{ path, time, index: None }
diff --git a/src/selectors/cal.rs b/src/selectors/cal.rs
index aab39b1..4fe86d7 100644
--- a/src/selectors/cal.rs
+++ b/src/selectors/cal.rs
@@ -18,8 +18,7 @@ impl SelectFilter for CalendarFilter {
   }
 
   fn includes(&self, event: &KhEvent) -> bool {
-    event.event.get_parent()
-      .and_then(|cal| cal.get_path())
+    event.get_path()
       .and_then(|path| path.parent())
       .map(|path| path.to_string_lossy().to_lowercase())
       .map(|path| self.cal_names.iter().any(|cal| path.contains(cal)) )
diff --git a/src/selectors/prop.rs b/src/selectors/prop.rs
index c5188ee..d5045ad 100644
--- a/src/selectors/prop.rs
+++ b/src/selectors/prop.rs
@@ -3,7 +3,6 @@ use std::collections::HashMap;
 use super::*;
 
 use crate::khevent::KhEvent;
-//use crate::icalwrap::IcalVEvent;
 use crate::icalwrap::IcalComponent;
 
 pub struct PropFilter {
@@ -25,7 +24,7 @@ impl SelectFilter for PropFilter  {
 
   fn includes(&self, event: &KhEvent) -> bool {
     for (term, values) in &self.terms {
-      for prop in event.event.get_properties_by_name(term) {
+      for prop in event.get_properties_by_name(term) {
         let value = prop.get_value().to_lowercase();
         if values.iter().any(|x| value.contains(x)) {
           return true;