Adapt to new libimagentryview interface

And properly implement Viewer for DiaryViewer

lib/domain/libimagdiary/src/error.rs

@@ -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);

lib/domain/libimagdiary/src/viewer.rs

@@ -19,14 +19,16 @@
 
 //! A diary viewer built on libimagentryview.
 
-use entry::DiaryEntry;
+use std::io::Write;
-use error::DiaryErrorKind as DEK;
+use std::ops::Deref;
-use error::ResultExt;
-use error::Result;
 
-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)))
+            .map(|e| e.deref().diary_id().map(|id| (id, e)).chain_err(|| VEK::ViewError))
-            .collect::<Result<Vec<_>>>()?;
+            .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);
+            writeln!(sink, "{} :\n", id)?;
-            let _ = self.0
+            let _ = self.0.view_entry(entry.deref(), sink)?;
-                         .view_entry(&entry)
+            writeln!(sink, "\n---\n")?;
-                         .chain_err(|| DEK::ViewError)
-                         .chain_err(|| DEK::IOError)?;
-            println!("\n---\n");
         }
 
         Ok(())