Llewellyn/exa
1
0
Fork 0
mirror of https://github.com/Llewellynvdm/exa.git synced 2024-11-13 07:56:29 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'colours'

Browse Source
This commit is contained in:
Ben S 2015-05-10 18:03:24 +01:00
commit bc844a3843
12 changed files with 457 additions and 291 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
Cargo.lock generated
View File

@ -2,14 +2,14 @@
name = "exa" name = "exa"
version = "0.2.0" version = "0.2.0"
dependencies = [ dependencies = [
"ansi_term 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)", "ansi_term 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)",
"bitflags 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", "bitflags 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
"datetime 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)", "datetime 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)",
"getopts 0.2.10 (registry+https://github.com/rust-lang/crates.io-index)", "getopts 0.2.10 (registry+https://github.com/rust-lang/crates.io-index)",
"git2 0.2.9 (git+https://github.com/alexcrichton/git2-rs.git)", "git2 0.2.9 (git+https://github.com/alexcrichton/git2-rs.git)",
"locale 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)", "locale 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)",
"natord 1.0.8 (registry+https://github.com/rust-lang/crates.io-index)", "natord 1.0.8 (registry+https://github.com/rust-lang/crates.io-index)",
"num_cpus 0.2.4 (registry+https://github.com/rust-lang/crates.io-index)", "num_cpus 0.2.5 (registry+https://github.com/rust-lang/crates.io-index)",
"number_prefix 0.2.4 (registry+https://github.com/rust-lang/crates.io-index)", "number_prefix 0.2.4 (registry+https://github.com/rust-lang/crates.io-index)",
"pad 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", "pad 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)",
"unicode-width 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", "unicode-width 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
@ -18,7 +18,7 @@ dependencies = [
[[package]] [[package]]
name = "ansi_term" name = "ansi_term"
version = "0.5.1" version = "0.5.2"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
[[package]] [[package]]
@ -57,14 +57,14 @@ version = "0.2.9"
source = "git+https://github.com/alexcrichton/git2-rs.git#3a5f0b5698c5203fa48e33094158990a2c53c979" source = "git+https://github.com/alexcrichton/git2-rs.git#3a5f0b5698c5203fa48e33094158990a2c53c979"
dependencies = [ dependencies = [
"bitflags 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", "bitflags 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
"libc 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", "libc 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)",
"libgit2-sys 0.2.12 (git+https://github.com/alexcrichton/git2-rs.git)", "libgit2-sys 0.2.12 (git+https://github.com/alexcrichton/git2-rs.git)",
"url 0.2.33 (registry+https://github.com/rust-lang/crates.io-index)", "url 0.2.33 (registry+https://github.com/rust-lang/crates.io-index)",
] ]
[[package]] [[package]]
name = "libc" name = "libc"
version = "0.1.6" version = "0.1.7"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
[[package]] [[package]]
@ -72,7 +72,7 @@ name = "libgit2-sys"
version = "0.2.12" version = "0.2.12"
source = "git+https://github.com/alexcrichton/git2-rs.git#3a5f0b5698c5203fa48e33094158990a2c53c979" source = "git+https://github.com/alexcrichton/git2-rs.git#3a5f0b5698c5203fa48e33094158990a2c53c979"
dependencies = [ dependencies = [
"libc 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", "libc 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)",
"libssh2-sys 0.1.22 (registry+https://github.com/rust-lang/crates.io-index)", "libssh2-sys 0.1.22 (registry+https://github.com/rust-lang/crates.io-index)",
"libz-sys 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)", "libz-sys 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
"openssl-sys 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)", "openssl-sys 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)",
@ -92,7 +92,7 @@ name = "libssh2-sys"
version = "0.1.22" version = "0.1.22"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [ dependencies = [
"libc 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", "libc 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)",
"libz-sys 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)", "libz-sys 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
"openssl-sys 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)", "openssl-sys 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)",
"pkg-config 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)", "pkg-config 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)",
@ -103,7 +103,7 @@ name = "libz-sys"
version = "0.1.3" version = "0.1.3"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [ dependencies = [
"libc 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", "libc 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)",
"pkg-config 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)", "pkg-config 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)",
] ]
@ -112,7 +112,7 @@ name = "locale"
version = "0.1.8" version = "0.1.8"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [ dependencies = [
"libc 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", "libc 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)",
"num 0.1.24 (registry+https://github.com/rust-lang/crates.io-index)", "num 0.1.24 (registry+https://github.com/rust-lang/crates.io-index)",
] ]
@ -121,7 +121,7 @@ name = "log"
version = "0.3.1" version = "0.3.1"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [ dependencies = [
"libc 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", "libc 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)",
] ]
[[package]] [[package]]
@ -145,10 +145,10 @@ dependencies = [
[[package]] [[package]]
name = "num_cpus" name = "num_cpus"
version = "0.2.4" version = "0.2.5"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [ dependencies = [
"libc 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", "libc 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)",
] ]
[[package]] [[package]]
@ -165,7 +165,7 @@ version = "0.6.2"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [ dependencies = [
"gcc 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)", "gcc 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)",
"libc 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", "libc 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)",
"libressl-pnacl-sys 2.1.5 (registry+https://github.com/rust-lang/crates.io-index)", "libressl-pnacl-sys 2.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
"pkg-config 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)", "pkg-config 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)",
] ]
@ -196,7 +196,7 @@ name = "rand"
version = "0.3.8" version = "0.3.8"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [ dependencies = [
"libc 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", "libc 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)",
] ]
[[package]] [[package]]
@ -244,6 +244,6 @@ name = "users"
version = "0.4.1" version = "0.4.1"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [ dependencies = [
"libc 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", "libc 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)",
] ]

168
src/colours.rs Normal file
View File

@ -0,0 +1,168 @@
use ansi_term::Style;
use ansi_term::Style::Plain;
use ansi_term::Colour::{Red, Green, Yellow, Blue, Cyan, Purple, Fixed};
use std::default::Default;
#[derive(Clone, Copy, Debug, Default, PartialEq)]
pub struct Colours {
pub filetypes: FileTypes,
pub perms: Permissions,
pub size: Size,
pub users: Users,
pub links: Links,
pub git: Git,
pub punctuation: Style,
pub date: Style,
pub inode: Style,
pub blocks: Style,
pub header: Style,
pub symlink_path: Style,
pub broken_arrow: Style,
pub broken_filename: Style,
}
#[derive(Clone, Copy, Debug, Default, PartialEq)]
pub struct FileTypes {
pub normal: Style,
pub directory: Style,
pub symlink: Style,
pub special: Style,
pub executable: Style,
pub image: Style,
pub video: Style,
pub music: Style,
pub lossless: Style,
pub crypto: Style,
pub document: Style,
pub compressed: Style,
pub temp: Style,
pub immediate: Style,
pub compiled: Style,
}
#[derive(Clone, Copy, Debug, Default, PartialEq)]
pub struct Permissions {
pub user_read: Style,
pub user_write: Style,
pub user_execute_file: Style,
pub user_execute_other: Style,
pub group_read: Style,
pub group_write: Style,
pub group_execute: Style,
pub other_read: Style,
pub other_write: Style,
pub other_execute: Style,
pub attribute: Style,
}
#[derive(Clone, Copy, Debug, Default, PartialEq)]
pub struct Size {
pub numbers: Style,
pub unit: Style,
}
#[derive(Clone, Copy, Debug, Default, PartialEq)]
pub struct Users {
pub user_you: Style,
pub user_someone_else: Style,
pub group_yours: Style,
pub group_not_yours: Style,
}
#[derive(Clone, Copy, Debug, Default, PartialEq)]
pub struct Links {
pub normal: Style,
pub multi_link_file: Style,
}
#[derive(Clone, Copy, Debug, Default, PartialEq)]
pub struct Git {
pub new: Style,
pub modified: Style,
pub deleted: Style,
pub renamed: Style,
pub typechange: Style,
}
impl Colours {
pub fn plain() -> Colours {
Colours::default()
}
pub fn colourful() -> Colours {
Colours {
filetypes: FileTypes {
normal: Plain,
directory: Blue.bold(),
symlink: Cyan.normal(),
special: Yellow.normal(),
executable: Green.bold(),
image: Fixed(133).normal(),
video: Fixed(135).normal(),
music: Fixed(92).normal(),
lossless: Fixed(93).normal(),
crypto: Fixed(109).normal(),
document: Fixed(105).normal(),
compressed: Red.normal(),
temp: Fixed(244).normal(),
immediate: Yellow.bold().underline(),
compiled: Fixed(137).normal(),
},
perms: Permissions {
user_read: Yellow.bold(),
user_write: Red.bold(),
user_execute_file: Green.bold().underline(),
user_execute_other: Green.bold(),
group_read: Yellow.normal(),
group_write: Red.normal(),
group_execute: Green.normal(),
other_read: Yellow.normal(),
other_write: Red.normal(),
other_execute: Green.normal(),
attribute: Plain,
},
size: Size {
numbers: Green.bold(),
unit: Green.normal(),
},
users: Users {
user_you: Yellow.bold(),
user_someone_else: Plain,
group_yours: Yellow.bold(),
group_not_yours: Plain,
},
links: Links {
normal: Red.bold(),
multi_link_file: Red.on(Yellow),
},
git: Git {
new: Green.normal(),
modified: Blue.normal(),
deleted: Red.normal(),
renamed: Yellow.normal(),
typechange: Purple.normal(),
},
punctuation: Fixed(244).normal(),
date: Blue.normal(),
inode: Purple.normal(),
blocks: Cyan.normal(),
header: Plain.underline(),
symlink_path: Cyan.normal(),
broken_arrow: Red.normal(),
broken_filename: Red.underline()
}
}
}

11
src/dir.rs
View File

@ -1,5 +1,6 @@
use colours::Colours;
use feature::Git; use feature::Git;
use file::{File, GREY}; use file::File;
use std::io; use std::io;
use std::fs; use std::fs;
@ -64,11 +65,11 @@ impl Dir {
} }
/// Get a string describing the Git status of the given file. /// Get a string describing the Git status of the given file.
pub fn git_status(&self, path: &Path, prefix_lookup: bool) -> String { pub fn git_status(&self, path: &Path, colours: &Colours, prefix_lookup: bool) -> String {
match (&self.git, prefix_lookup) { match (&self.git, prefix_lookup) {
(&Some(ref git), false) => git.status(path), (&Some(ref git), false) => git.status(colours, path),
(&Some(ref git), true) => git.dir_status(path), (&Some(ref git), true) => git.dir_status(colours, path),
(&None, _) => GREY.paint("--").to_string(), (&None, _) => colours.punctuation.paint("--").to_string(),
} }
} }
} }

41
src/feature/git.rs
View File

@ -1,10 +1,9 @@
use std::path::{Path, PathBuf}; use std::path::{Path, PathBuf};
use ansi_term::{ANSIString, ANSIStrings}; use ansi_term::{ANSIString, ANSIStrings};
use ansi_term::Colour::*;
use git2; use git2;
use file::GREY; use colours::Colours;
/// Container of Git statuses for all the files in this folder's Git repository. /// Container of Git statuses for all the files in this folder's Git repository.
pub struct Git { pub struct Git {
@ -30,48 +29,48 @@ impl Git {
} }
/// Get the status for the file at the given path, if present. /// Get the status for the file at the given path, if present.
pub fn status(&self, path: &Path) -> String { pub fn status(&self, c: &Colours, path: &Path) -> String {
let status = self.statuses.iter() let status = self.statuses.iter()
.find(|p| p.0.as_path() == path); .find(|p| p.0.as_path() == path);
match status { match status {
Some(&(_, s)) => ANSIStrings( &[Git::index_status(s), Git::working_tree_status(s) ]).to_string(), Some(&(_, s)) => ANSIStrings( &[Git::index_status(c, s), Git::working_tree_status(c, s) ]).to_string(),
None => GREY.paint("--").to_string(), None => c.punctuation.paint("--").to_string(),
} }
} }
/// Get the combined status for all the files whose paths begin with the /// Get the combined status for all the files whose paths begin with the
/// path that gets passed in. This is used for getting the status of /// path that gets passed in. This is used for getting the status of
/// directories, which don't really have an 'official' status. /// directories, which don't really have an 'official' status.
pub fn dir_status(&self, dir: &Path) -> String { pub fn dir_status(&self, c: &Colours, dir: &Path) -> String {
let s = self.statuses.iter() let s = self.statuses.iter()
.filter(|p| p.0.starts_with(dir)) .filter(|p| p.0.starts_with(dir))
.fold(git2::Status::empty(), |a, b| a | b.1); .fold(git2::Status::empty(), |a, b| a | b.1);
ANSIStrings( &[Git::index_status(s), Git::working_tree_status(s)] ).to_string() ANSIStrings( &[Git::index_status(c, s), Git::working_tree_status(c, s)] ).to_string()
} }
/// The character to display if the file has been modified, but not staged. /// The character to display if the file has been modified, but not staged.
fn working_tree_status(status: git2::Status) -> ANSIString<'static> { fn working_tree_status(colours: &Colours, status: git2::Status) -> ANSIString<'static> {
match status { match status {
s if s.contains(git2::STATUS_WT_NEW) => Green.paint("A"), s if s.contains(git2::STATUS_WT_NEW) => colours.git.new.paint("A"),
s if s.contains(git2::STATUS_WT_MODIFIED) => Blue.paint("M"), s if s.contains(git2::STATUS_WT_MODIFIED) => colours.git.modified.paint("M"),
s if s.contains(git2::STATUS_WT_DELETED) => Red.paint("D"), s if s.contains(git2::STATUS_WT_DELETED) => colours.git.deleted.paint("D"),
s if s.contains(git2::STATUS_WT_RENAMED) => Yellow.paint("R"), s if s.contains(git2::STATUS_WT_RENAMED) => colours.git.renamed.paint("R"),
s if s.contains(git2::STATUS_WT_TYPECHANGE) => Purple.paint("T"), s if s.contains(git2::STATUS_WT_TYPECHANGE) => colours.git.typechange.paint("T"),
_ => GREY.paint("-"), _ => colours.punctuation.paint("-"),
} }
} }
/// The character to display if the file has been modified, and the change /// The character to display if the file has been modified, and the change
/// has been staged. /// has been staged.
fn index_status(status: git2::Status) -> ANSIString<'static> { fn index_status(colours: &Colours, status: git2::Status) -> ANSIString<'static> {
match status { match status {
s if s.contains(git2::STATUS_INDEX_NEW) => Green.paint("A"), s if s.contains(git2::STATUS_INDEX_NEW) => colours.git.new.paint("A"),
s if s.contains(git2::STATUS_INDEX_MODIFIED) => Blue.paint("M"), s if s.contains(git2::STATUS_INDEX_MODIFIED) => colours.git.modified.paint("M"),
s if s.contains(git2::STATUS_INDEX_DELETED) => Red.paint("D"), s if s.contains(git2::STATUS_INDEX_DELETED) => colours.git.deleted.paint("D"),
s if s.contains(git2::STATUS_INDEX_RENAMED) => Yellow.paint("R"), s if s.contains(git2::STATUS_INDEX_RENAMED) => colours.git.renamed.paint("R"),
s if s.contains(git2::STATUS_INDEX_TYPECHANGE) => Purple.paint("T"), s if s.contains(git2::STATUS_INDEX_TYPECHANGE) => colours.git.typechange.paint("T"),
_ => GREY.paint("-"), _ => colours.punctuation.paint("-"),
} }
} }
} }

167
src/file.rs
View File

@ -7,9 +7,9 @@ use std::os::unix::raw::mode_t;
use std::os::unix::fs::{MetadataExt, PermissionsExt}; use std::os::unix::fs::{MetadataExt, PermissionsExt};
use std::path::{Component, Path, PathBuf}; use std::path::{Component, Path, PathBuf};
use ansi_term::{ANSIString, ANSIStrings, Colour, Style}; use ansi_term::{ANSIString, ANSIStrings, Style};
use ansi_term::Style::Plain; use ansi_term::Style::Plain;
use ansi_term::Colour::{Red, Green, Yellow, Blue, Purple, Cyan, Fixed}; use ansi_term::Colour::Fixed;
use users::Users; use users::Users;
@ -22,18 +22,15 @@ use number_prefix::{binary_prefix, decimal_prefix, Prefixed, Standalone, PrefixN
use datetime::local::{LocalDateTime, DatePiece}; use datetime::local::{LocalDateTime, DatePiece};
use datetime::format::{DateFormat}; use datetime::format::{DateFormat};
use colours::Colours;
use column::{Column, Cell}; use column::{Column, Cell};
use column::Column::*; use column::Column::*;
use dir::Dir; use dir::Dir;
use filetype::HasType; use filetype::file_colour;
use options::{SizeFormat, TimeType}; use options::{SizeFormat, TimeType};
use output::details::UserLocale; use output::details::UserLocale;
use feature::Attribute; use feature::Attribute;
/// This grey value is directly in between white and black, so it's guaranteed
/// to show up on either backgrounded terminal.
pub static GREY: Colour = Fixed(244);
/// A **File** is a wrapper around one of Rust's Path objects, along with /// A **File** is a wrapper around one of Rust's Path objects, along with
/// associated data about the file. /// associated data about the file.
/// ///
@ -112,24 +109,18 @@ impl<'a> File<'a> {
self.name.starts_with(".") self.name.starts_with(".")
} }
/// Whether this file is a temporary file or not.
pub fn is_tmpfile(&self) -> bool {
let name = &self.name;
name.ends_with("~") || (name.starts_with("#") && name.ends_with("#"))
}
/// Get the data for a column, formatted as a coloured string. /// Get the data for a column, formatted as a coloured string.
pub fn display<U: Users>(&self, column: &Column, users_cache: &mut U, locale: &UserLocale) -> Cell { pub fn display<U: Users>(&self, column: &Column, colours: &Colours, users_cache: &mut U, locale: &UserLocale) -> Cell {
match *column { match *column {
Permissions => self.permissions_string(), Permissions => self.permissions_string(colours),
FileSize(f) => self.file_size(f, &locale.numeric), FileSize(f) => self.file_size(colours, f, &locale.numeric),
Timestamp(t, y) => self.timestamp(t, y, &locale.time), Timestamp(t, y) => self.timestamp(colours, t, y, &locale.time),
HardLinks => self.hard_links(&locale.numeric), HardLinks => self.hard_links(colours, &locale.numeric),
Inode => self.inode(), Inode => self.inode(colours),
Blocks => self.blocks(&locale.numeric), Blocks => self.blocks(colours, &locale.numeric),
User => self.user(users_cache), User => self.user(colours, users_cache),
Group => self.group(users_cache), Group => self.group(colours, users_cache),
GitStatus => self.git_status(), GitStatus => self.git_status(colours),
} }
} }
@ -138,12 +129,12 @@ impl<'a> File<'a> {
/// ///
/// It consists of the file name coloured in the appropriate style, /// It consists of the file name coloured in the appropriate style,
/// with special formatting for a symlink. /// with special formatting for a symlink.
pub fn file_name_view(&self) -> String { pub fn file_name_view(&self, colours: &Colours) -> String {
if self.is_link() { if self.is_link() {
self.symlink_file_name_view() self.symlink_file_name_view(colours)
} }
else { else {
self.file_colour().paint(&*self.name).to_string() file_colour(colours, self).paint(&*self.name).to_string()
} }
} }
@ -155,9 +146,9 @@ impl<'a> File<'a> {
/// an error, highlight the target and arrow in red. The error would /// an error, highlight the target and arrow in red. The error would
/// be shown out of context, and it's almost always because the /// be shown out of context, and it's almost always because the
/// target doesn't exist. /// target doesn't exist.
fn symlink_file_name_view(&self) -> String { fn symlink_file_name_view(&self, colours: &Colours) -> String {
let name = &*self.name; let name = &*self.name;
let style = self.file_colour(); let style = file_colour(colours, self);
if let Ok(path) = fs::read_link(&self.path) { if let Ok(path) = fs::read_link(&self.path) {
let target_path = match self.dir { let target_path = match self.dir {
@ -190,14 +181,14 @@ impl<'a> File<'a> {
format!("{} {} {}", format!("{} {} {}",
style.paint(name), style.paint(name),
GREY.paint("=>"), colours.punctuation.paint("=>"),
ANSIStrings(&[ Cyan.paint(&path_prefix), ANSIStrings(&[ colours.symlink_path.paint(&path_prefix),
file.file_colour().paint(&file.name) ])) file_colour(colours, &file).paint(&file.name) ]))
}, },
Err(filename) => format!("{} {} {}", Err(filename) => format!("{} {} {}",
style.paint(name), style.paint(name),
Red.paint("=>"), colours.broken_arrow.paint("=>"),
Red.underline().paint(&filename)), colours.broken_filename.paint(&filename)),
} }
} }
else { else {
@ -205,11 +196,6 @@ impl<'a> File<'a> {
} }
} }
/// The `ansi_term::Style` that this file's name should be painted.
pub fn file_colour(&self) -> Style {
self.get_type().style()
}
/// The Unicode 'display width' of the filename. /// The Unicode 'display width' of the filename.
/// ///
/// This is related to the number of graphemes in the string: most /// This is related to the number of graphemes in the string: most
@ -246,8 +232,10 @@ impl<'a> File<'a> {
} }
/// This file's number of hard links as a coloured string. /// This file's number of hard links as a coloured string.
fn hard_links(&self, locale: &locale::Numeric) -> Cell { fn hard_links(&self, colours: &Colours, locale: &locale::Numeric) -> Cell {
let style = if self.has_multiple_links() { Red.on(Yellow) } else { Red.normal() }; let style = if self.has_multiple_links() { colours.links.multi_link_file }
else { colours.links.normal };
Cell::paint(style, &locale.format_int(self.stat.as_raw().nlink())[..]) Cell::paint(style, &locale.format_int(self.stat.as_raw().nlink())[..])
} }
@ -261,18 +249,18 @@ impl<'a> File<'a> {
} }
/// This file's inode as a coloured string. /// This file's inode as a coloured string.
fn inode(&self) -> Cell { fn inode(&self, colours: &Colours) -> Cell {
let inode = self.stat.as_raw().ino(); let inode = self.stat.as_raw().ino();
Cell::paint(Purple.normal(), &inode.to_string()[..]) Cell::paint(colours.inode, &inode.to_string()[..])
} }
/// This file's number of filesystem blocks (if available) as a coloured string. /// This file's number of filesystem blocks (if available) as a coloured string.
fn blocks(&self, locale: &locale::Numeric) -> Cell { fn blocks(&self, colours: &Colours, locale: &locale::Numeric) -> Cell {
if self.is_file() || self.is_link() { if self.is_file() || self.is_link() {
Cell::paint(Cyan.normal(), &locale.format_int(self.stat.as_raw().blocks())[..]) Cell::paint(colours.blocks, &locale.format_int(self.stat.as_raw().blocks())[..])
} }
else { else {
Cell { text: GREY.paint("-").to_string(), length: 1 } Cell { text: colours.punctuation.paint("-").to_string(), length: 1 }
} }
} }
@ -281,7 +269,7 @@ impl<'a> File<'a> {
/// If the user is not present, then it formats the uid as a number /// If the user is not present, then it formats the uid as a number
/// instead. This usually happens when a user is deleted, but still owns /// instead. This usually happens when a user is deleted, but still owns
/// files. /// files.
fn user<U: Users>(&self, users_cache: &mut U) -> Cell { fn user<U: Users>(&self, colours: &Colours, users_cache: &mut U) -> Cell {
let uid = self.stat.as_raw().uid(); let uid = self.stat.as_raw().uid();
let user_name = match users_cache.get_user_by_uid(uid) { let user_name = match users_cache.get_user_by_uid(uid) {
@ -289,23 +277,23 @@ impl<'a> File<'a> {
None => uid.to_string(), None => uid.to_string(),
}; };
let style = if users_cache.get_current_uid() == uid { Yellow.bold() } else { Plain }; let style = if users_cache.get_current_uid() == uid { colours.users.user_you } else { colours.users.user_someone_else };
Cell::paint(style, &*user_name) Cell::paint(style, &*user_name)
} }
/// This file's group name as a coloured string. /// This file's group name as a coloured string.
/// ///
/// As above, if not present, it formats the gid as a number instead. /// As above, if not present, it formats the gid as a number instead.
fn group<U: Users>(&self, users_cache: &mut U) -> Cell { fn group<U: Users>(&self, colours: &Colours, users_cache: &mut U) -> Cell {
let gid = self.stat.as_raw().gid(); let gid = self.stat.as_raw().gid();
let mut style = Plain; let mut style = colours.users.group_not_yours;
let group_name = match users_cache.get_group_by_gid(gid as u32) { let group_name = match users_cache.get_group_by_gid(gid as u32) {
Some(group) => { Some(group) => {
let current_uid = users_cache.get_current_uid(); let current_uid = users_cache.get_current_uid();
if let Some(current_user) = users_cache.get_user_by_uid(current_uid) { if let Some(current_user) = users_cache.get_user_by_uid(current_uid) {
if current_user.primary_group == group.gid || group.members.contains(&current_user.name) { if current_user.primary_group == group.gid || group.members.contains(&current_user.name) {
style = Yellow.bold(); style = colours.users.group_yours;
} }
} }
group.name group.name
@ -322,25 +310,25 @@ impl<'a> File<'a> {
/// some filesystems, I've never looked at one of those numbers and gained /// some filesystems, I've never looked at one of those numbers and gained
/// any information from it, so by emitting "-" instead, the table is less /// any information from it, so by emitting "-" instead, the table is less
/// cluttered with numbers. /// cluttered with numbers.
fn file_size(&self, size_format: SizeFormat, locale: &locale::Numeric) -> Cell { fn file_size(&self, colours: &Colours, size_format: SizeFormat, locale: &locale::Numeric) -> Cell {
if self.is_directory() { if self.is_directory() {
Cell { text: GREY.paint("-").to_string(), length: 1 } Cell { text: colours.punctuation.paint("-").to_string(), length: 1 }
} }
else { else {
let result = match size_format { let result = match size_format {
SizeFormat::DecimalBytes => decimal_prefix(self.stat.len() as f64), SizeFormat::DecimalBytes => decimal_prefix(self.stat.len() as f64),
SizeFormat::BinaryBytes => binary_prefix(self.stat.len() as f64), SizeFormat::BinaryBytes => binary_prefix(self.stat.len() as f64),
SizeFormat::JustBytes => return Cell::paint(Green.bold(), &locale.format_int(self.stat.len())[..]), SizeFormat::JustBytes => return Cell::paint(colours.size.numbers, &locale.format_int(self.stat.len())[..]),
}; };
match result { match result {
Standalone(bytes) => Cell::paint(Green.bold(), &*bytes.to_string()), Standalone(bytes) => Cell::paint(colours.size.numbers, &*bytes.to_string()),
Prefixed(prefix, n) => { Prefixed(prefix, n) => {
let number = if n < 10f64 { locale.format_float(n, 1) } else { locale.format_int(n as isize) }; let number = if n < 10f64 { locale.format_float(n, 1) } else { locale.format_int(n as isize) };
let symbol = prefix.symbol(); let symbol = prefix.symbol();
Cell { Cell {
text: ANSIStrings( &[ Green.bold().paint(&number[..]), Green.paint(symbol) ]).to_string(), text: ANSIStrings( &[ colours.size.unit.paint(&number[..]), colours.size.unit.paint(symbol) ]).to_string(),
length: number.len() + symbol.len(), length: number.len() + symbol.len(),
} }
} }
@ -348,7 +336,7 @@ impl<'a> File<'a> {
} }
} }
fn timestamp(&self, time_type: TimeType, current_year: i64, locale: &locale::Time) -> Cell { fn timestamp(&self, colours: &Colours, time_type: TimeType, current_year: i64, locale: &locale::Time) -> Cell {
let time_in_seconds = match time_type { let time_in_seconds = match time_type {
TimeType::FileAccessed => self.stat.as_raw().atime(), TimeType::FileAccessed => self.stat.as_raw().atime(),
@ -365,38 +353,38 @@ impl<'a> File<'a> {
DateFormat::parse("{2>:D} {:M} {5>:Y}").unwrap() DateFormat::parse("{2>:D} {:M} {5>:Y}").unwrap()
}; };
Cell::paint(Blue.normal(), &format.format(date, locale)) Cell::paint(colours.date, &format.format(date, locale))
} }
/// This file's type, represented by a coloured character. /// This file's type, represented by a coloured character.
/// ///
/// Although the file type can usually be guessed from the colour of the /// Although the file type can usually be guessed from the colour of the
/// file, `ls` puts this character there, so people will expect it. /// file, `ls` puts this character there, so people will expect it.
fn type_char(&self) -> ANSIString { fn type_char(&self, colours: &Colours) -> ANSIString {
if self.is_file() { if self.is_file() {
Plain.paint(".") colours.filetypes.normal.paint(".")
} }
else if self.is_directory() { else if self.is_directory() {
Blue.paint("d") colours.filetypes.directory.paint("d")
} }
else if self.is_pipe() { else if self.is_pipe() {
Yellow.paint("|") colours.filetypes.special.paint("|")
} }
else if self.is_link() { else if self.is_link() {
Cyan.paint("l") colours.filetypes.symlink.paint("l")
} }
else { else {
Purple.paint("?") colours.filetypes.special.paint("?")
} }
} }
/// Marker indicating that the file contains extended attributes /// Marker indicating that the file contains extended attributes
/// ///
/// Returns "@" or " ” depending on wheter the file contains an extented /// Returns "@" or " " depending on wheter the file contains an extented
/// attribute or not. Also returns “ ” in case the attributes cannot be read /// attribute or not. Also returns " " in case the attributes cannot be read
/// for some reason. /// for some reason.
fn attribute_marker(&self) -> ANSIString { fn attribute_marker(&self, colours: &Colours) -> ANSIString {
if self.xattrs.len() > 0 { Plain.paint("@") } else { Plain.paint(" ") } if self.xattrs.len() > 0 { colours.perms.attribute.paint("@") } else { Plain.paint(" ") }
} }
/// Generate the "rwxrwxrwx" permissions string, like how ls does it. /// Generate the "rwxrwxrwx" permissions string, like how ls does it.
@ -404,24 +392,24 @@ impl<'a> File<'a> {
/// Each character is given its own colour. The first three permission /// Each character is given its own colour. The first three permission
/// bits are bold because they're the ones used most often, and executable /// bits are bold because they're the ones used most often, and executable
/// files are underlined to make them stand out more. /// files are underlined to make them stand out more.
fn permissions_string(&self) -> Cell { fn permissions_string(&self, colours: &Colours) -> Cell {
let bits = self.stat.permissions().mode(); let bits = self.stat.permissions().mode();
let executable_colour = if self.is_file() { Green.bold().underline() } let executable_colour = if self.is_file() { colours.perms.user_execute_file }
else { Green.bold() }; else { colours.perms.user_execute_other };
let string = ANSIStrings(&[ let string = ANSIStrings(&[
self.type_char(), self.type_char(colours),
File::permission_bit(bits, unix::fs::USER_READ, "r", Yellow.bold()), File::permission_bit(bits, unix::fs::USER_READ, "r", colours.perms.user_read),
File::permission_bit(bits, unix::fs::USER_WRITE, "w", Red.bold()), File::permission_bit(bits, unix::fs::USER_WRITE, "w", colours.perms.user_write),
File::permission_bit(bits, unix::fs::USER_EXECUTE, "x", executable_colour), File::permission_bit(bits, unix::fs::USER_EXECUTE, "x", executable_colour),
File::permission_bit(bits, unix::fs::GROUP_READ, "r", Yellow.normal()), File::permission_bit(bits, unix::fs::GROUP_READ, "r", colours.perms.group_read),
File::permission_bit(bits, unix::fs::GROUP_WRITE, "w", Red.normal()), File::permission_bit(bits, unix::fs::GROUP_WRITE, "w", colours.perms.group_write),
File::permission_bit(bits, unix::fs::GROUP_EXECUTE, "x", Green.normal()), File::permission_bit(bits, unix::fs::GROUP_EXECUTE, "x", colours.perms.group_execute),
File::permission_bit(bits, unix::fs::OTHER_READ, "r", Yellow.normal()), File::permission_bit(bits, unix::fs::OTHER_READ, "r", colours.perms.other_read),
File::permission_bit(bits, unix::fs::OTHER_WRITE, "w", Red.normal()), File::permission_bit(bits, unix::fs::OTHER_WRITE, "w", colours.perms.other_write),
File::permission_bit(bits, unix::fs::OTHER_EXECUTE, "x", Green.normal()), File::permission_bit(bits, unix::fs::OTHER_EXECUTE, "x", colours.perms.other_execute),
self.attribute_marker() self.attribute_marker(colours)
]).to_string(); ]).to_string();
Cell { text: string, length: 11 } Cell { text: string, length: 11 }
@ -433,7 +421,7 @@ impl<'a> File<'a> {
style.paint(character) style.paint(character)
} }
else { else {
GREY.paint("-") Fixed(244).paint("-")
} }
} }
@ -472,16 +460,27 @@ impl<'a> File<'a> {
} }
} }
fn git_status(&self) -> Cell { pub fn extension_is_one_of(&self, choices: &[&str]) -> bool {
match self.ext {
Some(ref ext) => choices.contains(&&ext[..]),
None => false,
}
}
pub fn name_is_one_of(&self, choices: &[&str]) -> bool {
choices.contains(&&self.name[..])
}
fn git_status(&self, colours: &Colours) -> Cell {
let status = match self.dir { let status = match self.dir {
None => GREY.paint("--").to_string(), None => colours.punctuation.paint("--").to_string(),
Some(d) => { Some(d) => {
let cwd = match current_dir() { let cwd = match current_dir() {
Err(_) => Path::new(".").join(&self.path), Err(_) => Path::new(".").join(&self.path),
Ok(dir) => dir.join(&self.path), Ok(dir) => dir.join(&self.path),
}; };
d.git_status(&cwd, self.is_directory()) d.git_status(&cwd, colours, self.is_directory())
}, },
}; };

233
src/filetype.rs
View File

@ -1,145 +1,117 @@
use file::{File, GREY};
use self::FileType::*;
use ansi_term::Style; use ansi_term::Style;
use ansi_term::Style::Plain;
use ansi_term::Colour::{Red, Green, Yellow, Blue, Cyan, Fixed};
#[derive(PartialEq, Debug)] use file::File;
pub enum FileType { use colours::Colours;
Normal, Directory, Executable, Immediate, Compiled, Symlink, Special,
Image, Video, Music, Lossless, Compressed, Document, Temp, Crypto,
}
static IMAGE_TYPES: &'static [&'static str] = &[ pub fn file_colour(colours: &Colours, file: &File) -> Style {
"png", "jpeg", "jpg", "gif", "bmp", "tiff", "tif", match file {
"ppm", "pgm", "pbm", "pnm", "webp", "raw", "arw", f if f.is_directory() => colours.filetypes.directory,
"svg", "stl", "eps", "dvi", "ps", "cbr", f if f.is_executable_file() => colours.filetypes.executable,
"cbz", "xpm", "ico" ]; f if f.is_link() => colours.filetypes.symlink,
f if !f.is_file() => colours.filetypes.special,
static VIDEO_TYPES: &'static [&'static str] = &[ f if f.is_immediate() => colours.filetypes.immediate,
"avi", "flv", "m2v", "mkv", "mov", "mp4", "mpeg", f if f.is_image() => colours.filetypes.image,
"mpg", "ogm", "ogv", "vob", "wmv" ]; f if f.is_video() => colours.filetypes.video,
f if f.is_music() => colours.filetypes.music,
static MUSIC_TYPES: &'static [&'static str] = &[ f if f.is_lossless() => colours.filetypes.lossless,
"aac", "m4a", "mp3", "ogg", "wma" ]; f if f.is_crypto() => colours.filetypes.crypto,
f if f.is_document() => colours.filetypes.document,
static MUSIC_LOSSLESS: &'static [&'static str] = &[ f if f.is_compressed() => colours.filetypes.compressed,
"alac", "ape", "flac", "wav" ]; f if f.is_temp() => colours.filetypes.temp,
f if f.is_compiled() => colours.filetypes.compiled,
static COMPRESSED_TYPES: &'static [&'static str] = &[ _ => colours.filetypes.normal,
"zip", "tar", "Z", "gz", "bz2", "a", "ar", "7z",
"iso", "dmg", "tc", "rar", "par" ];
static DOCUMENT_TYPES: &'static [&'static str] = &[
"djvu", "doc", "docx", "dvi", "eml", "eps", "fotd",
"odp", "odt", "pdf", "ppt", "pptx", "rtf",
"xls", "xlsx" ];
static TEMP_TYPES: &'static [&'static str] = &[
"tmp", "swp", "swo", "swn", "bak" ];
static CRYPTO_TYPES: &'static [&'static str] = &[
"asc", "gpg", "sig", "signature", "pgp" ];
static COMPILED_TYPES: &'static [&'static str] = &[
"class", "elc", "hi", "o", "pyc" ];
static BUILD_TYPES: &'static [&'static str] = &[
"Makefile", "Cargo.toml", "SConstruct", "CMakeLists.txt",
"build.gradle", "Rakefile", "Gruntfile.js",
"Gruntfile.coffee" ];
impl FileType {
/// Get the `ansi_term::Style` that a file of this type should use.
pub fn style(&self) -> Style {
match *self {
Normal => Plain,
Directory => Blue.bold(),
Symlink => Cyan.normal(),
Special => Yellow.normal(),
Executable => Green.bold(),
Image => Fixed(133).normal(),
Video => Fixed(135).normal(),
Music => Fixed(92).normal(),
Lossless => Fixed(93).normal(),
Crypto => Fixed(109).normal(),
Document => Fixed(105).normal(),
Compressed => Red.normal(),
Temp => GREY.normal(),
Immediate => Yellow.bold().underline(),
Compiled => Fixed(137).normal(),
}
} }
} }
pub trait HasType { trait FileTypes {
/// For a given file, find out what type it has. fn is_immediate(&self) -> bool;
fn get_type(&self) -> FileType; fn is_image(&self) -> bool;
fn is_video(&self) -> bool;
fn is_music(&self) -> bool;
fn is_lossless(&self) -> bool;
fn is_crypto(&self) -> bool;
fn is_document(&self) -> bool;
fn is_compressed(&self) -> bool;
fn is_temp(&self) -> bool;
fn is_compiled(&self) -> bool;
} }
impl<'a> HasType for File<'a> { impl<'_> FileTypes for File<'_> {
fn get_type(&self) -> FileType { fn is_immediate(&self) -> bool {
self.name.starts_with("README") || self.name_is_one_of( &[
"Makefile", "Cargo.toml", "SConstruct", "CMakeLists.txt",
"build.gradle", "Rakefile", "Gruntfile.js",
"Gruntfile.coffee",
])
}
if self.is_directory() { fn is_image(&self) -> bool {
return Directory; self.extension_is_one_of( &[
} "png", "jpeg", "jpg", "gif", "bmp", "tiff", "tif",
else if self.is_executable_file() { "ppm", "pgm", "pbm", "pnm", "webp", "raw", "arw",
return Executable; "svg", "stl", "eps", "dvi", "ps", "cbr",
} "cbz", "xpm", "ico",
else if self.is_link() { ])
return Symlink; }
}
else if !self.is_file() {
return Special;
}
if self.name.starts_with("README") || BUILD_TYPES.contains(&&self.name[..]) { fn is_video(&self) -> bool {
return Immediate; self.extension_is_one_of( &[
} "avi", "flv", "m2v", "mkv", "mov", "mp4", "mpeg",
else if let Some(ref ext) = self.ext { "mpg", "ogm", "ogv", "vob", "wmv",
if IMAGE_TYPES.contains(&&ext[..]) { ])
return Image; }
}
else if VIDEO_TYPES.contains(&&ext[..]) {
return Video;
}
else if MUSIC_TYPES.contains(&&ext[..]) {
return Music;
}
else if MUSIC_LOSSLESS.contains(&&ext[..]) {
return Lossless;
}
else if CRYPTO_TYPES.contains(&&ext[..]) {
return Crypto;
}
else if DOCUMENT_TYPES.contains(&&ext[..]) {
return Document;
}
else if COMPRESSED_TYPES.contains(&&ext[..]) {
return Compressed;
}
else if self.is_tmpfile() || TEMP_TYPES.contains(&&ext[..]) {
return Temp;
}
let source_files = self.get_source_files(); fn is_music(&self) -> bool {
if source_files.is_empty() { self.extension_is_one_of( &[
return Normal; "aac", "m4a", "mp3", "ogg", "wma",
} ])
else if let Some(dir) = self.dir { }
if source_files.iter().any(|path| dir.contains(path)) {
return Temp;
}
}
else if COMPILED_TYPES.contains(&&ext[..]) {
return Compiled;
}
}
return Normal; // no filetype fn is_lossless(&self) -> bool {
} self.extension_is_one_of( &[
"alac", "ape", "flac", "wav",
])
}
fn is_crypto(&self) -> bool {
self.extension_is_one_of( &[
"zip", "tar", "Z", "gz", "bz2", "a", "ar", "7z",
"iso", "dmg", "tc", "rar", "par",
])
}
fn is_document(&self) -> bool {
self.extension_is_one_of( &[
"djvu", "doc", "docx", "dvi", "eml", "eps", "fotd",
"odp", "odt", "pdf", "ppt", "pptx", "rtf",
"xls", "xlsx",
])
}
fn is_compressed(&self) -> bool {
self.extension_is_one_of( &[
"zip", "tar", "Z", "gz", "bz2", "a", "ar", "7z",
"iso", "dmg", "tc", "rar", "par"
])
}
fn is_temp(&self) -> bool {
self.name.ends_with("~")
|| (self.name.starts_with("#") && self.name.ends_with("#"))
|| self.extension_is_one_of( &[ "tmp", "swp", "swo", "swn", "bak" ])
}
fn is_compiled(&self) -> bool {
if self.extension_is_one_of( &[ "class", "elc", "hi", "o", "pyc" ]) {
true
}
else if let Some(dir) = self.dir {
self.get_source_files().iter().any(|path| dir.contains(path))
}
else {
false
}
}
} }
#[cfg(broken_test)] #[cfg(broken_test)]
@ -170,5 +142,4 @@ mod test {
let file = new_file(dummy_stat(), "/cargo.toml"); let file = new_file(dummy_stat(), "/cargo.toml");
assert_eq!(FileType::Normal, file.get_type()) assert_eq!(FileType::Normal, file.get_type())
} }
} }

