Llewellyn/exa
1
0
Fork 0
mirror of https://github.com/Llewellynvdm/exa.git synced 2025-04-04 22:41:51 +00:00
Code Issues Projects Releases Wiki Activity

Extract file type render function

Browse Source
This commit is contained in:
Benjamin Sago 2017-05-20 21:49:00 +01:00
parent fdd053d735
commit 24a5d71f4b
1 changed files with 18 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
src/output/render/permissions.rs
View File

@ -1,7 +1,7 @@
use fs::fields as f; use fs::fields as f;
use output::colours::Colours; use output::colours::Colours;
use output::cell::{TextCell, DisplayWidth}; use output::cell::{TextCell, DisplayWidth};
use ansi_term::Style; use ansi_term::{ANSIString, Style};
impl f::Permissions { impl f::Permissions {
@ -10,22 +10,11 @@ impl f::Permissions {
if bit { style.paint(chr) } else { colours.punctuation.paint("-") } 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 } let x_colour = if file_type.is_regular_file() { colours.perms.user_execute_file }
else { colours.perms.user_execute_other }; else { colours.perms.user_execute_other };
let mut chars = vec![ let mut chars = vec![
type_char, file_type.render(colours),
bit(self.user_read, "r", colours.perms.user_read), bit(self.user_read, "r", colours.perms.user_read),
bit(self.user_write, "w", colours.perms.user_write), bit(self.user_write, "w", colours.perms.user_write),
bit(self.user_execute, "x", x_colour), 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)] #[cfg(test)]
#[allow(unused_results)] #[allow(unused_results)]