file_name -> FileName#paint

This commit is contained in:
Benjamin Sago 2017-05-02 08:52:24 +01:00
parent f51f5fe202
commit 437ac0ea60
4 changed files with 8 additions and 6 deletions

View File

@ -307,7 +307,7 @@ impl Details {
let mut files = Vec::new();
let mut errors = egg.errors;
let filename = FileName::new(&egg.file, &self.colours).file_name(true, self.classify);
let filename = FileName::new(&egg.file, &self.colours).paint(true, self.classify);
let mut width = filename.width();
if egg.file.dir.is_none() {
@ -458,7 +458,7 @@ impl<'a, U: Users+Groups+'a> Table<'a, U> {
}
pub fn filename_cell(&self, file: File, links: bool) -> TextCell {
let filename = FileName::new(&file, &self.opts.colours).file_name(links, self.opts.classify);
let filename = FileName::new(&file, &self.opts.colours).paint(links, self.opts.classify);
let mut width = filename.width();
if file.dir.is_none() {

View File

@ -21,7 +21,7 @@ impl<'a, 'dir> FileName<'a, 'dir> {
}
}
pub fn file_name(&self, links: bool, classify: bool) -> TextCellContents {
pub fn paint(&self, links: bool, classify: bool) -> TextCellContents {
let mut bits = Vec::new();
if self.file.dir.is_none() {

View File

@ -29,7 +29,7 @@ impl Grid {
grid.reserve(files.len());
for file in files.iter() {
let filename = FileName::new(file, &self.colours).file_name(false, self.classify);
let filename = FileName::new(file, &self.colours).paint(false, self.classify);
let mut width = filename.width();
if file.dir.is_none() {
@ -50,7 +50,8 @@ impl Grid {
else {
// File names too long for a grid - drop down to just listing them!
for file in files.iter() {
writeln!(w, "{}", FileName::new(file, &self.colours).file_name(false, self.classify).strings())?;
let name_cell = FileName::new(file, &self.colours).paint(false, self.classify);
writeln!(w, "{}", name_cell.strings())?;
}
Ok(())
}

View File

@ -18,7 +18,8 @@ pub struct Lines {
impl Lines {
pub fn view<W: Write>(&self, files: Vec<File>, w: &mut W) -> IOResult<()> {
for file in files {
writeln!(w, "{}", ANSIStrings(&FileName::new(&file, &self.colours).file_name(true, self.classify)))?;
let name_cell = FileName::new(&file, &self.colours).paint(true, self.classify);
writeln!(w, "{}", ANSIStrings(&name_cell))?;
}
Ok(())
}