Replace map_dbg() and map_dbg_str() with context() and inspect() calls

Signed-off-by: Matthias Beyer <mail@beyermatthias.de>

10 files changed, 32 insertions, 41 deletions

diff --git a/bin/domain/imag-diary/Cargo.toml b/bin/domain/imag-diary/Cargo.toml
index 26432644..669c9d31 100644
--- a/bin/domain/imag-diary/Cargo.toml
+++ b/bin/domain/imag-diary/Cargo.toml
@@ -27,6 +27,7 @@ toml-query = "0.9.2"
 itertools = "0.8.0"
 failure = "0.1.5"
 resiter = "0.4.0"
+option-inspect = "0.1.0"
 
 libimagerror       = { version = "0.10.0", path = "../../../lib/core/libimagerror" }
 libimagstore       = { version = "0.10.0", path = "../../../lib/core/libimagstore" }
diff --git a/bin/domain/imag-diary/src/create.rs b/bin/domain/imag-diary/src/create.rs
index c6c4687f..d60045fa 100644
--- a/bin/domain/imag-diary/src/create.rs
+++ b/bin/domain/imag-diary/src/create.rs
@@ -25,6 +25,7 @@ use failure::Error;
 use failure::ResultExt;
 use failure::err_msg;
 use failure::Fallible as Result;
+use option_inspect::*;
 
 use libimagdiary::diary::Diary;
 use libimagentryedit::edit::Edit;
