From 4e1180e502c52b97d59c5227c888f03590586623 Mon Sep 17 00:00:00 2001 From: "andy.boot" Date: Fri, 21 Aug 2020 08:24:51 +0100 Subject: [PATCH] hack --- Cargo.toml | 3 +-- src/display.rs | 22 +++++++++------------- 2 files changed, 10 insertions(+), 15 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index baafe8eb..17ecc737 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -30,8 +30,7 @@ unicode-width = "0.1" ignore="0.4" crossbeam-channel = "0.4" walkdir="2.3" -# todo use num_format instead -thousands="" +thousands = "0.2" [target.'cfg(windows)'.dependencies] winapi-util = "0.1" diff --git a/src/display.rs b/src/display.rs index 3c964fc9..7055d781 100644 --- a/src/display.rs +++ b/src/display.rs @@ -338,26 +338,22 @@ fn get_name_percent( } fn get_pretty_size(node: &Node, is_biggest: bool, display_data: &DisplayData) -> String { - if display_data.by_filecount { + let output = if display_data.by_filecount { let size_as_str = node.size.separate_with_commas(); let spaces_to_add = display_data.num_chars_needed_on_left_most - size_as_str.chars().count(); - let first_size_bar = size_as_str + &*repeat(' ').take(spaces_to_add).collect::(); + size_as_str + &*repeat(' ').take(spaces_to_add).collect::() + } else { + format!("{:>5}", human_readable_number(node.size)) + }; - if is_biggest && display_data.colors_on { - format!("{}", Red.paint(first_size_bar)) - } else { - first_size_bar - } + if is_biggest && display_data.colors_on { + format!("{}", Red.paint(output)) } else { - let pretty_size = format!("{:>5}", human_readable_number(node.size)); - if is_biggest && display_data.colors_on { - format!("{}", Red.paint(pretty_size)) - } else { - pretty_size - } + output } } + fn get_pretty_name(node: &Node, name_and_padding: String, display_data: &DisplayData) -> String { if display_data.colors_on { let meta_result = fs::metadata(node.name.clone());