From f6915c1f87729647e2a9555210b4f5c9ecf840e2 Mon Sep 17 00:00:00 2001 From: Ben S Date: Mon, 11 May 2015 23:44:52 +0100 Subject: Add the file type column back in --- src/output/details.rs | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) (limited to 'src/output') diff --git a/src/output/details.rs b/src/output/details.rs index 979c99d..04668c4 100644 --- a/src/output/details.rs +++ b/src/output/details.rs @@ -2,7 +2,7 @@ use colours::Colours; use column::{Alignment, Column, Cell}; use feature::Attribute; use dir::Dir; -use file::{Blocks, File, Git, GitStatus, Group, Inode, Links, Permissions, Size, Time, User}; +use file::{Blocks, File, Git, GitStatus, Group, Inode, Links, Permissions, Size, Time, Type, User}; use options::{Columns, FileFilter, RecurseOptions, SizeFormat}; use users::{OSUsers, Users}; @@ -292,8 +292,16 @@ impl Render for Permissions { if bit { style.paint(chr) } else { colours.punctuation.paint("-") } }; + let file_type = match self.file_type { + Type::File => colours.filetypes.normal.paint("."), + Type::Directory => colours.filetypes.directory.paint("d"), + Type::Pipe => colours.filetypes.special.paint("|"), + Type::Link => colours.filetypes.symlink.paint("l"), + Type::Special => colours.filetypes.special.paint("?"), + }; + let string = ANSIStrings( &[ - //self.file_type.render(colours, local), + file_type, bit(self.user_read, "r", c.user_read), bit(self.user_write, "w", c.user_write), bit(self.user_execute, "x", c.user_execute_file), -- cgit v1.2.3