mirror of
https://github.com/Llewellynvdm/exa.git
synced 2024-11-26 22:06:26 +00:00
Extract file type render function
This commit is contained in:
parent
fdd053d735
commit
24a5d71f4b
@ -1,7 +1,7 @@
|
||||
use fs::fields as f;
|
||||
use output::colours::Colours;
|
||||
use output::cell::{TextCell, DisplayWidth};
|
||||
use ansi_term::Style;
|
||||
use ansi_term::{ANSIString, Style};
|
||||
|
||||
|
||||
impl f::Permissions {
|
||||
@ -10,22 +10,11 @@ impl f::Permissions {
|
||||
if bit { style.paint(chr) } else { colours.punctuation.paint("-") }
|
||||
};
|
||||
|
||||
let type_char = match file_type {
|
||||
f::Type::File => colours.filetypes.normal.paint("."),
|
||||
f::Type::Directory => colours.filetypes.directory.paint("d"),
|
||||
f::Type::Pipe => colours.filetypes.pipe.paint("|"),
|
||||
f::Type::Link => colours.filetypes.symlink.paint("l"),
|
||||
f::Type::CharDevice => colours.filetypes.device.paint("c"),
|
||||
f::Type::BlockDevice => colours.filetypes.device.paint("b"),
|
||||
f::Type::Socket => colours.filetypes.socket.paint("s"),
|
||||
f::Type::Special => colours.filetypes.special.paint("?"),
|
||||
};
|
||||
|
||||
let x_colour = if file_type.is_regular_file() { colours.perms.user_execute_file }
|
||||
else { colours.perms.user_execute_other };
|
||||
|
||||
let mut chars = vec![
|
||||
type_char,
|
||||
file_type.render(colours),
|
||||
bit(self.user_read, "r", colours.perms.user_read),
|
||||
bit(self.user_write, "w", colours.perms.user_write),
|
||||
bit(self.user_execute, "x", x_colour),
|
||||
@ -53,6 +42,22 @@ impl f::Permissions {
|
||||
}
|
||||
}
|
||||
|
||||
impl f::Type {
|
||||
pub fn render(&self, colours: &Colours) -> ANSIString<'static> {
|
||||
match *self {
|
||||
f::Type::File => colours.filetypes.normal.paint("."),
|
||||
f::Type::Directory => colours.filetypes.directory.paint("d"),
|
||||
f::Type::Pipe => colours.filetypes.pipe.paint("|"),
|
||||
f::Type::Link => colours.filetypes.symlink.paint("l"),
|
||||
f::Type::CharDevice => colours.filetypes.device.paint("c"),
|
||||
f::Type::BlockDevice => colours.filetypes.device.paint("b"),
|
||||
f::Type::Socket => colours.filetypes.socket.paint("s"),
|
||||
f::Type::Special => colours.filetypes.special.paint("?"),
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
|
||||
#[cfg(test)]
|
||||
#[allow(unused_results)]
|
||||
|
Loading…
Reference in New Issue
Block a user