Minor style improvements to handle special case

Byron · Jul 22, 2020 · 69a2490 · 69a2490
1 parent 4f91292
commit 69a2490
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 13 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,7 @@
+#### v2.10.0 - Minor improvements of looks; improved windows support
+
+* previously in interactive mode on Windows, directory sizes would appear as 0 bytes in size. This is now fixed!
+
 #### v2.9.1 - Globs for Windows; fixed handling of colors
 
 * On widnows, `dua` will now expand glob patterns by itself as this capability is not implemented by shells `dua` can now run in.

diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "dua-cli"
-version = "2.9.1"
+version = "2.10.0"
 authors = ["Sebastian Thiel <byronimo@gmail.com>"]
 edition = "2018"
 repository = "https://github.com/Byron/dua-cli"

diff --git a/src/interactive/widgets/entries.rs b/src/interactive/widgets/entries.rs
@@ -125,13 +125,20 @@ impl Entries {
                         ..style
                     },
                 );
+                let fraction = w.size as f32 / total as f32;
+                let should_avoid_showing_a_big_reversed_bar = fraction > 0.9;
+                let local_style = if should_avoid_showing_a_big_reversed_bar {
+                    style.remove_modifier(Modifier::REVERSED)
+                } else {
+                    style
+                };
+
+                let left_bar = Span::styled(" |", local_style);
                 let percentage = Span::styled(
-                    format!(
-                        " |{}| ",
-                        display.byte_vis.display(w.size as f32 / total as f32)
-                    ),
-                    style,
+                    format!("{}", display.byte_vis.display(fraction)),
+                    local_style,
                 );
+                let right_bar = Span::styled("| ", local_style);
 
                 let name = Span::styled(
                     fill_background_to_right(
@@ -153,7 +160,7 @@ impl Entries {
                         Style { fg, ..style }
                     },
                 );
-                vec![bytes, percentage, name]
+                vec![bytes, left_bar, percentage, right_bar, name]
             },
         );