matthiasbeyer/imag
1
0
Fork 0
Code Releases Activity

Adapt to new libimagentryview interface

Browse source 
And properly implement Viewer for DiaryViewer
This commit is contained in:
Matthias Beyer 2018-04-19 22:45:44 +02:00
parent 780dd90c8f
commit 55d9b5456f
2 changed files with 31 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
lib/domain/libimagdiary/src/error.rs
View file

@ -22,6 +22,10 @@ error_chain! {
DiaryError, DiaryErrorKind, ResultExt, Result;
}
foreign_links {
Io(::std::io::Error);
}
links {
StoreError(::libimagstore::error::StoreError, ::libimagstore::error::StoreErrorKind);
EntryUtilError(::libimagentryutil::error::EntryUtilError, ::libimagentryutil::error::EntryUtilErrorKind);

41
lib/domain/libimagdiary/src/viewer.rs
View file

@ -19,14 +19,16 @@
//! A diary viewer built on libimagentryview.
use entry::DiaryEntry;
use error::DiaryErrorKind as DEK;
use error::ResultExt;
use error::Result;
use std::io::Write;
use std::ops::Deref;
use libimagstore::store::FileLockEntry;
use libimagstore::store::Entry;
use libimagentryview::viewer::Viewer;
use libimagentryview::error::ViewErrorKind as VEK;
use libimagentryview::error::ResultExt;
use libimagentryview::error::Result as ViewResult;
use libimagentryview::builtin::plain::PlainViewer;
use entry::DiaryEntry;
/// This viewer does _not_ implement libimagentryview::viewer::Viewer because we need to be able to
/// call some diary-type specific functions on the entries passed to this.
@ -45,24 +47,35 @@ impl DiaryViewer {
DiaryViewer(PlainViewer::new(show_header))
}
}
impl Viewer for DiaryViewer {
fn view_entry<W>(&self, e: &Entry, sink: &mut W) -> ViewResult<()>
where W: Write
{
self.0.view_entry(e, sink)
}
/// View all entries from the iterator, or stop immediately if an error occurs, returning that
/// error.
pub fn view_entries<'a, I: Iterator<Item = FileLockEntry<'a>>>(&self, entries: I) -> Result<()> {
fn view_entries<I, E, W>(&self, entries: I, sink: &mut W) -> ViewResult<()>
where I: Iterator<Item = E>,
E: Deref<Target = Entry>,
W: Write
{
let mut entries = entries
.map(|e| e.diary_id().map(|id| (id, e)))
.collect::<Result<Vec<_>>>()?;
.map(|e| e.deref().diary_id().map(|id| (id, e)).chain_err(|| VEK::ViewError))
.collect::<ViewResult<Vec<_>>>()?;
entries.sort_by_key(|&(ref id, _)| {
[id.year() as u32, id.month(), id.day(), id.hour(), id.minute(), id.second()]
});
for (id, entry) in entries.into_iter() {
println!("{} :\n", id);
let _ = self.0
.view_entry(&entry)
.chain_err(|| DEK::ViewError)
.chain_err(|| DEK::IOError)?;
println!("\n---\n");
writeln!(sink, "{} :\n", id)?;
let _ = self.0.view_entry(entry.deref(), sink)?;
writeln!(sink, "\n---\n")?;
}
Ok(())