Skip to content

Commit 4e1180e

Browse files
committed
hack
1 parent 4ea8d93 commit 4e1180e

File tree

2 files changed

+10
-15
lines changed

2 files changed

+10
-15
lines changed

Cargo.toml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,7 @@ unicode-width = "0.1"
3030
ignore="0.4"
3131
crossbeam-channel = "0.4"
3232
walkdir="2.3"
33-
# todo use num_format instead
34-
thousands=""
33+
thousands = "0.2"
3534

3635
[target.'cfg(windows)'.dependencies]
3736
winapi-util = "0.1"

src/display.rs

Lines changed: 9 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -338,26 +338,22 @@ fn get_name_percent(
338338
}
339339

340340
fn get_pretty_size(node: &Node, is_biggest: bool, display_data: &DisplayData) -> String {
341-
if display_data.by_filecount {
341+
let output = if display_data.by_filecount {
342342
let size_as_str = node.size.separate_with_commas();
343343
let spaces_to_add =
344344
display_data.num_chars_needed_on_left_most - size_as_str.chars().count();
345-
let first_size_bar = size_as_str + &*repeat(' ').take(spaces_to_add).collect::<String>();
345+
size_as_str + &*repeat(' ').take(spaces_to_add).collect::<String>()
346+
} else {
347+
format!("{:>5}", human_readable_number(node.size))
348+
};
346349

347-
if is_biggest && display_data.colors_on {
348-
format!("{}", Red.paint(first_size_bar))
349-
} else {
350-
first_size_bar
351-
}
350+
if is_biggest && display_data.colors_on {
351+
format!("{}", Red.paint(output))
352352
} else {
353-
let pretty_size = format!("{:>5}", human_readable_number(node.size));
354-
if is_biggest && display_data.colors_on {
355-
format!("{}", Red.paint(pretty_size))
356-
} else {
357-
pretty_size
358-
}
353+
output
359354
}
360355
}
356+
361357
fn get_pretty_name(node: &Node, name_and_padding: String, display_data: &DisplayData) -> String {
362358
if display_data.colors_on {
363359
let meta_result = fs::metadata(node.name.clone());

0 commit comments

Comments
 (0)