4
src/main.rs
View File

@ -25,8 +25,8 @@ use std::thread;
use dir::Dir; use dir::Dir;
use file::File; use file::File;
use options::{Options, View}; use options::{Options, View};
use output::lines_view;
mod colours;
mod column; mod column;
mod dir; mod dir;
mod feature; mod feature;
@ -189,7 +189,7 @@ impl<'a> Exa<'a> {
match self.options.view { match self.options.view {
View::Grid(g) => g.view(files), View::Grid(g) => g.view(files),
View::Details(d) => d.view(dir, files), View::Details(d) => d.view(dir, files),
View::Lines => lines_view(files), View::Lines(l) => l.view(files),
} }
} }
} }

47
src/options.rs
View File

@ -1,9 +1,10 @@
use colours::Colours;
use dir::Dir; use dir::Dir;
use file::File; use file::File;
use column::Column; use column::Column;
use column::Column::*; use column::Column::*;
use feature::Attribute; use feature::Attribute;
use output::{Grid, Details}; use output::{Grid, Details, Lines};
use term::dimensions; use term::dimensions;
use std::cmp::Ordering; use std::cmp::Ordering;
@ -38,7 +39,7 @@ pub struct FileFilter {
#[derive(PartialEq, Debug, Copy, Clone)] #[derive(PartialEq, Debug, Copy, Clone)]
pub enum View { pub enum View {
Details(Details), Details(Details),
Lines, Lines(Lines),
Grid(Grid), Grid(Grid),
} }
@ -257,6 +258,7 @@ impl View {
header: matches.opt_present("header"), header: matches.opt_present("header"),
recurse: dir_action.recurse_options().map(|o| (o, filter)), recurse: dir_action.recurse_options().map(|o| (o, filter)),
xattr: Attribute::feature_implemented() && matches.opt_present("extended"), xattr: Attribute::feature_implemented() && matches.opt_present("extended"),
colours: if dimensions().is_some() { Colours::colourful() } else { Colours::plain() },
}; };
Ok(View::Details(details)) Ok(View::Details(details))
@ -298,33 +300,44 @@ impl View {
else if Attribute::feature_implemented() && matches.opt_present("extended") { else if Attribute::feature_implemented() && matches.opt_present("extended") {
Err(Misfire::Useless("extended", false, "long")) Err(Misfire::Useless("extended", false, "long"))
} }
else if matches.opt_present("oneline") { else if let Some((width, _)) = dimensions() {
if matches.opt_present("across") { if matches.opt_present("oneline") {
Err(Misfire::Useless("across", true, "oneline")) if matches.opt_present("across") {
Err(Misfire::Useless("across", true, "oneline"))
}
else {
let lines = Lines {
colours: Colours::colourful(),
};
Ok(View::Lines(lines))
}
} }
else { else {
Ok(View::Lines)
}
}
else {
if let Some((width, _)) = dimensions() {
let grid = Grid { let grid = Grid {
across: matches.opt_present("across"), across: matches.opt_present("across"),
console_width: width console_width: width,
colours: Colours::colourful(),
}; };
Ok(View::Grid(grid)) Ok(View::Grid(grid))
} }
else { }
// If the terminal width couldn't be matched for some reason, such else {
// as the program's stdout being connected to a file, then // If the terminal width couldn't be matched for some reason, such
// fallback to the lines view. // as the program's stdout being connected to a file, then
Ok(View::Lines) // fallback to the lines view.
} let lines = Lines {
colours: Colours::plain(),
};
Ok(View::Lines(lines))
} }
} }
} }
#[derive(PartialEq, Debug, Copy, Clone)] #[derive(PartialEq, Debug, Copy, Clone)]
pub enum SizeFormat { pub enum SizeFormat {
DecimalBytes, DecimalBytes,

22
src/output/details.rs
View File

@ -1,12 +1,12 @@
use colours::Colours;
use column::{Alignment, Column, Cell}; use column::{Alignment, Column, Cell};
use feature::Attribute; use feature::Attribute;
use dir::Dir; use dir::Dir;
use file::{File, GREY}; use file::File;
use options::{Columns, FileFilter, RecurseOptions}; use options::{Columns, FileFilter, RecurseOptions};
use users::OSUsers; use users::OSUsers;
use locale; use locale;
use ansi_term::Style::Plain;
/// With the **Details** view, the output gets formatted into columns, with /// With the **Details** view, the output gets formatted into columns, with
/// each `Column` object showing some piece of information about the file, /// each `Column` object showing some piece of information about the file,
@ -37,13 +37,15 @@ pub struct Details {
/// Whether to show each file's extended attributes. /// Whether to show each file's extended attributes.
pub xattr: bool, pub xattr: bool,
pub colours: Colours,
} }
impl Details { impl Details {
pub fn view(&self, dir: Option<&Dir>, files: &[File]) { pub fn view(&self, dir: Option<&Dir>, files: &[File]) {
// First, transform the Columns object into a vector of columns for // First, transform the Columns object into a vector of columns for
// the current directory. // the current directory.
let mut table = Table::with_columns(self.columns.for_dir(dir)); let mut table = Table::with_options(self.colours, self.columns.for_dir(dir));
if self.header { table.add_header() } if self.header { table.add_header() }
// Then add files to the table and print it out. // Then add files to the table and print it out.
@ -111,17 +113,19 @@ struct Table {
users: OSUsers, users: OSUsers,
locale: UserLocale, locale: UserLocale,
rows: Vec<Row>, rows: Vec<Row>,
colours: Colours,
} }
impl Table { impl Table {
/// Create a new, empty Table object, setting the caching fields to their /// Create a new, empty Table object, setting the caching fields to their
/// empty states. /// empty states.
fn with_columns(columns: Vec<Column>) -> Table { fn with_options(colours: Colours, columns: Vec<Column>) -> Table {
Table { Table {
columns: columns, columns: columns,
users: OSUsers::empty_cache(), users: OSUsers::empty_cache(),
locale: UserLocale::new(), locale: UserLocale::new(),
rows: Vec::new(), rows: Vec::new(),
colours: colours,
} }
} }
@ -131,8 +135,8 @@ impl Table {
fn add_header(&mut self) { fn add_header(&mut self) {
let row = Row { let row = Row {
depth: 0, depth: 0,
cells: self.columns.iter().map(|c| Cell::paint(Plain.underline(), c.header())).collect(), cells: self.columns.iter().map(|c| Cell::paint(self.colours.header, c.header())).collect(),
name: Plain.underline().paint("Name").to_string(), name: self.colours.header.paint("Name").to_string(),
last: false, last: false,
attrs: Vec::new(), attrs: Vec::new(),
children: false, children: false,
@ -145,7 +149,7 @@ impl Table {
/// this file, per-column. /// this file, per-column.
fn cells_for_file(&mut self, file: &File) -> Vec<Cell> { fn cells_for_file(&mut self, file: &File) -> Vec<Cell> {
self.columns.clone().iter() self.columns.clone().iter()
.map(|c| file.display(c, &mut self.users, &self.locale)) .map(|c| file.display(c, &self.colours, &mut self.users, &self.locale))
.collect() .collect()
} }
@ -154,7 +158,7 @@ impl Table {
let row = Row { let row = Row {
depth: depth, depth: depth,
cells: self.cells_for_file(file), cells: self.cells_for_file(file),
name: file.file_name_view(), name: file.file_name_view(&self.colours),
last: last, last: last,
attrs: file.xattrs.clone(), attrs: file.xattrs.clone(),
children: file.this.is_some(), children: file.this.is_some(),
@ -189,7 +193,7 @@ impl Table {
stack[row.depth] = if row.last { TreePart::Corner } else { TreePart::Edge }; stack[row.depth] = if row.last { TreePart::Corner } else { TreePart::Edge };
for i in 1 .. row.depth + 1 { for i in 1 .. row.depth + 1 {
print!("{}", GREY.paint(stack[i].ascii_art())); print!("{}", self.colours.punctuation.paint(stack[i].ascii_art()));
} }
if row.children { if row.children {

9
src/output/grid.rs
View File

@ -1,6 +1,8 @@
use colours::Colours;
use column::Alignment::Left; use column::Alignment::Left;
use file::File; use file::File;
use super::lines::lines_view; use filetype::file_colour;
use super::lines::Lines;
use std::cmp::max; use std::cmp::max;
use std::iter::repeat; use std::iter::repeat;
@ -9,6 +11,7 @@ use std::iter::repeat;
pub struct Grid { pub struct Grid {
pub across: bool, pub across: bool,
pub console_width: usize, pub console_width: usize,
pub colours: Colours,
} }
impl Grid { impl Grid {
@ -81,7 +84,7 @@ impl Grid {
} }
let ref file = files[num]; let ref file = files[num];
let styled_name = file.file_colour().paint(&file.name).to_string(); let styled_name = file_colour(&self.colours, file).paint(&file.name).to_string();
if x == widths.len() - 1 { if x == widths.len() - 1 {
// The final column doesn't need to have trailing spaces // The final column doesn't need to have trailing spaces
print!("{}", styled_name); print!("{}", styled_name);
@ -96,7 +99,7 @@ impl Grid {
} }
else { else {
// Drop down to lines view if the file names are too big for a grid // Drop down to lines view if the file names are too big for a grid
lines_view(files); Lines { colours: self.colours }.view(files);
} }
} }
} }

14
src/output/lines.rs
View File

@ -1,8 +1,16 @@
use colours::Colours;
use file::File; use file::File;
#[derive(Clone, Copy, Debug, PartialEq)]
pub struct Lines {
pub colours: Colours,
}
/// The lines view literally just displays each file, line-by-line. /// The lines view literally just displays each file, line-by-line.
pub fn lines_view(files: &[File]) { impl Lines {
for file in files { pub fn view(&self, files: &[File]) {
println!("{}", file.file_name_view()); for file in files {
println!("{}", file.file_name_view(&self.colours));
}
} }
} }

2
src/output/mod.rs
View File

@ -4,4 +4,4 @@ mod lines;
pub use self::grid::Grid; pub use self::grid::Grid;
pub use self::details::Details; pub use self::details::Details;
pub use self::lines::lines_view; pub use self::lines::Lines;