From 11f9a9027ed75459cfba2419af07047e333f811e Mon Sep 17 00:00:00 2001 From: Matthias Beyer Date: Tue, 1 May 2018 17:42:47 +0200 Subject: [PATCH] Refactor imag-diary to new store iterator interface --- bin/domain/imag-diary/src/list.rs | 2 ++ bin/domain/imag-diary/src/view.rs | 3 ++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/bin/domain/imag-diary/src/list.rs b/bin/domain/imag-diary/src/list.rs index 55ab2740..a40cd0ff 100644 --- a/bin/domain/imag-diary/src/list.rs +++ b/bin/domain/imag-diary/src/list.rs @@ -23,6 +23,7 @@ use libimagdiary::diary::Diary; use libimagrt::runtime::Runtime; use libimagutil::warn_exit::warn_exit; use libimagerror::trace::MapErrTrace; +use libimagerror::iter::TraceIterator; use libimagerror::io::ToExitCode; use libimagerror::exit::ExitUnwrap; use libimagutil::debug_result::*; @@ -40,6 +41,7 @@ pub fn list(rt: &Runtime) { let mut ids = Diary::entries(rt.store(), &diaryname) .map_dbg_str("Ok") .map_err_trace_exit_unwrap(1) + .trace_unwrap_exit(1) .map(|id| DiaryId::from_storeid(&id)) .collect::>>() .map_err_trace_exit_unwrap(1); diff --git a/bin/domain/imag-diary/src/view.rs b/bin/domain/imag-diary/src/view.rs index 7e48fd90..763d2456 100644 --- a/bin/domain/imag-diary/src/view.rs +++ b/bin/domain/imag-diary/src/view.rs @@ -21,6 +21,7 @@ use libimagdiary::diary::Diary; use libimagdiary::viewer::DiaryViewer as DV; use libimagrt::runtime::Runtime; use libimagerror::trace::MapErrTrace; +use libimagerror::iter::TraceIterator; use libimagutil::warn_exit::warn_exit; use libimagstore::iter::get::StoreIdGetIteratorExtension; use libimagentryview::viewer::Viewer; @@ -34,7 +35,7 @@ pub fn view(rt: &Runtime) { let entries = Diary::entries(rt.store(), &diaryname) .map_err_trace_exit_unwrap(1) .into_get_iter(rt.store()) - .filter_map(Result::ok) + .trace_unwrap_exit(1) .map(|e| e.unwrap_or_else(|| { error!("Failed to fetch entry"); ::std::process::exit(1)