get_path_as_string should return optional, and improve prettyprint

2 files changed, 5 insertions, 5 deletions

diff --git a/src/icalwrap/icalvcalendar.rs b/src/icalwrap/icalvcalendar.rs
index 2fd3545..04c600d 100644
--- a/src/icalwrap/icalvcalendar.rs
+++ b/src/icalwrap/icalvcalendar.rs
@@ -108,7 +108,7 @@ impl IcalVCalendar {
     {
       let events = self.events_iter();
       if events.unique_uid_count() > 1 {
-        return Err(format!("More than one event in file: {}", self.get_path_as_string()));
+        return Err(format!("More than one event in file: {}", self.get_path_as_string().unwrap_or_else(|| "".to_string())));
       }
       let events = self.events_iter();
       let uid_cstr = CString::new(uid).unwrap();
@@ -184,8 +184,8 @@ impl IcalVCalendar {
     }
   }
 
-  pub fn get_path_as_string(&self) -> String {
-    format!("{}", self.path.as_ref().unwrap().display())
+  pub fn get_path_as_string(&self) -> Option<String> {
+    self.path.as_ref().map(|path| format!("{}", path.display()))
   }
 
   pub fn get_path(&self) -> Option<&PathBuf> {
@@ -209,7 +209,7 @@ impl IcalVCalendar {
       )
     };
     if self.events_iter().unique_uid_count() > 1 {
-      warn!("More than one event in file: {}", self.get_path_as_string())
+      warn!("More than one event in file: {}", self.get_path_as_string().unwrap_or_else(|| "".to_string()))
     }
     IcalVEvent::from_ptr_with_parent(event, self)
   }
diff --git a/src/icalwrap/icalvevent.rs b/src/icalwrap/icalvevent.rs
index 1e66a8c..658a757 100644
--- a/src/icalwrap/icalvevent.rs
+++ b/src/icalwrap/icalvevent.rs
@@ -142,7 +142,7 @@ impl IcalVEvent {
   pub fn get_khaleesi_line(&self) -> Option<String> {
     let dtstart = self.get_dtstart()?.timestamp();
     let dtstart_string = format!("{:010}", dtstart);
-    let path_string = self.parent.as_ref()?.get_path_as_string();
+    let path_string = self.parent.as_ref()?.get_path_as_string()?;
     Some([dtstart_string, path_string].join(" "))
   }