summaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
Diffstat (limited to 'lib')
-rw-r--r--lib/core/libimagrt/src/runtime.rs3
-rw-r--r--lib/core/libimagstore/src/store.rs6
-rw-r--r--lib/domain/libimaghabit/src/habit.rs16
-rw-r--r--lib/entry/libimagentrylink/src/storecheck.rs37
-rw-r--r--lib/entry/libimagentryurl/src/iter.rs10
-rw-r--r--lib/entry/libimagentryurl/src/linker.rs8
-rw-r--r--lib/etc/libimagutil/src/debug_option.rs28
-rw-r--r--lib/etc/libimagutil/src/debug_result.rs29
-rw-r--r--lib/etc/libimagutil/src/lib.rs2
9 files changed, 30 insertions, 109 deletions
diff --git a/lib/core/libimagrt/src/runtime.rs b/lib/core/libimagrt/src/runtime.rs
index a1a27c6c..6791404e 100644
--- a/lib/core/libimagrt/src/runtime.rs
+++ b/lib/core/libimagrt/src/runtime.rs
@@ -44,7 +44,6 @@ use libimagerror::errors::ErrorMsg as EM;
use libimagerror::trace::*;
use libimagstore::store::Store;
use libimagstore::storeid::StoreId;
-use libimagutil::debug_result::DebugResult;
use crate::spec::CliSpec;
use atty;
@@ -384,8 +383,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/core/libimagstore/src/store.rs b/lib/core/libimagstore/src/store.rs
index f30b43a3..b7ffa35d 100644
--- a/lib/core/libimagstore/src/store.rs
+++ b/lib/core/libimagstore/src/store.rs
@@ -47,9 +47,6 @@ use crate::file_abstraction::FileAbstractionInstance;
use crate::file_abstraction::fs::FSFileAbstraction;
use crate::file_abstraction::inmemory::InMemoryFileAbstraction;
-use libimagutil::debug_result::*;
-
-
#[derive(Debug, PartialEq)]
enum StoreEntryStatus {
Present,
@@ -199,8 +196,7 @@ impl Store {
backend
.create_dir_all(&location)
- .context(format_err!("StorePathCreate: {}", location.display()))
- .map_dbg_err_str("Failed")?;
+ .context(format_err!("StorePathCreate: {}", location.display()))?;
} else if location.is_file() {
debug!("Store path exists as file");
return Err(format_err!("StorePathExists: {}", location.display()));
diff --git a/lib/domain/libimaghabit/src/habit.rs b/lib/domain/libimaghabit/src/habit.rs
index bcf0aa3f..68a85f32 100644
--- a/lib/domain/libimaghabit/src/habit.rs
+++ b/lib/domain/libimaghabit/src/habit.rs
@@ -270,7 +270,6 @@ pub mod builder {
use libimagstore::storeid::StoreId;
use libimagstore::store::FileLockEntry;
use libimagentryutil::isa::Is;
- use libimagutil::debug_result::DebugResult;
use failure::Error;
use failure::Fallible as Result;
@@ -321,17 +320,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..f78d52cc 100644
--- a/lib/entry/libimagentrylink/src/storecheck.rs
+++ b/lib/entry/libimagentrylink/src/storecheck.rs
@@ -21,7 +21,6 @@ use std::collections::HashMap;
use libimagstore::store::Store;
use libimagstore::storeid::StoreId;
-use libimagutil::debug_result::DebugResult;
use failure::ResultExt;
use failure::Fallible as Result;
@@ -145,29 +144,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 4a22a6b1..f899cb38 100644
--- a/lib/entry/libimagentryurl/src/iter.rs
+++ b/lib/entry/libimagentryurl/src/iter.rs
@@ -32,9 +32,10 @@
use libimagentrylink::link::Link;
use libimagentrylink::iter::LinkIter;
use libimagstore::store::Store;
-use libimagutil::debug_result::DebugResult;
use failure::Fallible as Result;
+use failure::ResultExt;
+use failure::Error;
use url::Url;
/// Helper for building `OnlyUrlIter` and `NoUrlIter`
@@ -170,14 +171,15 @@ impl<'a> Iterator for UrlIter<'a> {
debug!("Retrieving entry for id: '{:?}'", id);
self.1
.retrieve(id.clone())
- .map_dbg_err(|_| format!("Retrieving entry for id: '{:?}' failed", id))
+ .with_context(|e| format!("Retrieving entry for id: '{:?}' failed: {}", id, e))
.map_err(From::from)
.and_then(|f| {
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")
- .map_dbg_err(|e| format!("URL -> Err = {:?}", e))
+ .context("Error happened while getting link URI from FLE")
+ .with_context(|e| format!("URL -> Err = {:?}", e))
+ .map_err(Error::from)
})
});
diff --git a/lib/entry/libimagentryurl/src/linker.rs b/lib/entry/libimagentryurl/src/linker.rs
index 175ffcea..b38463e3 100644
--- a/lib/entry/libimagentryurl/src/linker.rs
+++ b/lib/entry/libimagentryurl/src/linker.rs
@@ -20,10 +20,10 @@
use libimagstore::storeid::StoreId;
use libimagstore::store::Store;
use libimagstore::store::Entry;
-use libimagutil::debug_result::DebugResult;
use libimagentrylink::linkable::Linkable;
use failure::Fallible as Result;
+use failure::ResultExt;
use url::Url;
use sha1::{Sha1, Digest};
use hex;
@@ -93,7 +93,7 @@ impl UrlLinker for Entry {
links.into_iter().map(|link| {
let hash = hex::encode(Sha1::digest(&link.as_str().as_bytes()));
let file_id = crate::module_path::new_id(hash.clone())
- .map_dbg_err(|_| format!("Failed to build StoreId for this hash '{:?}'", hash))?;
+ .with_context(|e| format!("Failed to build StoreId for this hash '{:?}': {}", hash, e))?;
debug!("Link = '{:?}'", link);
debug!("Hash = '{:?}'", hash);
@@ -105,9 +105,7 @@ impl UrlLinker for Entry {
// exist
let mut file = store
.retrieve(file_id.clone())
- .map_dbg_err(|_| {
- format!("Failed to create or retrieve an file for this link '{:?}'", link)
- })?;
+ .with_context(|e| format!("Failed to create or retrieve an file for this link '{:?}': {}", link, e))?;
debug!("Generating header content!");
file.set_url(link)?;
diff --git a/lib/etc/libimagutil/src/debug_option.rs b/lib/etc/libimagutil/src/debug_option.rs
deleted file mode 100644
index 4f27279a..00000000
--- a/lib/etc/libimagutil/src/debug_option.rs
+++ /dev/null
@@ -1,28 +0,0 @@
-//
-// imag - the personal information management suite for the commandline
-// Copyright (C) 2015-2019 Matthias Beyer <mail@beyermatthias.de> and contributors
-//
-// This library is free software; you can redistribute it and/or
-// modify it under the terms of the GNU Lesser General Public
-// License as published by the Free Software Foundation; version
-// 2.1 of the License.
-//
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-// Lesser General Public License for more details.
-//
-// You should have received a copy of the GNU Lesser General Public
-// License along with this library; if not, write to the Free Software
-// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
-//
-
-// Generates a extension for the `Option<T>`, named `DebugOption` which has functionality to
-// print `T` via `debug!()`.
-generate_option_logging_extension!(
- DebugOption,
- map_dbg,
- map_dbg_str,
- |s| { debug!("{}", s); }
-);
-
diff --git a/lib/etc/libimagutil/src/debug_result.rs b/lib/etc/libimagutil/src/debug_result.rs
deleted file mode 100644
index dad06723..00000000
--- a/lib/etc/libimagutil/src/debug_result.rs
+++ /dev/null
@@ -1,29 +0,0 @@
-//
-// imag - the personal information management suite for the commandline
-// Copyright (C) 2015-2019 Matthias Beyer <mail@beyermatthias.de> and contributors
-//
-// This library is free software; you can redistribute it and/or
-// modify it under the terms of the GNU Lesser General Public
-// License as published by the Free Software Foundation; version
-// 2.1 of the License.
-//
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-// Lesser General Public License for more details.
-//
-// You should have received a copy of the GNU Lesser General Public
-// License along with this library; if not, write to the Free Software
-// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
-//
-
-// Generates a extension for the `Result<T, E>`, named `DebugResult` which has functionality to
-// print either `T` or `E` via `debug!()`.
-generate_result_logging_extension!(
- DebugResult,
- map_dbg,
- map_dbg_str,
- map_dbg_err,
- map_dbg_err_str,
- |s| { debug!("{}", s); }
-);
diff --git a/lib/etc/libimagutil/src/lib.rs b/lib/etc/libimagutil/src/lib.rs
index 08de2392..77ee632b 100644
--- a/lib/etc/libimagutil/src/lib.rs
+++ b/lib/etc/libimagutil/src/lib.rs
@@ -47,8 +47,6 @@ extern crate chrono;
#[macro_use] mod log_option;
pub mod cli_validators;
pub mod date;
-pub mod debug_result;
-pub mod debug_option;
pub mod edit;
pub mod info_result;
pub mod info_option;
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-02 20:04:22 +0000