Refactor details view

Move most of the heavy lifting into a Table struct, which doesn't govern how the resulting table is *created*, only how it's *displayed*.
This commit is contained in:
Ben S 2015-02-26 07:18:08 +00:00
parent 3e6cce5b5c
commit 134f9fc252
3 changed files with 131 additions and 77 deletions

View File

@ -4,7 +4,7 @@ use ansi_term::Style;
use options::{SizeFormat, TimeType}; use options::{SizeFormat, TimeType};
#[derive(PartialEq, Debug, Copy)] #[derive(PartialEq, Debug, Copy, Clone)]
pub enum Column { pub enum Column {
Permissions, Permissions,
FileSize(SizeFormat), FileSize(SizeFormat),

View File

@ -298,7 +298,7 @@ impl View {
} }
} }
#[derive(PartialEq, Debug, Copy)] #[derive(PartialEq, Debug, Copy, Clone)]
pub enum SizeFormat { pub enum SizeFormat {
DecimalBytes, DecimalBytes,
BinaryBytes, BinaryBytes,
@ -319,7 +319,7 @@ impl SizeFormat {
} }
} }
#[derive(PartialEq, Debug, Copy)] #[derive(PartialEq, Debug, Copy, Clone)]
pub enum TimeType { pub enum TimeType {
FileAccessed, FileAccessed,
FileModified, FileModified,

View File

@ -18,7 +18,6 @@ pub struct Details {
} }
impl Details { impl Details {
pub fn view(&self, dir: Option<&Dir>, files: &[File]) { pub fn view(&self, dir: Option<&Dir>, files: &[File]) {
// The output gets formatted into columns, which looks nicer. To // The output gets formatted into columns, which looks nicer. To
// do this, we have to write the results into a table, instead of // do this, we have to write the results into a table, instead of
@ -26,82 +25,21 @@ impl Details {
// width of each column based on the length of the results and // width of each column based on the length of the results and
// padding the fields during output. // padding the fields during output.
let columns = self.columns.for_dir(dir); // Almost all the heavy lifting is done in a Table object, which
let locale = UserLocale::new(); // automatically calculates the width of each column and the
let mut cache = OSUsers::empty_cache(); // appropriate padding.
let mut table = Vec::new(); let mut table = Table::with_columns(self.columns.for_dir(dir));
self.get_files(&columns[..], &mut cache, &locale, &mut table, files, 0); if self.header { table.add_header() }
if self.header { self.add_files_to_table(&mut table, files, 0);
let row = Row { table.print_table(self.xattr, self.recurse.is_some());
depth: 0,
cells: columns.iter().map(|c| Cell::paint(Plain.underline(), c.header())).collect(),
name: Plain.underline().paint("Name").to_string(),
last: false,
attrs: Vec::new(),
children: false,
};
table.insert(0, row);
} }
let column_widths: Vec<usize> = range(0, columns.len()) /// Adds files to the table - recursively, if the `recurse` option
.map(|n| table.iter().map(|row| row.cells[n].length).max().unwrap_or(0)) /// is present.
.collect(); fn add_files_to_table(&self, table: &mut Table, src: &[File], depth: usize) {
let mut stack = Vec::new();
for row in table {
for (num, column) in columns.iter().enumerate() {
let padding = column_widths[num] - row.cells[num].length;
print!("{} ", column.alignment().pad_string(&row.cells[num].text, padding));
}
if self.recurse.is_some() {
stack.resize(row.depth + 1, "├──");
stack[row.depth] = if row.last { "└──" } else { "├──" };
for i in 1 .. row.depth + 1 {
print!("{}", GREY.paint(stack[i]));
}
if row.children {
stack[row.depth] = if row.last { " " } else { "" };
}
if row.depth != 0 {
print!(" ");
}
}
print!("{}\n", row.name);
if self.xattr {
let width = row.attrs.iter().map(|a| a.name().len()).max().unwrap_or(0);
for attr in row.attrs.iter() {
let name = attr.name();
println!("{}\t{}",
Alignment::Left.pad_string(name, width - name.len()),
attr.size()
)
}
}
}
}
fn get_files(&self, columns: &[Column], cache: &mut OSUsers, locale: &UserLocale, dest: &mut Vec<Row>, src: &[File], depth: usize) {
for (index, file) in src.iter().enumerate() { for (index, file) in src.iter().enumerate() {
table.add_row(file, depth, index == src.len() - 1);
let row = Row {
depth: depth,
cells: columns.iter().map(|c| file.display(c, cache, locale)).collect(),
name: file.file_name_view(),
last: index == src.len() - 1,
attrs: file.xattrs.clone(),
children: file.this.is_some(),
};
dest.push(row);
if let Some(r) = self.recurse { if let Some(r) = self.recurse {
if r.tree == false || r.is_too_deep(depth) { if r.tree == false || r.is_too_deep(depth) {
@ -111,7 +49,7 @@ impl Details {
if let Some(ref dir) = file.this { if let Some(ref dir) = file.this {
let mut files = dir.files(true); let mut files = dir.files(true);
self.filter.transform_files(&mut files); self.filter.transform_files(&mut files);
self.get_files(columns, cache, locale, dest, &files, depth + 1); self.add_files_to_table(table, &files, depth + 1);
} }
} }
} }
@ -127,6 +65,122 @@ struct Row {
pub children: bool, pub children: bool,
} }
type ColumnInfo = (usize, Alignment);
struct Table {
columns: Vec<Column>,
users: OSUsers,
locale: UserLocale,
rows: Vec<Row>,
}
impl Table {
fn with_columns(columns: Vec<Column>) -> Table {
Table {
columns: columns,
users: OSUsers::empty_cache(),
locale: UserLocale::new(),
rows: Vec::new(),
}
}
fn add_header(&mut self) {
let row = Row {
depth: 0,
cells: self.columns.iter().map(|c| Cell::paint(Plain.underline(), c.header())).collect(),
name: Plain.underline().paint("Name").to_string(),
last: false,
attrs: Vec::new(),
children: false,
};
self.rows.push(row);
}
fn cells_for_file(&mut self, file: &File) -> Vec<Cell> {
self.columns.clone().iter()
.map(|c| file.display(c, &mut self.users, &self.locale))
.collect()
}
fn add_row(&mut self, file: &File, depth: usize, last: bool) {
let row = Row {
depth: depth,
cells: self.cells_for_file(file),
name: file.file_name_view(),
last: last,
attrs: file.xattrs.clone(),
children: file.this.is_some(),
};
self.rows.push(row)
}
fn print_table(self, xattr: bool, show_children: bool) {
let mut stack = Vec::new();
let column_widths: Vec<usize> = range(0, self.columns.len())
.map(|n| self.rows.iter().map(|row| row.cells[n].length).max().unwrap_or(0))
.collect();
for row in self.rows.iter() {
for (n, width) in column_widths.iter().enumerate() {
let padding = width - row.cells[n].length;
print!("{} ", self.columns[n].alignment().pad_string(&row.cells[n].text, padding));
}
if show_children {
stack.resize(row.depth + 1, TreePart::Edge);
stack[row.depth] = if row.last { TreePart::Corner } else { TreePart::Edge };
for i in 1 .. row.depth + 1 {
print!("{}", GREY.paint(stack[i].ascii_art()));
}
if row.children {
stack[row.depth] = if row.last { TreePart::Blank } else { TreePart::Line };
}
if row.depth != 0 {
print!(" ");
}
}
print!("{}\n", row.name);
if xattr {
let width = row.attrs.iter().map(|a| a.name().len()).max().unwrap_or(0);
for attr in row.attrs.iter() {
let name = attr.name();
println!("{}\t{}",
Alignment::Left.pad_string(name, width - name.len()),
attr.size()
)
}
}
}
}
}
#[derive(PartialEq, Debug, Clone)]
enum TreePart {
Edge,
Corner,
Blank,
Line,
}
impl TreePart {
fn ascii_art(&self) -> &'static str {
match *self {
TreePart::Edge => "├──",
TreePart::Line => "",
TreePart::Corner => "└──",
TreePart::Blank => " ",
}
}
}
pub struct UserLocale { pub struct UserLocale {
pub time: locale::Time, pub time: locale::Time,
pub numeric: locale::Numeric, pub numeric: locale::Numeric,