Prepare to make the size colour take an argument

This makes the Colours value pick a colour based on the size of the file, instead of necessarily having them all green. (They are all green for now, though.)
This commit is contained in:
Ben S 2016-10-30 15:09:36 +00:00
parent 93f8ad27dc
commit 91e8ef5c78
2 changed files with 7 additions and 3 deletions

View File

@ -169,4 +169,8 @@ impl Colours {
broken_filename: Red.underline()
}
}
pub fn file_size(&self, _size: u64) -> Style {
self.size.numbers
}
}

View File

@ -586,12 +586,12 @@ impl<'a, U: Users+Groups+'a> Table<'a, U> {
SizeFormat::BinaryBytes => binary_prefix(size as f64),
SizeFormat::JustBytes => {
let string = self.env.numeric.format_int(size);
return TextCell::paint(self.opts.colours.size.numbers, string);
return TextCell::paint(self.opts.colours.file_size(size), string);
},
};
let (prefix, n) = match result {
Standalone(b) => return TextCell::paint(self.opts.colours.size.numbers, b.to_string()),
Standalone(b) => return TextCell::paint(self.opts.colours.file_size(b as u64), b.to_string()),
Prefixed(p, n) => (p, n)
};
@ -606,7 +606,7 @@ impl<'a, U: Users+Groups+'a> Table<'a, U> {
TextCell {
width: width,
contents: vec![
self.opts.colours.size.numbers.paint(number),
self.opts.colours.file_size(size).paint(number),
self.opts.colours.size.unit.paint(symbol),
].into(),
}