Llewellyn/exa
1
0
Fork 0
mirror of https://github.com/Llewellynvdm/exa.git synced 2024-11-05 20:37:52 +00:00
Code Issues Projects Releases Wiki Activity

Allow using --across with --long --grid

Browse Source
This commit is contained in:
Ben S 2015-06-29 13:13:23 +01:00
parent 6d6e8b78f0
commit 2bc7fde715
2 changed files with 47 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/options.rs
View File

@ -259,7 +259,7 @@ impl View {
use self::Misfire::*;
let long = || {
if matches.opt_present("across") {
if matches.opt_present("across") && !matches.opt_present("grid") {
Err(Useless("across", true, "long"))
}
else if matches.opt_present("oneline") {

42
src/output/grid_details.rs
View File

@ -49,23 +49,58 @@ impl GridDetails {
let mut tables: Vec<_> = repeat(()).map(|_| make_table()).take(column_count).collect();
let mut height = cells.len() / column_count;
let mut num_cells = cells.len();
if self.details.header {
num_cells += column_count;
}
let mut original_height = cells.len() / column_count;
if cells.len() % column_count != 0 {
original_height += 1;
}
let mut height = num_cells / column_count;
if num_cells % column_count != 0 {
height += 1;
}
for (i, (file, row)) in files.iter().zip(cells.into_iter()).enumerate() {
tables[i / height].add_file_with_cells(row, file, 0, false, false);
let index = if self.grid.across {
i % column_count
}
else {
i / original_height
};
tables[index].add_file_with_cells(row, file, 0, false, false);
}
let columns: Vec<_> = tables.iter().map(|t| t.print_table(false, false)).collect();
let direction = grid::Direction::TopToBottom;
let direction = if self.grid.across { grid::Direction::LeftToRight }
else { grid::Direction::TopToBottom };
let mut grid = grid::Grid::new(grid::GridOptions {
direction: direction,
separator_width: 4,
});
if self.grid.across {
for row in 0 .. height {
for column in columns.iter() {
if row < column.len() {
let cell = grid::Cell {
contents: column[row].text.clone(),
width: column[row].length,
};
grid.add(cell);
}
}
}
}
else {
for column in columns.iter() {
for cell in column.iter() {
let cell = grid::Cell {
@ -76,6 +111,7 @@ impl GridDetails {
grid.add(cell);
}
}
}
grid
}