mirror of
https://github.com/Llewellynvdm/exa.git
synced 2024-06-26 02:32:35 +00:00
This commit introduces the `output::cell::DisplayWidth` struct, which encapsulates the Unicode *display width* of a string in a struct that makes it less easily confused with the *length* of a string. The use of this type means that it's now harder to accidentally use a string's length-in-bytes as its width. I've fixed at least one case in the code where this was being done! The only casualty is that it introduces a dependency on the output module from the file module, which will be removed next commit.
139 lines
4.3 KiB
Rust
139 lines
4.3 KiB
Rust
use std::iter::repeat;
|
|
|
|
use ansi_term::ANSIStrings;
|
|
use users::OSUsers;
|
|
use term_grid as grid;
|
|
|
|
use dir::Dir;
|
|
use feature::xattr::FileAttributes;
|
|
use file::File;
|
|
|
|
use output::cell::TextCell;
|
|
use output::column::Column;
|
|
use output::details::{Details, Table};
|
|
use output::grid::Grid;
|
|
|
|
#[derive(PartialEq, Debug, Copy, Clone)]
|
|
pub struct GridDetails {
|
|
pub grid: Grid,
|
|
pub details: Details,
|
|
}
|
|
|
|
fn file_has_xattrs(file: &File) -> bool {
|
|
match file.path.attributes() {
|
|
Ok(attrs) => !attrs.is_empty(),
|
|
Err(_) => false,
|
|
}
|
|
}
|
|
|
|
impl GridDetails {
|
|
pub fn view(&self, dir: Option<&Dir>, files: Vec<File>) {
|
|
let columns_for_dir = match self.details.columns {
|
|
Some(cols) => cols.for_dir(dir),
|
|
None => Vec::new(),
|
|
};
|
|
|
|
let mut first_table = Table::with_options(self.details.colours, columns_for_dir.clone());
|
|
let cells = files.iter()
|
|
.map(|file| first_table.cells_for_file(file, file_has_xattrs(file)))
|
|
.collect::<Vec<_>>();
|
|
|
|
let file_names = files.into_iter()
|
|
.map(|file| first_table.filename_cell(file, false))
|
|
.collect::<Vec<_>>();
|
|
|
|
let mut last_working_table = self.make_grid(1, &columns_for_dir, &file_names, cells.clone());
|
|
|
|
for column_count in 2.. {
|
|
let grid = self.make_grid(column_count, &columns_for_dir, &file_names, cells.clone());
|
|
|
|
let the_grid_fits = {
|
|
let d = grid.fit_into_columns(column_count);
|
|
d.is_complete() && d.width() <= self.grid.console_width
|
|
};
|
|
|
|
if the_grid_fits {
|
|
last_working_table = grid;
|
|
}
|
|
else {
|
|
print!("{}", last_working_table.fit_into_columns(column_count - 1));
|
|
return;
|
|
}
|
|
}
|
|
}
|
|
|
|
fn make_table(&self, columns_for_dir: &[Column]) -> Table<OSUsers> {
|
|
let mut table = Table::with_options(self.details.colours, columns_for_dir.into());
|
|
if self.details.header { table.add_header() }
|
|
table
|
|
}
|
|
|
|
fn make_grid(&self, column_count: usize, columns_for_dir: &[Column], file_names: &[TextCell], cells: Vec<Vec<TextCell>>) -> grid::Grid {
|
|
let mut tables: Vec<_> = repeat(()).map(|_| self.make_table(columns_for_dir)).take(column_count).collect();
|
|
|
|
let mut num_cells = cells.len();
|
|
if self.details.header {
|
|
num_cells += column_count;
|
|
}
|
|
|
|
let original_height = divide_rounding_up(cells.len(), column_count);
|
|
let height = divide_rounding_up(num_cells, column_count);
|
|
|
|
for (i, (file_name, row)) in file_names.iter().zip(cells.into_iter()).enumerate() {
|
|
let index = if self.grid.across {
|
|
i % column_count
|
|
}
|
|
else {
|
|
i / original_height
|
|
};
|
|
|
|
tables[index].add_file_with_cells(row, file_name.clone(), 0, false);
|
|
}
|
|
|
|
let columns: Vec<_> = tables.into_iter().map(|t| t.print_table()).collect();
|
|
|
|
let direction = if self.grid.across { grid::Direction::LeftToRight }
|
|
else { grid::Direction::TopToBottom };
|
|
|
|
let mut grid = grid::Grid::new(grid::GridOptions {
|
|
direction: direction,
|
|
filling: grid::Filling::Spaces(4),
|
|
});
|
|
|
|
if self.grid.across {
|
|
for row in 0 .. height {
|
|
for column in columns.iter() {
|
|
if row < column.len() {
|
|
let cell = grid::Cell {
|
|
contents: ANSIStrings(&column[row].contents).to_string(),
|
|
width: *column[row].length,
|
|
};
|
|
|
|
grid.add(cell);
|
|
}
|
|
}
|
|
}
|
|
}
|
|
else {
|
|
for column in columns.iter() {
|
|
for cell in column.iter() {
|
|
let cell = grid::Cell {
|
|
contents: ANSIStrings(&cell.contents).to_string(),
|
|
width: *cell.length,
|
|
};
|
|
|
|
grid.add(cell);
|
|
}
|
|
}
|
|
}
|
|
|
|
grid
|
|
}
|
|
}
|
|
|
|
|
|
fn divide_rounding_up(a: usize, b: usize) -> usize {
|
|
let mut result = a / b;
|
|
if a % b != 0 { result += 1; }
|
|
result
|
|
} |