matthiasbeyer/imag
1
0
Fork 0
Code Releases Activity

Merge pull request #694 from matthiasbeyer/libimagtodo/debug-output

Browse source 
libimagtodo: Debug output
This commit is contained in:
Matthias Beyer 2016-09-06 16:38:54 +02:00 committed by GitHub
commit 8c12315ff8
3 changed files with 12 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
libimagtodo/Cargo.toml
View file

@ -17,3 +17,6 @@ path = "../libimagstore"
[dependencies.libimagerror] [dependencies.libimagerror]
path = "../libimagerror" path = "../libimagerror"
[dependencies.libimagutil]
path = "../libimagutil"

1
libimagtodo/src/lib.rs
View file

@ -20,6 +20,7 @@ extern crate serde_json;
#[macro_use] extern crate libimagstore; #[macro_use] extern crate libimagstore;
#[macro_use] extern crate libimagerror; #[macro_use] extern crate libimagerror;
extern crate libimagutil;
extern crate task_hookrs; extern crate task_hookrs;
module_entry_path_mod!("todo"); module_entry_path_mod!("todo");

8
libimagtodo/src/task.rs
View file

@ -11,6 +11,8 @@ use task_hookrs::import::{import_task, import_tasks};
use libimagstore::store::{FileLockEntry, Store}; use libimagstore::store::{FileLockEntry, Store};
use libimagstore::storeid::{IntoStoreId, StoreIdIterator, StoreId}; use libimagstore::storeid::{IntoStoreId, StoreIdIterator, StoreId};
use libimagerror::trace::MapErrTrace;
use libimagutil::debug_result::DebugResult;
use module_path::ModuleEntryPath; use module_path::ModuleEntryPath;
use error::{TodoError, TodoErrorKind, MapErrInto}; use error::{TodoError, TodoErrorKind, MapErrInto};
@ -32,6 +34,8 @@ impl<'a> Task<'a> {
r.read_line(&mut line); r.read_line(&mut line);
import_task(&line.as_str()) import_task(&line.as_str())
.map_err_into(TodoErrorKind::ImportError) .map_err_into(TodoErrorKind::ImportError)
.map_dbg_err_str("Error while importing task")
.map_err_dbg_trace()
.and_then(|t| { .and_then(|t| {
let uuid = t.uuid().clone(); let uuid = t.uuid().clone();
t.into_task(store).map(|t| (t, line, uuid)) t.into_task(store).map(|t| (t, line, uuid))
@ -61,6 +65,8 @@ impl<'a> Task<'a> {
pub fn get_from_string(store: &'a Store, s: String) -> Result<RResult<Task<'a>, String>> { pub fn get_from_string(store: &'a Store, s: String) -> Result<RResult<Task<'a>, String>> {
import_task(s.as_str()) import_task(s.as_str())
.map_err_into(TodoErrorKind::ImportError) .map_err_into(TodoErrorKind::ImportError)
.map_dbg_err_str("Error while importing task")
.map_err_dbg_trace()
.map(|t| t.uuid().clone()) .map(|t| t.uuid().clone())
.and_then(|uuid| Task::get_from_uuid(store, uuid)) .and_then(|uuid| Task::get_from_uuid(store, uuid))
.and_then(|o| match o { .and_then(|o| match o {
@ -96,6 +102,8 @@ impl<'a> Task<'a> {
Ok(task) => Ok(task), Ok(task) => Ok(task),
Err(string) => import_task(string.as_str()) Err(string) => import_task(string.as_str())
.map_err_into(TodoErrorKind::ImportError) .map_err_into(TodoErrorKind::ImportError)
.map_dbg_err_str("Error while importing task")
.map_err_dbg_trace()
.and_then(|t| t.into_task(store)), .and_then(|t| t.into_task(store)),
}) })
} }