Llewellyn/exa
1
0
Fork 0
mirror of https://github.com/Llewellynvdm/exa.git synced 2024-09-28 21:29:02 +00:00
Code Issues Projects Releases Wiki Activity

Simplify columns view code

Browse Source 
The widths come pre-computed, so there's no reason to keep them around in this table anymore.
This commit is contained in:
Benjamin Sago 2015-01-25 19:20:51 +00:00
parent 628d90fe44
commit 8e33c75355
1 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/output.rs
View File

@ -137,15 +137,11 @@ fn details_view(columns: &Vec<Column>, files: Vec<File>, header: bool) {
table.insert(0, columns.iter().map(|c| Cell::paint(Plain.underline(), c.header())).collect()); table.insert(0, columns.iter().map(|c| Cell::paint(Plain.underline(), c.header())).collect());
} }
let lengths: Vec<Vec<usize>> = table.iter()
.map(|row| row.iter().map(|c| c.length).collect())
.collect();
let column_widths: Vec<usize> = range(0, columns.len()) let column_widths: Vec<usize> = range(0, columns.len())
.map(|n| lengths.iter().map(|row| row[n]).max().unwrap_or(0)) .map(|n| table.iter().map(|row| row[n].length).max().unwrap_or(0))
.collect(); .collect();
for (field_widths, row) in lengths.iter().zip(table.iter()) { for row in table.iter() {
for (num, column) in columns.iter().enumerate() { for (num, column) in columns.iter().enumerate() {
if num != 0 { if num != 0 {
print!(" "); // Separator print!(" "); // Separator
@ -156,7 +152,7 @@ fn details_view(columns: &Vec<Column>, files: Vec<File>, header: bool) {
print!("{}", row[num].text); print!("{}", row[num].text);
} }
else { else {
let padding = column_widths[num] - field_widths[num]; let padding = column_widths[num] - row[num].length;
print!("{}", column.alignment().pad_string(&row[num].text, padding)); print!("{}", column.alignment().pad_string(&row[num].text, padding));
} }
} }