@@ -103,7 +104,7 @@ fn create_id_from_clispec(create: &ArgMatches, timed_type: Timed) -> Result<Naiv
         Timed::Minutely => {
             let min = create
                 .value_of("minute")
-                .map_dbg(|m| format!("minute = {:?}", m))
+                .inspect(|m| debug!("minute = {:?}", m))
                 .map(|s| {
                     FromStr::from_str(s)
                         .map_err(Error::from)
@@ -123,7 +124,7 @@ fn create_id_from_clispec(create: &ArgMatches, timed_type: Timed) -> Result<Naiv
         Timed::Secondly => {
             let min = create
                 .value_of("minute")
-                .map_dbg(|m| format!("minute = {:?}", m))
+                .inspect(|m| debug!("minute = {:?}", m))
                 .map(|s| {
                     FromStr::from_str(s)
                         .map_err(Error::from)
@@ -135,7 +136,7 @@ fn create_id_from_clispec(create: &ArgMatches, timed_type: Timed) -> Result<Naiv
 
             let sec = create
                 .value_of("second")
-                .map_dbg(|s| format!("second = {:?}", s))
+                .inspect(|s| debug!("second = {:?}", s))
                 .map(|s| {
                     FromStr::from_str(s)
                         .map_err(Error::from)
diff --git a/bin/domain/imag-diary/src/lib.rs b/bin/domain/imag-diary/src/lib.rs
index f87cd927..9a924857 100644
--- a/bin/domain/imag-diary/src/lib.rs
+++ b/bin/domain/imag-diary/src/lib.rs
@@ -42,6 +42,7 @@ extern crate chrono;
 extern crate toml;
 extern crate toml_query;
 extern crate itertools;
+extern crate option_inspect;
 
 extern crate libimagdiary;
 extern crate libimagentryedit;
diff --git a/bin/domain/imag-diary/src/list.rs b/bin/domain/imag-diary/src/list.rs
index 634b0ff7..0f1018aa 100644
--- a/bin/domain/imag-diary/src/list.rs
+++ b/bin/domain/imag-diary/src/list.rs
@@ -26,7 +26,6 @@ use resiter::AndThen;
 
 use libimagdiary::diary::Diary;
 use libimagrt::runtime::Runtime;
-use libimagutil::debug_result::*;
 use libimagdiary::diaryid::DiaryId;
 use libimagdiary::diaryid::FromStoreId;
 use libimagstore::storeid::IntoStoreId;
@@ -37,8 +36,7 @@ pub fn list(rt: &Runtime) -> Result<()> {
     let diaryname = get_diary_name(rt)
         .ok_or_else(|| err_msg("No diary selected. Use either the configuration file or the commandline option"))?;
 
-    let mut ids = Diary::entries(rt.store(), &diaryname)
-        .map_dbg_str("Ok")?
+    let mut ids = Diary::entries(rt.store(), &diaryname)?
         .and_then_ok(|id| DiaryId::from_storeid(&id))
         .collect::<Result<Vec<_>>>()?;
 
diff --git a/bin/domain/imag-habit/Cargo.toml b/bin/domain/imag-habit/Cargo.toml
index 2e64c2fb..e4f96f7b 100644
--- a/bin/domain/imag-habit/Cargo.toml
+++ b/bin/domain/imag-habit/Cargo.toml
@@ -28,6 +28,7 @@ kairos = "0.3.0"
 prettytable-rs = "0.8.0"
 failure = "0.1.5"
 resiter = "0.4.0"
+result-inspect = "0.1"
 
 libimagerror       = { version = "0.10.0", path = "../../../lib/core/libimagerror" }
 libimagstore       = { version = "0.10.0", path = "../../../lib/core/libimagstore" }
diff --git a/bin/domain/imag-habit/src/lib.rs b/bin/domain/imag-habit/src/lib.rs
index c8075dfe..e77ff26b 100644
--- a/bin/domain/imag-habit/src/lib.rs
+++ b/bin/domain/imag-habit/src/lib.rs
@@ -43,6 +43,7 @@ extern crate resiter;
 extern crate chrono;
 extern crate prettytable;
 #[macro_use] extern crate failure;
+extern crate result_inspect;
 
 extern crate libimaghabit;
 extern crate libimagstore;
@@ -65,6 +66,7 @@ use resiter::Filter;
 use resiter::IterInnerOkOrElse;
 use clap::App;
 use chrono::NaiveDate;
+use result_inspect::*;
 
 use libimagrt::runtime::Runtime;
 use libimagrt::application::ImagApplication;
@@ -133,7 +135,7 @@ fn create(rt: &Runtime) -> Result<()> {
 
     let parsedate = |d, pname| match kairos_parse(d)? {
         Parsed::TimeType(tt) => tt.calculate()
-            .map_dbg(|y| format!("TimeType yielded: '{:?}'", y))?
+            .inspect(|y| debug!("TimeType yielded: '{:?}'", y))?
             .get_moment()
             .ok_or_else(|| {
                 format_err!("Error: '{}' parameter does not yield a point in time", pname)
diff --git a/lib/core/libimagrt/src/runtime.rs b/lib/core/libimagrt/src/runtime.rs
index a1a27c6c..0c53b7e7 100644
--- a/lib/core/libimagrt/src/runtime.rs
+++ b/lib/core/libimagrt/src/runtime.rs
@@ -384,8 +384,8 @@ impl<'a> Runtime<'a> {
             })
             .or_else(|_| env::var("EDITOR"))
             .map_err(|_| Error::from(EM::IO))
-            .map_dbg(|s| format!("Editing with '{}'", s))
             .and_then(|s| {
+                debug!("Editing with '{}'", s);
                 let mut split = s.split_whitespace();
                 let command   = split.next();
                 if command.is_none() {
diff --git a/lib/domain/libimaghabit/src/habit.rs b/lib/domain/libimaghabit/src/habit.rs
index bcf0aa3f..8ec5afa6 100644
--- a/lib/domain/libimaghabit/src/habit.rs
+++ b/lib/domain/libimaghabit/src/habit.rs
@@ -321,17 +321,14 @@ pub mod builder {
                 format_err!("Habit builder missing: {}", s)
             }
 
-            let name = self.name
-                .ok_or_else(|| mkerr("name"))
-                .map_dbg_str("Success: Name present")?;
+            let name = self.name.ok_or_else(|| mkerr("name"))?;
+            debug!("Success: Name present");
 
-            let dateobj = self.basedate
-                .ok_or_else(|| mkerr("date"))
-                .map_dbg_str("Success: Date present")?;
+            let dateobj = self.basedate.ok_or_else(|| mkerr("date"))?;
+            debug!("Success: Date present");
 
-            let recur : String = self.recurspec
-                .ok_or_else(|| mkerr("recurspec"))
-                .map_dbg_str("Success: Recurr spec present")?;
+            let recur : String = self.recurspec.ok_or_else(|| mkerr("recurspec"))?;
+            debug!("Success: Recurr spec present");
 
             if let Some(until) = self.untildate {
                 debug!("Success: Until-Date present");
diff --git a/lib/entry/libimagentrylink/src/storecheck.rs b/lib/entry/libimagentrylink/src/storecheck.rs
index eab8eccf..b57448f0 100644
--- a/lib/entry/libimagentrylink/src/storecheck.rs
+++ b/lib/entry/libimagentrylink/src/storecheck.rs
@@ -145,29 +145,19 @@ impl StoreLinkConsistentExt for Store {
                 Ok(())
             };
 
-        aggregate_link_network(&self)
-            .map_dbg_str("Aggregated")
-            .map_dbg(|nw| {
-                let mut s = String::new();
-                for (k, v) in nw {
-                    s.push_str(&format!("{}\n in: {:?}\n out: {:?}", k, v.incoming, v.outgoing));
-                }
-                s
-            })
-            .and_then(|nw| {
-                all_collected_storeids_exist(&nw)
-                    .map(|_| nw)
-                    .context(err_msg("Link handling error"))
-                    .map_err(Error::from)
-            })
-            .and_then(|nw| {
-                for (id, linking) in nw.iter() {
-                    incoming_links_exists_as_outgoing_links(id, linking, &nw)?;
-                    outgoing_links_exist_as_incoming_links(id, linking, &nw)?;
-                }
-                Ok(())
-            })
-            .map(|_| ())
+        let nw = aggregate_link_network(&self)?;
+
+        for (k, v) in nw.iter() {
+            debug!("{}\n in: {:?}\n out: {:?}", k, v.incoming, v.outgoing);
+        }
+
+        all_collected_storeids_exist(&nw).context("Link handling error")?;
+
+        for (id, linking) in nw.iter() {
+            incoming_links_exists_as_outgoing_links(id, linking, &nw)?;
+            outgoing_links_exist_as_incoming_links(id, linking, &nw)?;
+        }
+        Ok(())
     }
 }
 
diff --git a/lib/entry/libimagentryurl/src/iter.rs b/lib/entry/libimagentryurl/src/iter.rs
index eb60e6bd..f6cc703e 100644
--- a/lib/entry/libimagentryurl/src/iter.rs
+++ b/lib/entry/libimagentryurl/src/iter.rs
@@ -178,7 +178,7 @@ impl<'a> Iterator for UrlIter<'a> {
                             debug!("Store::retrieve({:?}) succeeded", id);
                             debug!("getting uri link from file now");
                             f.get_url()
-                                .map_dbg_str("Error happened while getting link URI from FLE")
+                                .context("Error happened while getting link URI from FLE")
                                 .with_context(|e| format!("URL -> Err = {:?}", e))
                                 .map_err(Error::from)
                         })