holm/nushell
1
1
Fork 0
forked from extern/nushell
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #84 from jonathandturner/no_line_sep

Browse Source 
Rework table view
This commit is contained in:
Jonathan Turner 2019-06-05 15:28:16 +12:00 committed by GitHub
commit c6dba7893c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/format/table.rs
View File

@ -2,6 +2,8 @@ use crate::format::RenderView;
use crate::object::{DataDescriptor, Value}; use crate::object::{DataDescriptor, Value};
use crate::prelude::*; use crate::prelude::*;
use derive_new::new; use derive_new::new;
use prettytable::format::{FormatBuilder, LinePosition, LineSeparator};
use prettytable::{color, Attr, Cell, Row, Table}; use prettytable::{color, Attr, Cell, Row, Table};
// An entries list is printed like this: // An entries list is printed like this:
@ -52,7 +54,14 @@ impl RenderView for TableView {
let mut table = Table::new(); let mut table = Table::new();
table.set_format(*prettytable::format::consts::FORMAT_NO_COLSEP); let fb = FormatBuilder::new()
.separator(LinePosition::Top, LineSeparator::new(' ', ' ', ' ', ' '))
.separator(LinePosition::Title, LineSeparator::new('-', '+', '|', '|'))
.column_separator('|')
.padding(1, 1);
//table.set_format(*prettytable::format::consts::FORMAT_NO_LINESEP_WITH_TITLE);
table.set_format(fb.build());
let header: Vec<Cell> = self let header: Vec<Cell> = self
.headers .headers
@ -64,7 +73,7 @@ impl RenderView for TableView {
}) })
.collect(); .collect();
table.add_row(Row::new(header)); table.set_titles(Row::new(header));
for row in &self.entries { for row in &self.entries {
table.add_row(Row::new(row.iter().map(|h| Cell::new(h)).collect())); table.add_row(Row::new(row.iter().map(|h| Cell::new(h)).collect()));