2015-09-03 17:48:53 +00:00
|
|
|
//! The **Details** output view displays each file as a row in a table.
|
|
|
|
//!
|
|
|
|
//! It's used in the following situations:
|
|
|
|
//!
|
|
|
|
//! - Most commonly, when using the `--long` command-line argument to display the
|
|
|
|
//! details of each file, which requires using a table view to hold all the data;
|
|
|
|
//! - When using the `--tree` argument, which uses the same table view to display
|
|
|
|
//! each file on its own line, with the table providing the tree characters;
|
|
|
|
//! - When using both the `--long` and `--grid` arguments, which constructs a
|
|
|
|
//! series of tables to fit all the data on the screen.
|
|
|
|
//!
|
|
|
|
//! You will probably recognise it from the `ls --long` command. It looks like
|
|
|
|
//! this:
|
|
|
|
//!
|
|
|
|
//! .rw-r--r-- 9.6k ben 29 Jun 16:16 Cargo.lock
|
|
|
|
//! .rw-r--r-- 547 ben 23 Jun 10:54 Cargo.toml
|
|
|
|
//! .rw-r--r-- 1.1k ben 23 Nov 2014 LICENCE
|
|
|
|
//! .rw-r--r-- 2.5k ben 21 May 14:38 README.md
|
|
|
|
//! .rw-r--r-- 382k ben 8 Jun 21:00 screenshot.png
|
|
|
|
//! drwxr-xr-x - ben 29 Jun 14:50 src
|
|
|
|
//! drwxr-xr-x - ben 28 Jun 19:53 target
|
|
|
|
//!
|
|
|
|
//! The table is constructed by creating a `Table` value, which produces a `Row`
|
|
|
|
//! value for each file. These rows can contain a vector of `Cell`s, or they can
|
|
|
|
//! contain depth information for the tree view, or both. These are described
|
|
|
|
//! below.
|
|
|
|
//!
|
|
|
|
//!
|
|
|
|
//! ## Constructing Detail Views
|
|
|
|
//!
|
|
|
|
//! When using the `--long` command-line argument, the details of each file are
|
|
|
|
//! displayed next to its name.
|
|
|
|
//!
|
|
|
|
//! The table holds a vector of all the column types. For each file and column, a
|
|
|
|
//! `Cell` value containing the ANSI-coloured text and Unicode width of each cell
|
|
|
|
//! is generated, with the row and column determined by indexing into both arrays.
|
|
|
|
//!
|
|
|
|
//! The column types vector does not actually include the filename. This is
|
|
|
|
//! because the filename is always the rightmost field, and as such, it does not
|
|
|
|
//! need to have its width queried or be padded with spaces.
|
|
|
|
//!
|
|
|
|
//! To illustrate the above:
|
|
|
|
//!
|
|
|
|
//! ┌─────────────────────────────────────────────────────────────────────────┐
|
|
|
|
//! │ columns: [ Permissions, Size, User, Date(Modified) ] │
|
|
|
|
//! ├─────────────────────────────────────────────────────────────────────────┤
|
|
|
|
//! │ rows: cells: filename: │
|
|
|
|
//! │ row 1: [ ".rw-r--r--", "9.6k", "ben", "29 Jun 16:16" ] Cargo.lock │
|
|
|
|
//! │ row 2: [ ".rw-r--r--", "547", "ben", "23 Jun 10:54" ] Cargo.toml │
|
|
|
|
//! │ row 3: [ "drwxr-xr-x", "-", "ben", "29 Jun 14:50" ] src │
|
|
|
|
//! │ row 4: [ "drwxr-xr-x", "-", "ben", "28 Jun 19:53" ] target │
|
|
|
|
//! └─────────────────────────────────────────────────────────────────────────┘
|
|
|
|
//!
|
|
|
|
//! Each column in the table needs to be resized to fit its widest argument. This
|
|
|
|
//! means that we must wait until every row has been added to the table before it
|
|
|
|
//! can be displayed, in order to make sure that every column is wide enough.
|
|
|
|
//!
|
|
|
|
//!
|
|
|
|
//! ## Constructing Tree Views
|
|
|
|
//!
|
|
|
|
//! When using the `--tree` argument, instead of a vector of cells, each row has a
|
|
|
|
//! `depth` field that indicates how far deep in the tree it is: the top level has
|
|
|
|
//! depth 0, its children have depth 1, and *their* children have depth 2, and so
|
|
|
|
//! on.
|
|
|
|
//!
|
|
|
|
//! On top of this, it also has a `last` field that specifies whether this is the
|
|
|
|
//! last row of this particular consecutive set of rows. This doesn't affect the
|
|
|
|
//! file's information; it's just used to display a different set of Unicode tree
|
|
|
|
//! characters! The resulting table looks like this:
|
|
|
|
//!
|
|
|
|
//! ┌───────┬───────┬───────────────────────┐
|
|
|
|
//! │ Depth │ Last │ Output │
|
|
|
|
//! ├───────┼───────┼───────────────────────┤
|
|
|
|
//! │ 0 │ │ documents │
|
|
|
|
//! │ 1 │ false │ ├── this_file.txt │
|
|
|
|
//! │ 1 │ false │ ├── that_file.txt │
|
|
|
|
//! │ 1 │ false │ ├── features │
|
|
|
|
//! │ 2 │ false │ │ ├── feature_1.rs │
|
|
|
|
//! │ 2 │ false │ │ ├── feature_2.rs │
|
|
|
|
//! │ 2 │ true │ │ └── feature_3.rs │
|
|
|
|
//! │ 1 │ true │ └── pictures │
|
|
|
|
//! │ 2 │ false │ ├── garden.jpg │
|
|
|
|
//! │ 2 │ false │ ├── flowers.jpg │
|
|
|
|
//! │ 2 │ false │ ├── library.png │
|
|
|
|
//! │ 2 │ true │ └── space.tiff │
|
|
|
|
//! └───────┴───────┴───────────────────────┘
|
|
|
|
//!
|
|
|
|
//! Creating the table like this means that each file has to be tested to see if
|
|
|
|
//! it's the last one in the group. This is usually done by putting all the files
|
|
|
|
//! in a vector beforehand, getting its length, then comparing the index of each
|
|
|
|
//! file to see if it's the last one. (As some files may not be successfully
|
|
|
|
//! `stat`ted, we don't know how many files are going to exist in each directory)
|
|
|
|
//!
|
|
|
|
//! These rows have a `None` value for their vector of cells, instead of a `Some`
|
|
|
|
//! vector containing any. It's possible to have *both* a vector of cells and
|
|
|
|
//! depth and last flags when the user specifies `--tree` *and* `--long`.
|
|
|
|
//!
|
|
|
|
//!
|
|
|
|
//! ## Extended Attributes and Errors
|
|
|
|
//!
|
|
|
|
//! Finally, files' extended attributes and any errors that occur while statting
|
|
|
|
//! them can also be displayed as their children. It looks like this:
|
|
|
|
//!
|
|
|
|
//! .rw-r--r-- 0 ben 3 Sep 13:26 forbidden
|
|
|
|
//! └── <Permission denied (os error 13)>
|
|
|
|
//! .rw-r--r--@ 0 ben 3 Sep 13:26 file_with_xattrs
|
|
|
|
//! ├── another_greeting (len 2)
|
|
|
|
//! └── greeting (len 5)
|
|
|
|
//!
|
|
|
|
//! These lines also have `None` cells, and the error string or attribute details
|
|
|
|
//! are used in place of the filename.
|
|
|
|
|
|
|
|
|
2015-08-25 14:04:15 +00:00
|
|
|
use std::error::Error;
|
|
|
|
use std::io;
|
2015-08-26 10:36:10 +00:00
|
|
|
use std::path::PathBuf;
|
2015-06-28 12:21:21 +00:00
|
|
|
use std::string::ToString;
|
2015-11-04 08:41:49 +00:00
|
|
|
use std::ops::Add;
|
2015-11-04 14:22:51 +00:00
|
|
|
use std::iter::repeat;
|
2015-06-28 12:21:21 +00:00
|
|
|
|
2015-05-09 22:57:18 +00:00
|
|
|
use colours::Colours;
|
2015-02-05 14:39:56 +00:00
|
|
|
use dir::Dir;
|
2015-08-25 20:08:25 +00:00
|
|
|
use feature::xattr::{Attribute, FileAttributes};
|
2015-05-12 02:33:40 +00:00
|
|
|
use file::fields as f;
|
2015-06-08 20:33:39 +00:00
|
|
|
use file::File;
|
2015-11-14 23:32:57 +00:00
|
|
|
use options::{FileFilter, RecurseOptions};
|
|
|
|
use output::column::{Alignment, Column, Columns, Cell, SizeFormat};
|
2015-05-16 20:02:28 +00:00
|
|
|
|
2015-05-12 02:36:47 +00:00
|
|
|
use ansi_term::{ANSIString, ANSIStrings, Style};
|
2015-02-05 14:39:56 +00:00
|
|
|
|
2015-06-08 20:33:39 +00:00
|
|
|
use datetime::local::{LocalDateTime, DatePiece};
|
|
|
|
use datetime::format::{DateFormat};
|
2015-09-20 23:15:07 +00:00
|
|
|
use datetime::zoned::{TimeZone};
|
2015-06-08 20:33:39 +00:00
|
|
|
|
2015-02-10 16:08:10 +00:00
|
|
|
use locale;
|
2015-02-05 14:39:56 +00:00
|
|
|
|
2015-05-11 22:28:01 +00:00
|
|
|
use number_prefix::{binary_prefix, decimal_prefix, Prefixed, Standalone, PrefixNames};
|
|
|
|
|
2015-06-08 20:33:39 +00:00
|
|
|
use users::{OSUsers, Users};
|
|
|
|
use users::mock::MockUsers;
|
|
|
|
|
|
|
|
use super::filename;
|
2015-06-04 14:15:39 +00:00
|
|
|
|
2015-05-11 22:28:01 +00:00
|
|
|
|
2015-02-26 08:27:29 +00:00
|
|
|
/// With the **Details** view, the output gets formatted into columns, with
|
|
|
|
/// each `Column` object showing some piece of information about the file,
|
|
|
|
/// such as its size, or its permissions.
|
|
|
|
///
|
|
|
|
/// To do this, the results have to be written to a table, instead of
|
|
|
|
/// displaying each file immediately. Then, the width of each column can be
|
|
|
|
/// calculated based on the individual results, and the fields are padded
|
|
|
|
/// during output.
|
|
|
|
///
|
|
|
|
/// Almost all the heavy lifting is done in a Table object, which handles the
|
|
|
|
/// columns for each row.
|
2015-11-14 23:32:57 +00:00
|
|
|
#[derive(PartialEq, Debug, Copy, Clone)]
|
2015-02-05 14:39:56 +00:00
|
|
|
pub struct Details {
|
2015-02-26 08:27:29 +00:00
|
|
|
|
|
|
|
/// A Columns object that says which columns should be included in the
|
|
|
|
/// output in the general case. Directories themselves can pick which
|
|
|
|
/// columns are *added* to this list, such as the Git column.
|
2015-08-03 12:54:25 +00:00
|
|
|
pub columns: Option<Columns>,
|
2015-02-26 08:27:29 +00:00
|
|
|
|
|
|
|
/// Whether to recurse through directories with a tree view, and if so,
|
|
|
|
/// which options to use. This field is only relevant here if the `tree`
|
|
|
|
/// field of the RecurseOptions is `true`.
|
Parallelise the details view!
This commit removes the threadpool in `main.rs` that stats each command-line argument separately, and replaces it with a *scoped* threadpool in `options/details.rs` that builds the table in parallel! Running this on my machine halves the execution time when tree-ing my entire home directory (which isn't exactly a common occurrence, but it's the only way to give exa a large running time)
The statting will be added back in parallel at a later stage. This was facilitated by the previous changes to recursion that made it easier to deal with.
There's a lot of large sweeping architectural changes. Here's a smattering of them:
- In `main.rs`, the files are now passed around as vectors of files rather than array slices of files. This is because `File`s aren't `Clone`, and the `Vec` is necessary to give away ownership of the files at the appropriate point.
- In the details view, files are now sorted *all* the time, rather than obeying the command-line order. As they're run in parallel, they have no guaranteed order anyway, so we *have* to sort them again. (I'm not sure if this should be the intended behaviour or not!) This means that the `Details` struct has to have the filter *all* the time, not only while recursing, so it's been moved out of the `recurse` field.
- We use `scoped_threadpool` over `threadpool`, a recent addition. It's only safely used on Nightly, which we're using anyway, so that's OK!
- Removed a bunch of out-of-date comments.
This also fixes #77, mainly by accident :)
2015-09-02 22:19:10 +00:00
|
|
|
pub recurse: Option<RecurseOptions>,
|
|
|
|
|
|
|
|
/// How to sort and filter the files after getting their details.
|
|
|
|
pub filter: FileFilter,
|
2015-02-26 08:27:29 +00:00
|
|
|
|
|
|
|
/// Whether to show a header line or not.
|
|
|
|
pub header: bool,
|
|
|
|
|
|
|
|
/// Whether to show each file's extended attributes.
|
2015-02-22 12:55:13 +00:00
|
|
|
pub xattr: bool,
|
2015-05-09 22:57:18 +00:00
|
|
|
|
2015-05-16 15:10:58 +00:00
|
|
|
/// The colours to use to display information in the table, including the
|
|
|
|
/// colour of the tree view symbols.
|
2015-05-09 22:57:18 +00:00
|
|
|
pub colours: Colours,
|
2015-02-05 14:39:56 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
impl Details {
|
2015-09-03 17:48:53 +00:00
|
|
|
|
|
|
|
/// Print the details of the given vector of files -- all of which will
|
|
|
|
/// have been read from the given directory, if present -- to stdout.
|
Parallelise the details view!
This commit removes the threadpool in `main.rs` that stats each command-line argument separately, and replaces it with a *scoped* threadpool in `options/details.rs` that builds the table in parallel! Running this on my machine halves the execution time when tree-ing my entire home directory (which isn't exactly a common occurrence, but it's the only way to give exa a large running time)
The statting will be added back in parallel at a later stage. This was facilitated by the previous changes to recursion that made it easier to deal with.
There's a lot of large sweeping architectural changes. Here's a smattering of them:
- In `main.rs`, the files are now passed around as vectors of files rather than array slices of files. This is because `File`s aren't `Clone`, and the `Vec` is necessary to give away ownership of the files at the appropriate point.
- In the details view, files are now sorted *all* the time, rather than obeying the command-line order. As they're run in parallel, they have no guaranteed order anyway, so we *have* to sort them again. (I'm not sure if this should be the intended behaviour or not!) This means that the `Details` struct has to have the filter *all* the time, not only while recursing, so it's been moved out of the `recurse` field.
- We use `scoped_threadpool` over `threadpool`, a recent addition. It's only safely used on Nightly, which we're using anyway, so that's OK!
- Removed a bunch of out-of-date comments.
This also fixes #77, mainly by accident :)
2015-09-02 22:19:10 +00:00
|
|
|
pub fn view(&self, dir: Option<&Dir>, files: Vec<File>) {
|
2015-09-03 17:48:53 +00:00
|
|
|
|
2015-02-26 08:27:29 +00:00
|
|
|
// First, transform the Columns object into a vector of columns for
|
|
|
|
// the current directory.
|
2015-08-03 12:54:25 +00:00
|
|
|
let columns_for_dir = match self.columns {
|
|
|
|
Some(cols) => cols.for_dir(dir),
|
|
|
|
None => Vec::new(),
|
|
|
|
};
|
|
|
|
|
2015-09-03 17:48:53 +00:00
|
|
|
// Next, add a header if the user requests it.
|
2015-08-03 12:54:25 +00:00
|
|
|
let mut table = Table::with_options(self.colours, columns_for_dir);
|
2015-02-26 07:18:08 +00:00
|
|
|
if self.header { table.add_header() }
|
|
|
|
|
2015-02-26 08:27:29 +00:00
|
|
|
// Then add files to the table and print it out.
|
2015-02-26 07:18:08 +00:00
|
|
|
self.add_files_to_table(&mut table, files, 0);
|
2015-08-25 20:08:25 +00:00
|
|
|
for cell in table.print_table() {
|
2015-06-28 12:21:21 +00:00
|
|
|
println!("{}", cell.text);
|
|
|
|
}
|
2015-02-26 07:18:08 +00:00
|
|
|
}
|
|
|
|
|
2015-09-03 17:48:53 +00:00
|
|
|
/// Adds files to the table, possibly recursively. This is easily
|
|
|
|
/// parallelisable, and uses a pool of threads.
|
|
|
|
fn add_files_to_table<'dir, U: Users+Send>(&self, mut table: &mut Table<U>, src: Vec<File<'dir>>, depth: usize) {
|
Parallelise the details view!
This commit removes the threadpool in `main.rs` that stats each command-line argument separately, and replaces it with a *scoped* threadpool in `options/details.rs` that builds the table in parallel! Running this on my machine halves the execution time when tree-ing my entire home directory (which isn't exactly a common occurrence, but it's the only way to give exa a large running time)
The statting will be added back in parallel at a later stage. This was facilitated by the previous changes to recursion that made it easier to deal with.
There's a lot of large sweeping architectural changes. Here's a smattering of them:
- In `main.rs`, the files are now passed around as vectors of files rather than array slices of files. This is because `File`s aren't `Clone`, and the `Vec` is necessary to give away ownership of the files at the appropriate point.
- In the details view, files are now sorted *all* the time, rather than obeying the command-line order. As they're run in parallel, they have no guaranteed order anyway, so we *have* to sort them again. (I'm not sure if this should be the intended behaviour or not!) This means that the `Details` struct has to have the filter *all* the time, not only while recursing, so it's been moved out of the `recurse` field.
- We use `scoped_threadpool` over `threadpool`, a recent addition. It's only safely used on Nightly, which we're using anyway, so that's OK!
- Removed a bunch of out-of-date comments.
This also fixes #77, mainly by accident :)
2015-09-02 22:19:10 +00:00
|
|
|
use num_cpus;
|
|
|
|
use scoped_threadpool::Pool;
|
|
|
|
use std::sync::{Arc, Mutex};
|
|
|
|
|
|
|
|
let mut pool = Pool::new(num_cpus::get() as u32);
|
|
|
|
let mut file_eggs = Vec::new();
|
|
|
|
|
|
|
|
struct Egg<'_> {
|
|
|
|
cells: Vec<Cell>,
|
|
|
|
name: Cell,
|
|
|
|
xattrs: Vec<Attribute>,
|
|
|
|
errors: Vec<(io::Error, Option<PathBuf>)>,
|
|
|
|
dir: Option<Dir>,
|
|
|
|
file: Arc<File<'_>>,
|
|
|
|
}
|
2015-08-26 11:00:31 +00:00
|
|
|
|
Parallelise the details view!
This commit removes the threadpool in `main.rs` that stats each command-line argument separately, and replaces it with a *scoped* threadpool in `options/details.rs` that builds the table in parallel! Running this on my machine halves the execution time when tree-ing my entire home directory (which isn't exactly a common occurrence, but it's the only way to give exa a large running time)
The statting will be added back in parallel at a later stage. This was facilitated by the previous changes to recursion that made it easier to deal with.
There's a lot of large sweeping architectural changes. Here's a smattering of them:
- In `main.rs`, the files are now passed around as vectors of files rather than array slices of files. This is because `File`s aren't `Clone`, and the `Vec` is necessary to give away ownership of the files at the appropriate point.
- In the details view, files are now sorted *all* the time, rather than obeying the command-line order. As they're run in parallel, they have no guaranteed order anyway, so we *have* to sort them again. (I'm not sure if this should be the intended behaviour or not!) This means that the `Details` struct has to have the filter *all* the time, not only while recursing, so it's been moved out of the `recurse` field.
- We use `scoped_threadpool` over `threadpool`, a recent addition. It's only safely used on Nightly, which we're using anyway, so that's OK!
- Removed a bunch of out-of-date comments.
This also fixes #77, mainly by accident :)
2015-09-02 22:19:10 +00:00
|
|
|
pool.scoped(|scoped| {
|
|
|
|
let file_eggs = Arc::new(Mutex::new(&mut file_eggs));
|
|
|
|
let table = Arc::new(Mutex::new(&mut table));
|
2015-08-25 14:04:15 +00:00
|
|
|
|
Parallelise the details view!
This commit removes the threadpool in `main.rs` that stats each command-line argument separately, and replaces it with a *scoped* threadpool in `options/details.rs` that builds the table in parallel! Running this on my machine halves the execution time when tree-ing my entire home directory (which isn't exactly a common occurrence, but it's the only way to give exa a large running time)
The statting will be added back in parallel at a later stage. This was facilitated by the previous changes to recursion that made it easier to deal with.
There's a lot of large sweeping architectural changes. Here's a smattering of them:
- In `main.rs`, the files are now passed around as vectors of files rather than array slices of files. This is because `File`s aren't `Clone`, and the `Vec` is necessary to give away ownership of the files at the appropriate point.
- In the details view, files are now sorted *all* the time, rather than obeying the command-line order. As they're run in parallel, they have no guaranteed order anyway, so we *have* to sort them again. (I'm not sure if this should be the intended behaviour or not!) This means that the `Details` struct has to have the filter *all* the time, not only while recursing, so it's been moved out of the `recurse` field.
- We use `scoped_threadpool` over `threadpool`, a recent addition. It's only safely used on Nightly, which we're using anyway, so that's OK!
- Removed a bunch of out-of-date comments.
This also fixes #77, mainly by accident :)
2015-09-02 22:19:10 +00:00
|
|
|
for file in src.into_iter() {
|
|
|
|
let file: Arc<File> = Arc::new(file);
|
|
|
|
let file_eggs = file_eggs.clone();
|
|
|
|
let table = table.clone();
|
2015-08-26 10:36:10 +00:00
|
|
|
|
Parallelise the details view!
This commit removes the threadpool in `main.rs` that stats each command-line argument separately, and replaces it with a *scoped* threadpool in `options/details.rs` that builds the table in parallel! Running this on my machine halves the execution time when tree-ing my entire home directory (which isn't exactly a common occurrence, but it's the only way to give exa a large running time)
The statting will be added back in parallel at a later stage. This was facilitated by the previous changes to recursion that made it easier to deal with.
There's a lot of large sweeping architectural changes. Here's a smattering of them:
- In `main.rs`, the files are now passed around as vectors of files rather than array slices of files. This is because `File`s aren't `Clone`, and the `Vec` is necessary to give away ownership of the files at the appropriate point.
- In the details view, files are now sorted *all* the time, rather than obeying the command-line order. As they're run in parallel, they have no guaranteed order anyway, so we *have* to sort them again. (I'm not sure if this should be the intended behaviour or not!) This means that the `Details` struct has to have the filter *all* the time, not only while recursing, so it's been moved out of the `recurse` field.
- We use `scoped_threadpool` over `threadpool`, a recent addition. It's only safely used on Nightly, which we're using anyway, so that's OK!
- Removed a bunch of out-of-date comments.
This also fixes #77, mainly by accident :)
2015-09-02 22:19:10 +00:00
|
|
|
scoped.execute(move || {
|
|
|
|
let mut errors = Vec::new();
|
2015-08-26 10:36:10 +00:00
|
|
|
|
Parallelise the details view!
This commit removes the threadpool in `main.rs` that stats each command-line argument separately, and replaces it with a *scoped* threadpool in `options/details.rs` that builds the table in parallel! Running this on my machine halves the execution time when tree-ing my entire home directory (which isn't exactly a common occurrence, but it's the only way to give exa a large running time)
The statting will be added back in parallel at a later stage. This was facilitated by the previous changes to recursion that made it easier to deal with.
There's a lot of large sweeping architectural changes. Here's a smattering of them:
- In `main.rs`, the files are now passed around as vectors of files rather than array slices of files. This is because `File`s aren't `Clone`, and the `Vec` is necessary to give away ownership of the files at the appropriate point.
- In the details view, files are now sorted *all* the time, rather than obeying the command-line order. As they're run in parallel, they have no guaranteed order anyway, so we *have* to sort them again. (I'm not sure if this should be the intended behaviour or not!) This means that the `Details` struct has to have the filter *all* the time, not only while recursing, so it's been moved out of the `recurse` field.
- We use `scoped_threadpool` over `threadpool`, a recent addition. It's only safely used on Nightly, which we're using anyway, so that's OK!
- Removed a bunch of out-of-date comments.
This also fixes #77, mainly by accident :)
2015-09-02 22:19:10 +00:00
|
|
|
let mut xattrs = Vec::new();
|
|
|
|
match file.path.attributes() {
|
|
|
|
Ok(xs) => {
|
|
|
|
if self.xattr {
|
|
|
|
for xattr in xs {
|
|
|
|
xattrs.push(xattr);
|
2015-08-26 10:36:10 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
},
|
|
|
|
Err(e) => {
|
Parallelise the details view!
This commit removes the threadpool in `main.rs` that stats each command-line argument separately, and replaces it with a *scoped* threadpool in `options/details.rs` that builds the table in parallel! Running this on my machine halves the execution time when tree-ing my entire home directory (which isn't exactly a common occurrence, but it's the only way to give exa a large running time)
The statting will be added back in parallel at a later stage. This was facilitated by the previous changes to recursion that made it easier to deal with.
There's a lot of large sweeping architectural changes. Here's a smattering of them:
- In `main.rs`, the files are now passed around as vectors of files rather than array slices of files. This is because `File`s aren't `Clone`, and the `Vec` is necessary to give away ownership of the files at the appropriate point.
- In the details view, files are now sorted *all* the time, rather than obeying the command-line order. As they're run in parallel, they have no guaranteed order anyway, so we *have* to sort them again. (I'm not sure if this should be the intended behaviour or not!) This means that the `Details` struct has to have the filter *all* the time, not only while recursing, so it's been moved out of the `recurse` field.
- We use `scoped_threadpool` over `threadpool`, a recent addition. It's only safely used on Nightly, which we're using anyway, so that's OK!
- Removed a bunch of out-of-date comments.
This also fixes #77, mainly by accident :)
2015-09-02 22:19:10 +00:00
|
|
|
if self.xattr {
|
|
|
|
errors.push((e, None));
|
|
|
|
}
|
2015-08-26 10:36:10 +00:00
|
|
|
},
|
Parallelise the details view!
This commit removes the threadpool in `main.rs` that stats each command-line argument separately, and replaces it with a *scoped* threadpool in `options/details.rs` that builds the table in parallel! Running this on my machine halves the execution time when tree-ing my entire home directory (which isn't exactly a common occurrence, but it's the only way to give exa a large running time)
The statting will be added back in parallel at a later stage. This was facilitated by the previous changes to recursion that made it easier to deal with.
There's a lot of large sweeping architectural changes. Here's a smattering of them:
- In `main.rs`, the files are now passed around as vectors of files rather than array slices of files. This is because `File`s aren't `Clone`, and the `Vec` is necessary to give away ownership of the files at the appropriate point.
- In the details view, files are now sorted *all* the time, rather than obeying the command-line order. As they're run in parallel, they have no guaranteed order anyway, so we *have* to sort them again. (I'm not sure if this should be the intended behaviour or not!) This means that the `Details` struct has to have the filter *all* the time, not only while recursing, so it's been moved out of the `recurse` field.
- We use `scoped_threadpool` over `threadpool`, a recent addition. It's only safely used on Nightly, which we're using anyway, so that's OK!
- Removed a bunch of out-of-date comments.
This also fixes #77, mainly by accident :)
2015-09-02 22:19:10 +00:00
|
|
|
};
|
|
|
|
|
|
|
|
let cells = table.lock().unwrap().cells_for_file(&file, !xattrs.is_empty());
|
2015-09-03 17:48:53 +00:00
|
|
|
|
|
|
|
let name = Cell {
|
|
|
|
text: filename(&file, &self.colours, true),
|
|
|
|
length: file.file_name_width()
|
|
|
|
};
|
Parallelise the details view!
This commit removes the threadpool in `main.rs` that stats each command-line argument separately, and replaces it with a *scoped* threadpool in `options/details.rs` that builds the table in parallel! Running this on my machine halves the execution time when tree-ing my entire home directory (which isn't exactly a common occurrence, but it's the only way to give exa a large running time)
The statting will be added back in parallel at a later stage. This was facilitated by the previous changes to recursion that made it easier to deal with.
There's a lot of large sweeping architectural changes. Here's a smattering of them:
- In `main.rs`, the files are now passed around as vectors of files rather than array slices of files. This is because `File`s aren't `Clone`, and the `Vec` is necessary to give away ownership of the files at the appropriate point.
- In the details view, files are now sorted *all* the time, rather than obeying the command-line order. As they're run in parallel, they have no guaranteed order anyway, so we *have* to sort them again. (I'm not sure if this should be the intended behaviour or not!) This means that the `Details` struct has to have the filter *all* the time, not only while recursing, so it's been moved out of the `recurse` field.
- We use `scoped_threadpool` over `threadpool`, a recent addition. It's only safely used on Nightly, which we're using anyway, so that's OK!
- Removed a bunch of out-of-date comments.
This also fixes #77, mainly by accident :)
2015-09-02 22:19:10 +00:00
|
|
|
|
|
|
|
let mut dir = None;
|
|
|
|
|
|
|
|
if let Some(r) = self.recurse {
|
|
|
|
if file.is_directory() && r.tree && !r.is_too_deep(depth) {
|
|
|
|
if let Ok(d) = file.to_dir(false) {
|
|
|
|
dir = Some(d);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
};
|
|
|
|
|
|
|
|
let egg = Egg {
|
|
|
|
cells: cells,
|
|
|
|
name: name,
|
|
|
|
xattrs: xattrs,
|
|
|
|
errors: errors,
|
|
|
|
dir: dir,
|
|
|
|
file: file,
|
|
|
|
};
|
|
|
|
|
|
|
|
file_eggs.lock().unwrap().push(egg);
|
|
|
|
});
|
|
|
|
}
|
|
|
|
});
|
|
|
|
|
|
|
|
file_eggs.sort_by(|a, b| self.filter.compare_files(&*a.file, &*b.file));
|
|
|
|
|
|
|
|
let num_eggs = file_eggs.len();
|
|
|
|
for (index, egg) in file_eggs.into_iter().enumerate() {
|
|
|
|
let mut files = Vec::new();
|
|
|
|
let mut errors = egg.errors;
|
|
|
|
|
|
|
|
let row = Row {
|
|
|
|
depth: depth,
|
|
|
|
cells: Some(egg.cells),
|
|
|
|
name: egg.name,
|
|
|
|
last: index == num_eggs - 1,
|
|
|
|
};
|
|
|
|
|
|
|
|
table.rows.push(row);
|
|
|
|
|
|
|
|
if let Some(ref dir) = egg.dir {
|
|
|
|
for file_to_add in dir.files() {
|
|
|
|
match file_to_add {
|
|
|
|
Ok(f) => files.push(f),
|
|
|
|
Err((path, e)) => errors.push((e, Some(path)))
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
self.filter.filter_files(&mut files);
|
|
|
|
|
|
|
|
if !files.is_empty() {
|
|
|
|
for xattr in egg.xattrs {
|
|
|
|
table.add_xattr(xattr, depth + 1, false);
|
|
|
|
}
|
|
|
|
|
|
|
|
for (error, path) in errors {
|
|
|
|
table.add_error(&error, depth + 1, false, path);
|
2015-08-26 10:36:10 +00:00
|
|
|
}
|
Parallelise the details view!
This commit removes the threadpool in `main.rs` that stats each command-line argument separately, and replaces it with a *scoped* threadpool in `options/details.rs` that builds the table in parallel! Running this on my machine halves the execution time when tree-ing my entire home directory (which isn't exactly a common occurrence, but it's the only way to give exa a large running time)
The statting will be added back in parallel at a later stage. This was facilitated by the previous changes to recursion that made it easier to deal with.
There's a lot of large sweeping architectural changes. Here's a smattering of them:
- In `main.rs`, the files are now passed around as vectors of files rather than array slices of files. This is because `File`s aren't `Clone`, and the `Vec` is necessary to give away ownership of the files at the appropriate point.
- In the details view, files are now sorted *all* the time, rather than obeying the command-line order. As they're run in parallel, they have no guaranteed order anyway, so we *have* to sort them again. (I'm not sure if this should be the intended behaviour or not!) This means that the `Details` struct has to have the filter *all* the time, not only while recursing, so it's been moved out of the `recurse` field.
- We use `scoped_threadpool` over `threadpool`, a recent addition. It's only safely used on Nightly, which we're using anyway, so that's OK!
- Removed a bunch of out-of-date comments.
This also fixes #77, mainly by accident :)
2015-09-02 22:19:10 +00:00
|
|
|
|
|
|
|
self.add_files_to_table(table, files, depth + 1);
|
|
|
|
continue;
|
2015-02-26 07:18:08 +00:00
|
|
|
}
|
|
|
|
}
|
2015-08-26 10:36:10 +00:00
|
|
|
|
Parallelise the details view!
This commit removes the threadpool in `main.rs` that stats each command-line argument separately, and replaces it with a *scoped* threadpool in `options/details.rs` that builds the table in parallel! Running this on my machine halves the execution time when tree-ing my entire home directory (which isn't exactly a common occurrence, but it's the only way to give exa a large running time)
The statting will be added back in parallel at a later stage. This was facilitated by the previous changes to recursion that made it easier to deal with.
There's a lot of large sweeping architectural changes. Here's a smattering of them:
- In `main.rs`, the files are now passed around as vectors of files rather than array slices of files. This is because `File`s aren't `Clone`, and the `Vec` is necessary to give away ownership of the files at the appropriate point.
- In the details view, files are now sorted *all* the time, rather than obeying the command-line order. As they're run in parallel, they have no guaranteed order anyway, so we *have* to sort them again. (I'm not sure if this should be the intended behaviour or not!) This means that the `Details` struct has to have the filter *all* the time, not only while recursing, so it's been moved out of the `recurse` field.
- We use `scoped_threadpool` over `threadpool`, a recent addition. It's only safely used on Nightly, which we're using anyway, so that's OK!
- Removed a bunch of out-of-date comments.
This also fixes #77, mainly by accident :)
2015-09-02 22:19:10 +00:00
|
|
|
let count = egg.xattrs.len();
|
|
|
|
for (index, xattr) in egg.xattrs.into_iter().enumerate() {
|
2015-08-26 10:36:10 +00:00
|
|
|
table.add_xattr(xattr, depth + 1, errors.is_empty() && index == count - 1);
|
|
|
|
}
|
|
|
|
|
|
|
|
let count = errors.len();
|
|
|
|
for (index, (error, path)) in errors.into_iter().enumerate() {
|
|
|
|
table.add_error(&error, depth + 1, index == count - 1, path);
|
|
|
|
}
|
2015-02-05 14:39:56 +00:00
|
|
|
}
|
2015-02-26 07:18:08 +00:00
|
|
|
}
|
|
|
|
}
|
2015-02-05 14:39:56 +00:00
|
|
|
|
2015-06-08 20:33:39 +00:00
|
|
|
|
2015-02-26 07:18:08 +00:00
|
|
|
struct Row {
|
2015-02-26 08:27:29 +00:00
|
|
|
|
|
|
|
/// Vector of cells to display.
|
2015-08-25 10:50:07 +00:00
|
|
|
///
|
2015-09-03 17:48:53 +00:00
|
|
|
/// Most of the rows will be used to display files' metadata, so this will
|
|
|
|
/// almost always be `Some`, containing a vector of cells. It will only be
|
|
|
|
/// `None` for a row displaying an attribute or error, neither of which
|
|
|
|
/// have cells.
|
2015-08-25 10:50:07 +00:00
|
|
|
cells: Option<Vec<Cell>>,
|
|
|
|
|
|
|
|
// Did You Know?
|
|
|
|
// A Vec<Cell> and an Option<Vec<Cell>> actually have the same byte size!
|
2015-02-26 08:27:29 +00:00
|
|
|
|
|
|
|
/// This file's name, in coloured output. The name is treated separately
|
|
|
|
/// from the other cells, as it never requires padding.
|
2015-08-25 10:50:07 +00:00
|
|
|
name: Cell,
|
2015-02-26 08:27:29 +00:00
|
|
|
|
|
|
|
/// How many directories deep into the tree structure this is. Directories
|
|
|
|
/// on top have depth 0.
|
2015-08-25 10:50:07 +00:00
|
|
|
depth: usize,
|
2015-02-26 08:27:29 +00:00
|
|
|
|
|
|
|
/// Whether this is the last entry in the directory. This flag is used
|
|
|
|
/// when calculating the tree view.
|
2015-08-25 10:50:07 +00:00
|
|
|
last: bool,
|
2015-02-26 07:18:08 +00:00
|
|
|
}
|
|
|
|
|
2015-08-25 10:45:27 +00:00
|
|
|
impl Row {
|
2015-08-25 10:50:07 +00:00
|
|
|
|
2015-09-03 17:48:53 +00:00
|
|
|
/// Gets the Unicode display width of the indexed column, if present. If
|
|
|
|
/// not, returns 0.
|
2015-08-25 10:45:27 +00:00
|
|
|
fn column_width(&self, index: usize) -> usize {
|
|
|
|
match self.cells {
|
|
|
|
Some(ref cells) => cells[index].length,
|
|
|
|
None => 0,
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2015-06-08 20:33:39 +00:00
|
|
|
|
2015-02-26 08:27:29 +00:00
|
|
|
/// A **Table** object gets built up by the view as it lists files and
|
|
|
|
/// directories.
|
2015-05-16 20:02:28 +00:00
|
|
|
pub struct Table<U> {
|
2015-05-11 22:28:01 +00:00
|
|
|
columns: Vec<Column>,
|
|
|
|
rows: Vec<Row>,
|
|
|
|
|
2015-05-12 02:07:16 +00:00
|
|
|
time: locale::Time,
|
|
|
|
numeric: locale::Numeric,
|
2015-09-20 23:15:07 +00:00
|
|
|
tz: TimeZone,
|
2015-05-16 20:02:28 +00:00
|
|
|
users: U,
|
2015-05-12 02:07:16 +00:00
|
|
|
colours: Colours,
|
|
|
|
current_year: i64,
|
2015-02-26 07:18:08 +00:00
|
|
|
}
|
|
|
|
|
2015-05-16 20:02:28 +00:00
|
|
|
impl Default for Table<MockUsers> {
|
|
|
|
fn default() -> Table<MockUsers> {
|
|
|
|
Table {
|
|
|
|
columns: Columns::default().for_dir(None),
|
|
|
|
rows: Vec::new(),
|
|
|
|
time: locale::Time::english(),
|
|
|
|
numeric: locale::Numeric::english(),
|
2015-09-20 23:15:07 +00:00
|
|
|
tz: TimeZone::localtime().unwrap(),
|
2015-05-16 20:02:28 +00:00
|
|
|
users: MockUsers::with_current_uid(0),
|
|
|
|
colours: Colours::default(),
|
|
|
|
current_year: 1234,
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
impl Table<OSUsers> {
|
2015-05-16 15:10:58 +00:00
|
|
|
|
2015-02-26 08:27:29 +00:00
|
|
|
/// Create a new, empty Table object, setting the caching fields to their
|
|
|
|
/// empty states.
|
2015-06-28 12:21:21 +00:00
|
|
|
pub fn with_options(colours: Colours, columns: Vec<Column>) -> Table<OSUsers> {
|
2015-02-26 07:18:08 +00:00
|
|
|
Table {
|
|
|
|
columns: columns,
|
2015-05-12 02:07:16 +00:00
|
|
|
rows: Vec::new(),
|
|
|
|
|
|
|
|
time: locale::Time::load_user_locale().unwrap_or_else(|_| locale::Time::english()),
|
|
|
|
numeric: locale::Numeric::load_user_locale().unwrap_or_else(|_| locale::Numeric::english()),
|
2015-09-20 23:15:07 +00:00
|
|
|
tz: TimeZone::localtime().unwrap(),
|
2015-05-12 02:07:16 +00:00
|
|
|
users: OSUsers::empty_cache(),
|
|
|
|
colours: colours,
|
|
|
|
current_year: LocalDateTime::now().year(),
|
2015-02-26 07:18:08 +00:00
|
|
|
}
|
|
|
|
}
|
2015-05-16 20:02:28 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
impl<U> Table<U> where U: Users {
|
2015-02-05 14:39:56 +00:00
|
|
|
|
2015-02-26 08:27:29 +00:00
|
|
|
/// Add a dummy "header" row to the table, which contains the names of all
|
|
|
|
/// the columns, underlined. This has dummy data for the cases that aren't
|
|
|
|
/// actually used, such as the depth or list of attributes.
|
2015-06-28 12:21:21 +00:00
|
|
|
pub fn add_header(&mut self) {
|
2015-02-26 07:18:08 +00:00
|
|
|
let row = Row {
|
2015-02-26 08:27:29 +00:00
|
|
|
depth: 0,
|
2015-08-25 10:45:27 +00:00
|
|
|
cells: Some(self.columns.iter().map(|c| Cell::paint(self.colours.header, c.header())).collect()),
|
2015-06-28 12:21:21 +00:00
|
|
|
name: Cell::paint(self.colours.header, "Name"),
|
2015-02-26 08:27:29 +00:00
|
|
|
last: false,
|
2015-02-26 07:18:08 +00:00
|
|
|
};
|
|
|
|
|
|
|
|
self.rows.push(row);
|
|
|
|
}
|
|
|
|
|
2015-08-26 10:36:10 +00:00
|
|
|
fn add_error(&mut self, error: &io::Error, depth: usize, last: bool, path: Option<PathBuf>) {
|
2015-08-25 14:04:15 +00:00
|
|
|
let error_message = match path {
|
|
|
|
Some(path) => format!("<{}: {}>", path.display(), error),
|
|
|
|
None => format!("<{}>", error),
|
|
|
|
};
|
|
|
|
|
|
|
|
let row = Row {
|
|
|
|
depth: depth,
|
|
|
|
cells: None,
|
|
|
|
name: Cell::paint(self.colours.broken_arrow, &error_message),
|
|
|
|
last: last,
|
2015-08-25 20:08:25 +00:00
|
|
|
};
|
|
|
|
|
|
|
|
self.rows.push(row);
|
|
|
|
}
|
|
|
|
|
2015-08-26 10:36:10 +00:00
|
|
|
fn add_xattr(&mut self, xattr: Attribute, depth: usize, last: bool) {
|
2015-08-25 20:08:25 +00:00
|
|
|
let row = Row {
|
|
|
|
depth: depth,
|
|
|
|
cells: None,
|
Parallelise the details view!
This commit removes the threadpool in `main.rs` that stats each command-line argument separately, and replaces it with a *scoped* threadpool in `options/details.rs` that builds the table in parallel! Running this on my machine halves the execution time when tree-ing my entire home directory (which isn't exactly a common occurrence, but it's the only way to give exa a large running time)
The statting will be added back in parallel at a later stage. This was facilitated by the previous changes to recursion that made it easier to deal with.
There's a lot of large sweeping architectural changes. Here's a smattering of them:
- In `main.rs`, the files are now passed around as vectors of files rather than array slices of files. This is because `File`s aren't `Clone`, and the `Vec` is necessary to give away ownership of the files at the appropriate point.
- In the details view, files are now sorted *all* the time, rather than obeying the command-line order. As they're run in parallel, they have no guaranteed order anyway, so we *have* to sort them again. (I'm not sure if this should be the intended behaviour or not!) This means that the `Details` struct has to have the filter *all* the time, not only while recursing, so it's been moved out of the `recurse` field.
- We use `scoped_threadpool` over `threadpool`, a recent addition. It's only safely used on Nightly, which we're using anyway, so that's OK!
- Removed a bunch of out-of-date comments.
This also fixes #77, mainly by accident :)
2015-09-02 22:19:10 +00:00
|
|
|
name: Cell::paint(self.colours.perms.attribute, &format!("{} (len {})", xattr.name, xattr.size)),
|
2015-08-25 20:08:25 +00:00
|
|
|
last: last,
|
2015-08-25 14:04:15 +00:00
|
|
|
};
|
|
|
|
|
|
|
|
self.rows.push(row);
|
|
|
|
}
|
|
|
|
|
2015-06-28 18:57:13 +00:00
|
|
|
pub fn add_file_with_cells(&mut self, cells: Vec<Cell>, file: &File, depth: usize, last: bool, links: bool) {
|
2015-05-12 01:54:34 +00:00
|
|
|
let row = Row {
|
|
|
|
depth: depth,
|
2015-08-25 10:45:27 +00:00
|
|
|
cells: Some(cells),
|
2015-06-28 12:21:21 +00:00
|
|
|
name: Cell { text: filename(file, &self.colours, links), length: file.file_name_width() },
|
2015-05-12 01:54:34 +00:00
|
|
|
last: last,
|
|
|
|
};
|
|
|
|
|
2015-05-12 02:14:56 +00:00
|
|
|
self.rows.push(row);
|
2015-05-12 01:54:34 +00:00
|
|
|
}
|
|
|
|
|
2015-02-26 08:27:29 +00:00
|
|
|
/// Use the list of columns to find which cells should be produced for
|
|
|
|
/// this file, per-column.
|
2015-08-26 11:00:31 +00:00
|
|
|
pub fn cells_for_file(&mut self, file: &File, xattrs: bool) -> Vec<Cell> {
|
2015-02-26 07:18:08 +00:00
|
|
|
self.columns.clone().iter()
|
2015-08-26 11:00:31 +00:00
|
|
|
.map(|c| self.display(file, c, xattrs))
|
2015-02-26 07:18:08 +00:00
|
|
|
.collect()
|
|
|
|
}
|
|
|
|
|
2015-08-26 11:00:31 +00:00
|
|
|
fn display(&mut self, file: &File, column: &Column, xattrs: bool) -> Cell {
|
2015-11-15 16:12:16 +00:00
|
|
|
use output::column::TimeType::*;
|
|
|
|
|
2015-05-11 22:28:01 +00:00
|
|
|
match *column {
|
2015-11-15 16:12:16 +00:00
|
|
|
Column::Permissions => self.render_permissions(file.permissions(), xattrs),
|
|
|
|
Column::FileSize(fmt) => self.render_size(file.size(), fmt),
|
|
|
|
Column::Timestamp(Modified) => self.render_time(file.modified_time()),
|
|
|
|
Column::Timestamp(Created) => self.render_time(file.created_time()),
|
|
|
|
Column::Timestamp(Accessed) => self.render_time(file.accessed_time()),
|
|
|
|
Column::HardLinks => self.render_links(file.links()),
|
|
|
|
Column::Inode => self.render_inode(file.inode()),
|
|
|
|
Column::Blocks => self.render_blocks(file.blocks()),
|
|
|
|
Column::User => self.render_user(file.user()),
|
|
|
|
Column::Group => self.render_group(file.group()),
|
|
|
|
Column::GitStatus => self.render_git_status(file.git_status()),
|
2015-05-11 22:28:01 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2015-08-26 11:00:31 +00:00
|
|
|
fn render_permissions(&self, permissions: f::Permissions, xattrs: bool) -> Cell {
|
2015-05-12 01:54:34 +00:00
|
|
|
let c = self.colours.perms;
|
|
|
|
let bit = |bit, chr: &'static str, style: Style| {
|
|
|
|
if bit { style.paint(chr) } else { self.colours.punctuation.paint("-") }
|
2015-02-26 07:18:08 +00:00
|
|
|
};
|
|
|
|
|
2015-05-12 01:54:34 +00:00
|
|
|
let file_type = match permissions.file_type {
|
2015-05-12 02:33:40 +00:00
|
|
|
f::Type::File => self.colours.filetypes.normal.paint("."),
|
|
|
|
f::Type::Directory => self.colours.filetypes.directory.paint("d"),
|
|
|
|
f::Type::Pipe => self.colours.filetypes.special.paint("|"),
|
|
|
|
f::Type::Link => self.colours.filetypes.symlink.paint("l"),
|
|
|
|
f::Type::Special => self.colours.filetypes.special.paint("?"),
|
2015-05-12 01:54:34 +00:00
|
|
|
};
|
|
|
|
|
2015-05-12 02:33:40 +00:00
|
|
|
let x_colour = if let f::Type::File = permissions.file_type { c.user_execute_file }
|
2015-05-16 13:30:01 +00:00
|
|
|
else { c.user_execute_other };
|
2015-05-12 01:54:34 +00:00
|
|
|
|
2015-05-16 13:30:01 +00:00
|
|
|
let mut columns = vec![
|
2015-05-12 01:54:34 +00:00
|
|
|
file_type,
|
|
|
|
bit(permissions.user_read, "r", c.user_read),
|
|
|
|
bit(permissions.user_write, "w", c.user_write),
|
|
|
|
bit(permissions.user_execute, "x", x_colour),
|
|
|
|
bit(permissions.group_read, "r", c.group_read),
|
|
|
|
bit(permissions.group_write, "w", c.group_write),
|
|
|
|
bit(permissions.group_execute, "x", c.group_execute),
|
|
|
|
bit(permissions.other_read, "r", c.other_read),
|
|
|
|
bit(permissions.other_write, "w", c.other_write),
|
|
|
|
bit(permissions.other_execute, "x", c.other_execute),
|
2015-05-16 13:30:01 +00:00
|
|
|
];
|
|
|
|
|
2015-08-26 11:00:31 +00:00
|
|
|
if xattrs {
|
2015-05-16 13:30:01 +00:00
|
|
|
columns.push(c.attribute.paint("@"));
|
|
|
|
}
|
2015-05-12 01:54:34 +00:00
|
|
|
|
|
|
|
Cell {
|
2015-05-16 13:30:01 +00:00
|
|
|
text: ANSIStrings(&columns).to_string(),
|
|
|
|
length: columns.len(),
|
2015-05-12 01:54:34 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2015-05-12 02:33:40 +00:00
|
|
|
fn render_links(&self, links: f::Links) -> Cell {
|
2015-05-12 01:54:34 +00:00
|
|
|
let style = if links.multiple { self.colours.links.multi_link_file }
|
|
|
|
else { self.colours.links.normal };
|
|
|
|
|
2015-05-12 02:07:16 +00:00
|
|
|
Cell::paint(style, &self.numeric.format_int(links.count))
|
2015-05-12 01:54:34 +00:00
|
|
|
}
|
|
|
|
|
2015-05-12 02:33:40 +00:00
|
|
|
fn render_blocks(&self, blocks: f::Blocks) -> Cell {
|
2015-05-12 01:54:34 +00:00
|
|
|
match blocks {
|
2015-05-12 02:33:40 +00:00
|
|
|
f::Blocks::Some(blocks) => Cell::paint(self.colours.blocks, &blocks.to_string()),
|
|
|
|
f::Blocks::None => Cell::paint(self.colours.punctuation, "-"),
|
2015-05-12 01:54:34 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2015-05-12 02:33:40 +00:00
|
|
|
fn render_inode(&self, inode: f::Inode) -> Cell {
|
2015-05-12 01:54:34 +00:00
|
|
|
Cell::paint(self.colours.inode, &inode.0.to_string())
|
|
|
|
}
|
|
|
|
|
2015-05-12 02:33:40 +00:00
|
|
|
fn render_size(&self, size: f::Size, size_format: SizeFormat) -> Cell {
|
|
|
|
if let f::Size::Some(offset) = size {
|
2015-05-12 02:00:18 +00:00
|
|
|
let result = match size_format {
|
2015-05-12 02:14:56 +00:00
|
|
|
SizeFormat::DecimalBytes => decimal_prefix(offset as f64),
|
|
|
|
SizeFormat::BinaryBytes => binary_prefix(offset as f64),
|
|
|
|
SizeFormat::JustBytes => return Cell::paint(self.colours.size.numbers, &self.numeric.format_int(offset)),
|
2015-05-12 01:54:34 +00:00
|
|
|
};
|
|
|
|
|
|
|
|
match result {
|
2015-05-12 02:14:56 +00:00
|
|
|
Standalone(bytes) => Cell::paint(self.colours.size.numbers, &*bytes.to_string()),
|
|
|
|
Prefixed(prefix, n) => {
|
2015-05-12 02:07:16 +00:00
|
|
|
let number = if n < 10f64 { self.numeric.format_float(n, 1) } else { self.numeric.format_int(n as isize) };
|
2015-05-12 01:54:34 +00:00
|
|
|
let symbol = prefix.symbol();
|
|
|
|
|
|
|
|
Cell {
|
|
|
|
text: ANSIStrings( &[ self.colours.size.numbers.paint(&number[..]), self.colours.size.unit.paint(symbol) ]).to_string(),
|
|
|
|
length: number.len() + symbol.len(),
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
Cell::paint(self.colours.punctuation, "-")
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2015-10-01 23:56:09 +00:00
|
|
|
#[allow(trivial_numeric_casts)]
|
2015-05-12 02:33:40 +00:00
|
|
|
fn render_time(&self, timestamp: f::Time) -> Cell {
|
2015-09-28 02:42:52 +00:00
|
|
|
let date = self.tz.at(LocalDateTime::at(timestamp.0 as i64));
|
2015-05-12 01:54:34 +00:00
|
|
|
|
2015-05-12 02:07:16 +00:00
|
|
|
let format = if date.year() == self.current_year {
|
2015-05-12 01:54:34 +00:00
|
|
|
DateFormat::parse("{2>:D} {:M} {2>:h}:{02>:m}").unwrap()
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
DateFormat::parse("{2>:D} {:M} {5>:Y}").unwrap()
|
|
|
|
};
|
|
|
|
|
2015-06-04 14:15:39 +00:00
|
|
|
Cell::paint(self.colours.date, &format.format(&date, &self.time))
|
2015-05-12 01:54:34 +00:00
|
|
|
}
|
|
|
|
|
2015-05-12 02:33:40 +00:00
|
|
|
fn render_git_status(&self, git: f::Git) -> Cell {
|
2015-05-12 01:54:34 +00:00
|
|
|
Cell {
|
2015-05-12 02:36:47 +00:00
|
|
|
text: ANSIStrings(&[ self.render_git_char(git.staged),
|
|
|
|
self.render_git_char(git.unstaged) ]).to_string(),
|
2015-05-12 01:54:34 +00:00
|
|
|
length: 2,
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2015-05-12 02:36:47 +00:00
|
|
|
fn render_git_char(&self, status: f::GitStatus) -> ANSIString {
|
|
|
|
match status {
|
|
|
|
f::GitStatus::NotModified => self.colours.punctuation.paint("-"),
|
|
|
|
f::GitStatus::New => self.colours.git.new.paint("N"),
|
|
|
|
f::GitStatus::Modified => self.colours.git.modified.paint("M"),
|
|
|
|
f::GitStatus::Deleted => self.colours.git.deleted.paint("D"),
|
|
|
|
f::GitStatus::Renamed => self.colours.git.renamed.paint("R"),
|
|
|
|
f::GitStatus::TypeChange => self.colours.git.typechange.paint("T"),
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2015-05-12 02:33:40 +00:00
|
|
|
fn render_user(&mut self, user: f::User) -> Cell {
|
2015-05-12 02:07:16 +00:00
|
|
|
let user_name = match self.users.get_user_by_uid(user.0) {
|
2015-05-12 02:14:56 +00:00
|
|
|
Some(user) => user.name,
|
|
|
|
None => user.0.to_string(),
|
2015-05-12 01:54:34 +00:00
|
|
|
};
|
|
|
|
|
2015-05-12 02:07:16 +00:00
|
|
|
let style = if self.users.get_current_uid() == user.0 { self.colours.users.user_you }
|
2015-05-16 15:10:58 +00:00
|
|
|
else { self.colours.users.user_someone_else };
|
2015-05-12 01:54:34 +00:00
|
|
|
Cell::paint(style, &*user_name)
|
|
|
|
}
|
|
|
|
|
2015-05-12 02:33:40 +00:00
|
|
|
fn render_group(&mut self, group: f::Group) -> Cell {
|
2015-05-12 01:54:34 +00:00
|
|
|
let mut style = self.colours.users.group_not_yours;
|
|
|
|
|
2015-05-12 02:07:16 +00:00
|
|
|
let group_name = match self.users.get_group_by_gid(group.0) {
|
2015-05-12 01:54:34 +00:00
|
|
|
Some(group) => {
|
2015-05-12 02:07:16 +00:00
|
|
|
let current_uid = self.users.get_current_uid();
|
|
|
|
if let Some(current_user) = self.users.get_user_by_uid(current_uid) {
|
2015-05-12 01:54:34 +00:00
|
|
|
if current_user.primary_group == group.gid || group.members.contains(¤t_user.name) {
|
|
|
|
style = self.colours.users.group_yours;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
group.name
|
|
|
|
},
|
|
|
|
None => group.0.to_string(),
|
|
|
|
};
|
|
|
|
|
|
|
|
Cell::paint(style, &*group_name)
|
2015-02-26 07:18:08 +00:00
|
|
|
}
|
|
|
|
|
2015-08-25 10:50:07 +00:00
|
|
|
/// Render the table as a vector of Cells, to be displayed on standard output.
|
2015-08-25 20:08:25 +00:00
|
|
|
pub fn print_table(&self) -> Vec<Cell> {
|
2015-02-05 14:39:56 +00:00
|
|
|
let mut stack = Vec::new();
|
2015-06-28 12:21:21 +00:00
|
|
|
let mut cells = Vec::new();
|
2015-02-05 14:39:56 +00:00
|
|
|
|
2015-02-26 08:27:29 +00:00
|
|
|
// Work out the list of column widths by finding the longest cell for
|
|
|
|
// each column, then formatting each cell in that column to be the
|
|
|
|
// width of that one.
|
2015-03-22 19:46:45 +00:00
|
|
|
let column_widths: Vec<usize> = (0 .. self.columns.len())
|
2015-08-25 10:45:27 +00:00
|
|
|
.map(|n| self.rows.iter().map(|row| row.column_width(n)).max().unwrap_or(0))
|
2015-02-26 07:18:08 +00:00
|
|
|
.collect();
|
|
|
|
|
2015-11-14 23:32:57 +00:00
|
|
|
let total_width: usize = self.columns.len() + column_widths.iter().fold(0, Add::add);
|
2015-08-25 14:04:15 +00:00
|
|
|
|
2015-06-28 12:21:21 +00:00
|
|
|
for row in self.rows.iter() {
|
|
|
|
let mut cell = Cell::empty();
|
|
|
|
|
2015-08-25 10:45:27 +00:00
|
|
|
if let Some(ref cells) = row.cells {
|
|
|
|
for (n, width) in column_widths.iter().enumerate() {
|
|
|
|
match self.columns[n].alignment() {
|
|
|
|
Alignment::Left => { cell.append(&cells[n]); cell.add_spaces(width - cells[n].length); }
|
|
|
|
Alignment::Right => { cell.add_spaces(width - cells[n].length); cell.append(&cells[n]); }
|
|
|
|
}
|
2015-06-28 12:21:21 +00:00
|
|
|
|
2015-08-25 10:45:27 +00:00
|
|
|
cell.add_spaces(1);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
else {
|
2015-08-25 14:04:15 +00:00
|
|
|
cell.add_spaces(total_width)
|
2015-02-05 14:39:56 +00:00
|
|
|
}
|
|
|
|
|
2015-06-28 12:21:21 +00:00
|
|
|
let mut filename = String::new();
|
|
|
|
let mut filename_length = 0;
|
|
|
|
|
2015-02-26 08:27:29 +00:00
|
|
|
// A stack tracks which tree characters should be printed. It's
|
|
|
|
// necessary to maintain information about the previously-printed
|
|
|
|
// lines, as the output will change based on whether the
|
|
|
|
// *previous* entry was the last in its directory.
|
2015-11-04 14:22:51 +00:00
|
|
|
// TODO: Replace this by Vec::resize() when it becomes stable (1.5.0)
|
|
|
|
let stack_len = stack.len();
|
|
|
|
if row.depth + 1 > stack_len {
|
|
|
|
stack.extend(repeat(TreePart::Edge).take(row.depth + 1 - stack_len));
|
|
|
|
} else {
|
|
|
|
stack = stack[..(row.depth + 1)].into();
|
|
|
|
}
|
|
|
|
|
2015-08-25 20:08:25 +00:00
|
|
|
stack[row.depth] = if row.last { TreePart::Corner } else { TreePart::Edge };
|
2015-02-05 14:39:56 +00:00
|
|
|
|
2015-08-25 20:08:25 +00:00
|
|
|
for i in 1 .. row.depth + 1 {
|
|
|
|
filename.push_str(&*self.colours.punctuation.paint(stack[i].ascii_art()).to_string());
|
|
|
|
filename_length += 4;
|
|
|
|
}
|
2015-02-05 14:39:56 +00:00
|
|
|
|
2015-08-25 20:08:25 +00:00
|
|
|
stack[row.depth] = if row.last { TreePart::Blank } else { TreePart::Line };
|
2015-02-05 14:39:56 +00:00
|
|
|
|
2015-08-25 20:08:25 +00:00
|
|
|
// If any tree characters have been printed, then add an extra
|
|
|
|
// space, which makes the output look much better.
|
|
|
|
if row.depth != 0 {
|
|
|
|
filename.push(' ');
|
|
|
|
filename_length += 1;
|
2015-02-05 14:39:56 +00:00
|
|
|
}
|
|
|
|
|
2015-02-26 08:27:29 +00:00
|
|
|
// Print the name without worrying about padding.
|
2015-06-28 12:21:21 +00:00
|
|
|
filename.push_str(&*row.name.text);
|
|
|
|
filename_length += row.name.length;
|
2015-02-24 16:05:25 +00:00
|
|
|
|
2015-06-28 12:21:21 +00:00
|
|
|
cell.append(&Cell { text: filename, length: filename_length });
|
|
|
|
cells.push(cell);
|
2015-02-05 14:39:56 +00:00
|
|
|
}
|
2015-06-28 12:21:21 +00:00
|
|
|
|
|
|
|
cells
|
2015-02-05 14:39:56 +00:00
|
|
|
}
|
2015-02-26 07:18:08 +00:00
|
|
|
}
|
2015-02-05 14:39:56 +00:00
|
|
|
|
2015-06-08 20:33:39 +00:00
|
|
|
|
2015-02-26 07:18:08 +00:00
|
|
|
#[derive(PartialEq, Debug, Clone)]
|
|
|
|
enum TreePart {
|
2015-02-26 08:27:29 +00:00
|
|
|
|
|
|
|
/// Rightmost column, *not* the last in the directory.
|
2015-02-26 07:18:08 +00:00
|
|
|
Edge,
|
2015-02-26 08:27:29 +00:00
|
|
|
|
|
|
|
/// Not the rightmost column, and the directory has not finished yet.
|
|
|
|
Line,
|
|
|
|
|
|
|
|
/// Rightmost column, and the last in the directory.
|
2015-02-26 07:18:08 +00:00
|
|
|
Corner,
|
2015-02-26 08:27:29 +00:00
|
|
|
|
|
|
|
/// Not the rightmost column, and the directory *has* finished.
|
2015-02-26 07:18:08 +00:00
|
|
|
Blank,
|
|
|
|
}
|
2015-02-24 16:05:25 +00:00
|
|
|
|
2015-02-26 07:18:08 +00:00
|
|
|
impl TreePart {
|
|
|
|
fn ascii_art(&self) -> &'static str {
|
|
|
|
match *self {
|
2015-05-12 02:14:56 +00:00
|
|
|
TreePart::Edge => "├──",
|
|
|
|
TreePart::Line => "│ ",
|
|
|
|
TreePart::Corner => "└──",
|
|
|
|
TreePart::Blank => " ",
|
2015-02-05 14:39:56 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
2015-05-16 20:02:28 +00:00
|
|
|
|
|
|
|
|
|
|
|
#[cfg(test)]
|
|
|
|
pub mod test {
|
|
|
|
pub use super::Table;
|
|
|
|
pub use file::File;
|
|
|
|
pub use file::fields as f;
|
2015-11-14 23:32:57 +00:00
|
|
|
pub use output::column::{Cell, Column};
|
2015-05-16 20:02:28 +00:00
|
|
|
|
|
|
|
pub use users::{User, Group, uid_t, gid_t};
|
|
|
|
pub use users::mock::MockUsers;
|
|
|
|
|
2015-05-29 19:39:45 +00:00
|
|
|
pub use ansi_term::Style;
|
2015-05-16 20:02:28 +00:00
|
|
|
pub use ansi_term::Colour::*;
|
|
|
|
|
|
|
|
pub fn newser(uid: uid_t, name: &str, group: gid_t) -> User {
|
|
|
|
User {
|
|
|
|
uid: uid,
|
|
|
|
name: name.to_string(),
|
|
|
|
primary_group: group,
|
|
|
|
home_dir: String::new(),
|
|
|
|
shell: String::new(),
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
// These tests create a new, default Table object, then fill in the
|
|
|
|
// expected style in a certain way. This means we can check that the
|
2015-05-29 19:39:45 +00:00
|
|
|
// right style is being used, as otherwise, it would just be plain.
|
2015-05-16 20:02:28 +00:00
|
|
|
//
|
|
|
|
// Doing things with fields is way easier than having to fake the entire
|
|
|
|
// Metadata struct, which is what I was doing before!
|
|
|
|
|
|
|
|
mod users {
|
2015-09-15 19:05:27 +00:00
|
|
|
#![allow(unused_results)]
|
2015-05-16 20:02:28 +00:00
|
|
|
use super::*;
|
|
|
|
|
|
|
|
#[test]
|
|
|
|
fn named() {
|
|
|
|
let mut table = Table::default();
|
|
|
|
table.colours.users.user_you = Red.bold();
|
|
|
|
|
|
|
|
let mut users = MockUsers::with_current_uid(1000);
|
|
|
|
users.add_user(newser(1000, "enoch", 100));
|
|
|
|
table.users = users;
|
|
|
|
|
|
|
|
let user = f::User(1000);
|
|
|
|
let expected = Cell::paint(Red.bold(), "enoch");
|
|
|
|
assert_eq!(expected, table.render_user(user))
|
|
|
|
}
|
|
|
|
|
|
|
|
#[test]
|
|
|
|
fn unnamed() {
|
|
|
|
let mut table = Table::default();
|
|
|
|
table.colours.users.user_you = Cyan.bold();
|
|
|
|
|
|
|
|
let users = MockUsers::with_current_uid(1000);
|
|
|
|
table.users = users;
|
|
|
|
|
|
|
|
let user = f::User(1000);
|
|
|
|
let expected = Cell::paint(Cyan.bold(), "1000");
|
|
|
|
assert_eq!(expected, table.render_user(user));
|
|
|
|
}
|
|
|
|
|
|
|
|
#[test]
|
|
|
|
fn different_named() {
|
|
|
|
let mut table = Table::default();
|
|
|
|
table.colours.users.user_someone_else = Green.bold();
|
|
|
|
table.users.add_user(newser(1000, "enoch", 100));
|
|
|
|
|
|
|
|
let user = f::User(1000);
|
|
|
|
let expected = Cell::paint(Green.bold(), "enoch");
|
|
|
|
assert_eq!(expected, table.render_user(user));
|
|
|
|
}
|
|
|
|
|
|
|
|
#[test]
|
|
|
|
fn different_unnamed() {
|
|
|
|
let mut table = Table::default();
|
|
|
|
table.colours.users.user_someone_else = Red.normal();
|
|
|
|
|
|
|
|
let user = f::User(1000);
|
|
|
|
let expected = Cell::paint(Red.normal(), "1000");
|
|
|
|
assert_eq!(expected, table.render_user(user));
|
|
|
|
}
|
|
|
|
|
|
|
|
#[test]
|
|
|
|
fn overflow() {
|
|
|
|
let mut table = Table::default();
|
|
|
|
table.colours.users.user_someone_else = Blue.underline();
|
|
|
|
|
|
|
|
let user = f::User(2_147_483_648);
|
|
|
|
let expected = Cell::paint(Blue.underline(), "2147483648");
|
|
|
|
assert_eq!(expected, table.render_user(user));
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
mod groups {
|
2015-09-15 19:05:27 +00:00
|
|
|
#![allow(unused_results)]
|
2015-05-16 20:02:28 +00:00
|
|
|
use super::*;
|
|
|
|
|
|
|
|
#[test]
|
|
|
|
fn named() {
|
|
|
|
let mut table = Table::default();
|
|
|
|
table.colours.users.group_not_yours = Fixed(101).normal();
|
|
|
|
|
|
|
|
let mut users = MockUsers::with_current_uid(1000);
|
|
|
|
users.add_group(Group { gid: 100, name: "folk".to_string(), members: vec![] });
|
|
|
|
table.users = users;
|
|
|
|
|
|
|
|
let group = f::Group(100);
|
|
|
|
let expected = Cell::paint(Fixed(101).normal(), "folk");
|
|
|
|
assert_eq!(expected, table.render_group(group))
|
|
|
|
}
|
|
|
|
|
|
|
|
#[test]
|
|
|
|
fn unnamed() {
|
|
|
|
let mut table = Table::default();
|
|
|
|
table.colours.users.group_not_yours = Fixed(87).normal();
|
|
|
|
|
|
|
|
let users = MockUsers::with_current_uid(1000);
|
|
|
|
table.users = users;
|
|
|
|
|
|
|
|
let group = f::Group(100);
|
|
|
|
let expected = Cell::paint(Fixed(87).normal(), "100");
|
|
|
|
assert_eq!(expected, table.render_group(group));
|
|
|
|
}
|
|
|
|
|
|
|
|
#[test]
|
|
|
|
fn primary() {
|
|
|
|
let mut table = Table::default();
|
|
|
|
table.colours.users.group_yours = Fixed(64).normal();
|
|
|
|
|
|
|
|
let mut users = MockUsers::with_current_uid(2);
|
|
|
|
users.add_user(newser(2, "eve", 100));
|
|
|
|
users.add_group(Group { gid: 100, name: "folk".to_string(), members: vec![] });
|
|
|
|
table.users = users;
|
|
|
|
|
|
|
|
let group = f::Group(100);
|
|
|
|
let expected = Cell::paint(Fixed(64).normal(), "folk");
|
|
|
|
assert_eq!(expected, table.render_group(group))
|
|
|
|
}
|
|
|
|
|
|
|
|
#[test]
|
|
|
|
fn secondary() {
|
|
|
|
let mut table = Table::default();
|
|
|
|
table.colours.users.group_yours = Fixed(31).normal();
|
|
|
|
|
|
|
|
let mut users = MockUsers::with_current_uid(2);
|
|
|
|
users.add_user(newser(2, "eve", 666));
|
|
|
|
users.add_group(Group { gid: 100, name: "folk".to_string(), members: vec![ "eve".to_string() ] });
|
|
|
|
table.users = users;
|
|
|
|
|
|
|
|
let group = f::Group(100);
|
|
|
|
let expected = Cell::paint(Fixed(31).normal(), "folk");
|
|
|
|
assert_eq!(expected, table.render_group(group))
|
|
|
|
}
|
|
|
|
|
|
|
|
#[test]
|
|
|
|
fn overflow() {
|
|
|
|
let mut table = Table::default();
|
|
|
|
table.colours.users.group_not_yours = Blue.underline();
|
|
|
|
|
|
|
|
let group = f::Group(2_147_483_648);
|
|
|
|
let expected = Cell::paint(Blue.underline(), "2147483648");
|
|
|
|
assert_eq!(expected, table.render_group(group));
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|