Llewellyn/exa
1
0
Fork 0
mirror of https://github.com/Llewellynvdm/exa.git synced 2024-11-05 20:37:52 +00:00
Code Issues Projects Releases Wiki Activity

Darken file size suffixes

Browse Source 
I think this is necessary because 'bytes' currently has no 'B' suffix, and it's
kind of hard to distinguish a long number from a suffix.
This commit is contained in:
Ben S 2014-06-03 21:20:17 +01:00
parent e5e426fc60
commit bc4df2cf3c
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
file.rs
View File

@ -89,13 +89,13 @@ impl<'a> File<'a> {
if self.stat.kind == io::TypeDirectory { if self.stat.kind == io::TypeDirectory {
Black.bold().paint("-") Black.bold().paint("-")
} else { } else {
let size_str = if use_iec_prefixes { let (size, suffix) = if use_iec_prefixes {
format_IEC_bytes(self.stat.size) format_IEC_bytes(self.stat.size)
} else { } else {
format_metric_bytes(self.stat.size) format_metric_bytes(self.stat.size)
}; };
return Green.bold().paint(size_str.as_slice()); return format!("{}{}", Green.bold().paint(size.as_slice()), Green.paint(suffix.as_slice()));
} }
} }

8
format.rs
View File

@ -6,19 +6,19 @@ static IEC_PREFIXES: &'static [&'static str] = &[
"", "Ki", "Mi", "Gi", "Ti", "Pi", "Ei", "Zi", "Yi" "", "Ki", "Mi", "Gi", "Ti", "Pi", "Ei", "Zi", "Yi"
]; ];
fn format_bytes(mut amount: u64, kilo: u64, prefixes: &[&str]) -> String { fn format_bytes(mut amount: u64, kilo: u64, prefixes: &[&str]) -> (String, String) {
let mut prefix = 0; let mut prefix = 0;
while amount > kilo { while amount > kilo {
amount /= kilo; amount /= kilo;
prefix += 1; prefix += 1;
} }
format!("{}{}", amount, prefixes[prefix]) return (format!("{}", amount), prefixes[prefix].to_string());
} }
pub fn format_IEC_bytes(amount: u64) -> String { pub fn format_IEC_bytes(amount: u64) -> (String, String) {
format_bytes(amount, 1024, IEC_PREFIXES) format_bytes(amount, 1024, IEC_PREFIXES)
} }
pub fn format_metric_bytes(amount: u64) -> String { pub fn format_metric_bytes(amount: u64) -> (String, String) {
format_bytes(amount, 1000, METRIC_PREFIXES) format_bytes(amount, 1000, METRIC_PREFIXES)
} }