Merge pull request #614 from matthiasbeyer/libimagentrylister/table-lister

Libimagentrylister/table lister

libimagentrylist/Cargo.toml

@@ -7,6 +7,7 @@ authors = ["Matthias Beyer <mail@beyermatthias.de>"]
 clap = "2.1.1"
 log = "0.3"
 toml = "0.1.25"
+prettytable-rs = "0.6.*"
 
 [dependencies.libimagstore]
 path = "../libimagstore"

libimagentrylist/src/error.rs

@@ -1,5 +1,6 @@
 generate_error_module!(
     generate_error_types!(ListError, ListErrorKind,
+        IOError        => "IO Error",
         FormatError    => "FormatError",
         EntryError     => "EntryError",
         IterationError => "IterationError",
@@ -9,4 +10,5 @@ generate_error_module!(
 
 pub use self::error::ListError;
 pub use self::error::ListErrorKind;
+pub use self::error::MapErrInto;
 

libimagentrylist/src/lib.rs

@@ -17,6 +17,7 @@
 extern crate clap;
 #[macro_use] extern crate log;
 extern crate toml;
+extern crate prettytable;
 
 extern crate libimagstore;
 extern crate libimagutil;

libimagentrylist/src/listers/mod.rs

@@ -1,3 +1,4 @@
 pub mod core;
 pub mod line;
 pub mod path;
+pub mod table;

libimagentrylist/src/listers/table.rs

@@ -0,0 +1,91 @@
+use std::io::stdout;
+
+use lister::Lister;
+use result::Result;
+use error::MapErrInto;
+
+use libimagstore::store::FileLockEntry;
+use libimagerror::into::IntoError;
+
+use prettytable::Table;
+use prettytable::cell::Cell;
+use prettytable::row::Row;
+
+pub struct TableLister<F: Fn(&FileLockEntry) -> Vec<String>> {
+    line_generator: F,
+    header: Option<Vec<String>>,
+
+    with_idx: bool,
+}
+
+impl<F: Fn(&FileLockEntry) -> Vec<String>> TableLister<F> {
+
+    pub fn new(gen: F) -> TableLister<F> {
+        TableLister {
+            line_generator: gen,
+            header: None,
+            with_idx: true,
+        }
+    }
+
+    pub fn with_header(mut self, hdr: Vec<String>) -> TableLister<F> {
+        self.header = Some(hdr);
+        self
+    }
+
+    pub fn with_idx(mut self, b: bool) -> TableLister<F> {
+        self.with_idx = b;
+        self
+    }
+
+}
+
+impl<F: Fn(&FileLockEntry) -> Vec<String>> Lister for TableLister<F> {
+
+    fn list<'b, I: Iterator<Item = FileLockEntry<'b>>>(&self, entries: I) -> Result<()> {
+        use error::ListErrorKind as LEK;
+
+        let mut table = Table::new();
+        let mut header_len : Option<usize> = None;
+        match self.header {
+            Some(ref s) => {
+                debug!("We have a header... preparing");
+                let mut cells : Vec<Cell> = s.iter().map(|s| Cell::new(s)).collect();
+                if self.with_idx {
+                    cells.insert(0, Cell::new("#"));
+                }
+                table.set_titles(Row::new(cells));
+                header_len = Some(s.len());
+            },
+            None => {
+                debug!("No header for table found... continuing without");
+            },
+        }
+
+        entries.fold(Ok(table), |table, entry| {
+            table.and_then(|mut table| {
+                let mut v = (self.line_generator)(&entry);
+                {
+                    let v_len = v.len();
+                    if header_len.is_none() {
+                        header_len = Some(v_len);
+                    }
+                    if header_len.map(|l| v_len > l).unwrap_or(false) {
+                        return Err(LEK::FormatError.into_error());
+                    }
+                    while header_len.map(|l| v.len() != l).unwrap_or(false) {
+                        v.push(String::from(""));
+                    }
+                }
+
+                table.add_row(v.iter().map(|s| Cell::new(s)).collect());
+                Ok(table)
+            })
+        })
+        .and_then(|tbl| {
+            let mut io = stdout();
+            tbl.print(&mut io).map_err_into(LEK::IOError)
+        })
+    }
+
+}