Add support for static byte units

README.md

@@ -29,8 +29,8 @@ A sub-command bringing up a terminal user interface to allow drilling into direc
 
 ##### Other Features
 
- * [ ] Single Unit Mode, see [reddit](https://www.reddit.com/r/rust/comments/bvjtan/introducing_dua_a_parallel_du_for_humans/epsroxg/)
- * [ ] Evaluate unit coloring
+ * [x] Single Unit Mode, see [reddit](https://www.reddit.com/r/rust/comments/bvjtan/introducing_dua_a_parallel_du_for_humans/epsroxg/)
+ * [ ] Evaluate unit coloring - can we highlight different units better, make them stick out?
 
 #### ✅v1.0 (_released_) - aggregate directories, fast
 

src/common.rs

@@ -2,6 +2,7 @@ use crate::{
     interactive::SortMode,
     traverse::{EntryData, Tree, TreeIndex},
 };
+use byte_unit::{n_gb_bytes, n_gib_bytes, n_mb_bytes, n_mib_bytes, ByteUnit};
 use itertools::Itertools;
 use jwalk::WalkDir;
 use petgraph::Direction;
@@ -59,6 +60,14 @@ pub enum ByteFormat {
     Binary,
     /// raw bytes, without additional formatting
     Bytes,
+    /// only gigabytes without smart-unit
+    GB,
+    /// only gibibytes without smart-unit
+    GiB,
+    /// only megabytes without smart-unit
+    MB,
+    /// only mebibytes without smart-unit
+    MiB,
 }
 
 impl ByteFormat {
@@ -67,6 +76,8 @@ impl ByteFormat {
         match self {
             Metric | Binary => 10,
             Bytes => 12,
+            MiB|MB => 12,
+            _ => 10,
         }
     }
     pub fn display(&self, bytes: u64) -> ByteFormatDisplay {
@@ -87,14 +98,23 @@ impl fmt::Display for ByteFormatDisplay {
         use byte_unit::Byte;
         use ByteFormat::*;
 
-        let binary = match self.format {
+        let format = match self.format {
             Bytes => return write!(f, "{} b", self.bytes),
-            Binary => true,
-            Metric => false,
+            Binary => (true, None),
+            Metric => (false, None),
+            GB => (false, Some((n_gb_bytes!(1), ByteUnit::GB))),
+            GiB => (false, Some((n_gib_bytes!(1), ByteUnit::GiB))),
+            MB => (false, Some((n_mb_bytes!(1), ByteUnit::MB))),
+            MiB => (false, Some((n_mib_bytes!(1), ByteUnit::MiB))),
         };
-        let b = Byte::from_bytes(self.bytes as u128)
-            .get_appropriate_unit(binary)
-            .format(2);
+
+        let b = match format {
+            (_, Some((divisor, unit))) => Byte::from_unit(self.bytes as f64 / divisor as f64, unit)
+                .expect("byte count > 0")
+                .get_adjusted_unit(unit),
+            (binary, None) => Byte::from_bytes(self.bytes as u128).get_appropriate_unit(binary),
+        }
+        .format(2);
         let mut splits = b.split(' ');
         match (splits.next(), splits.next()) {
             (Some(bytes), Some(unit)) => write!(

src/interactive/widgets/header.rs

@@ -37,7 +37,7 @@ impl Widget for Header {
             text(env!("CARGO_PKG_VERSION")),
             text("    "),
             italic("(press "),
-            modified("?", Modifier::BOLD|Modifier::UNDERLINED),
+            modified("?", Modifier::BOLD | Modifier::UNDERLINED),
             italic(" for help)"),
         ];
         Paragraph::new(lines.iter())

src/options.rs

@@ -7,7 +7,11 @@ arg_enum! {
     pub enum ByteFormat {
         Metric,
         Binary,
-        Bytes
+        Bytes,
+        GB,
+        GiB,
+        MB,
+        MiB
     }
 }
 
@@ -17,6 +21,10 @@ impl From<ByteFormat> for LibraryByteFormat {
             ByteFormat::Metric => LibraryByteFormat::Metric,
             ByteFormat::Binary => LibraryByteFormat::Binary,
             ByteFormat::Bytes => LibraryByteFormat::Bytes,
+            ByteFormat::GB => LibraryByteFormat::GB,
+            ByteFormat::GiB => LibraryByteFormat::GiB,
+            ByteFormat::MB => LibraryByteFormat::MB,
+            ByteFormat::MiB => LibraryByteFormat::MiB,
         }
     }
 }
@@ -37,6 +45,10 @@ pub struct Args {
     /// Metric - uses 1000 as base (default)
     /// Binary - uses 1024 as base
     /// Bytes - plain bytes without any formatting
+    /// GB - only gigabytes
+    /// GiB - only gibibytes
+    /// MB - only megabytes
+    /// MiB - only mebibytes
     #[structopt(short = "f", long = "format")]
     pub format: Option<ByteFormat>,
 

tests/snapshots/success-bytes-gb

@@ -0,0 +1,7 @@
+   0.00 GB b.empty
+   0.00 GB z123.b
+   0.00 GB a
+   0.00 GB c.lnk
+   0.00 GB .hidden.666
+   0.00 GB dir
+   0.00 GB total

tests/snapshots/success-bytes-gib

@@ -0,0 +1,7 @@
+  0.00 GiB b.empty
+  0.00 GiB z123.b
+  0.00 GiB a
+  0.00 GiB c.lnk
+  0.00 GiB .hidden.666
+  0.00 GiB dir
+  0.00 GiB total

tests/snapshots/success-bytes-mb

@@ -0,0 +1,7 @@
+   0.00 MB b.empty
+   0.00 MB z123.b
+   0.00 MB a
+   0.00 MB c.lnk
+   0.00 MB .hidden.666
+   1.26 MB dir
+   1.26 MB total

tests/snapshots/success-bytes-metric

@@ -0,0 +1,7 @@
+   0.00  B b.empty
+ 123.00  B z123.b
+ 256.00  B a
+ 256.00  B c.lnk
+ 666.00  B .hidden.666
+   1.26 MB dir
+   1.26 MB total

tests/snapshots/success-bytes-mib

@@ -0,0 +1,7 @@
+  0.00 MiB b.empty
+  0.00 MiB z123.b
+  0.00 MiB a
+  0.00 MiB c.lnk
+  0.00 MiB .hidden.666
+  1.20 MiB dir
+  1.20 MiB total

tests/stateless-journey.sh

@@ -82,18 +82,14 @@ WITH_FAILURE=1
     )
 
     (with "the byte format set"
-      (with "human-binary"
-        it "produces a human-readable aggregate of the current directory, without total" && {
-          WITH_SNAPSHOT="$snapshot/success-bytes-binary" \
-          expect_run ${SUCCESSFULLY} "$exe" --format binary
-        }
-      )
-      (with "bytes"
-        it "produces a human-readable aggregate of the current directory, without total" && {
-          WITH_SNAPSHOT="$snapshot/success-bytes-only" \
-          expect_run ${SUCCESSFULLY} "$exe" --format bytes
-        }
-      )
+      for format in binary bytes metric gb gib mb mib; do
+        (with $format
+          it "produces a human-readable aggregate of the current directory, without total" && {
+            WITH_SNAPSHOT="$snapshot/success-bytes-$format" \
+            expect_run ${SUCCESSFULLY} "$exe" --format $format
+          }
+        )
+      done
     )
   )
   (with "interactive mode"