Move ByteFormat out of WalkOptions

3 files changed, 16 insertions, 16 deletions

diff --git a/src/interactive/app/bytevis.rs b/src/interactive/app/bytevis.rs
index 1d1bc33..26a99e7 100644
--- a/src/interactive/app/bytevis.rs
+++ b/src/interactive/app/bytevis.rs
@@ -106,8 +106,8 @@ pub struct DisplayOptions {
     pub byte_vis: ByteVisualization,
 }
 
-impl From<WalkOptions> for DisplayOptions {
-    fn from(WalkOptions { byte_format, .. }: WalkOptions) -> Self {
+impl DisplayOptions {
+    pub fn new(byte_format: ByteFormat) -> Self {
         DisplayOptions {
             byte_format,
             byte_vis: ByteVisualization::default(),
diff --git a/src/interactive/app/terminal_app.rs b/src/interactive/app/terminal_app.rs
index 1367724..9d97ae7 100644
--- a/src/interactive/app/terminal_app.rs
+++ b/src/interactive/app/terminal_app.rs
@@ -2,7 +2,7 @@ use std::path::PathBuf;
 
 use crossbeam::channel::Receiver;
 use crosstermion::input::Event;
-use dua::{traverse::{Traversal, Tree, EntryData}, WalkResult, WalkOptions};
+use dua::{traverse::{Traversal, Tree, EntryData}, WalkResult, WalkOptions, ByteFormat};
 use tui::prelude::Backend;
 use tui_react::Terminal;
 use anyhow::Result;
@@ -60,7 +60,7 @@ impl TerminalApp {
 
     pub fn initialize<B>(
         terminal: &mut Terminal<B>,
-        options: WalkOptions,
+        byte_format: ByteFormat,
         input_paths: Vec<PathBuf>,
         keys_rx: Receiver<Event>,
     ) -> Result<Option<KeyboardInputAndApp>>
@@ -70,9 +70,7 @@ impl TerminalApp {
         terminal.hide_cursor()?;
         terminal.clear()?;
         
-        let mut display: DisplayOptions = options.clone().into();
-        display.byte_vis = ByteVisualization::PercentageAndBar;
-        
+        let mut display = DisplayOptions::new(byte_format);
         let mut window = MainWindow::default();
 
         // #[inline]
diff --git a/src/interactive/app/tests/utils.rs b/src/interactive/app/tests/utils.rs
index 82cf00b..e5c432a 100644
--- a/src/interactive/app/tests/utils.rs
+++ b/src/interactive/app/tests/utils.rs
@@ -179,15 +179,7 @@ pub fn initialized_app_and_terminal_with_closure(
     let input_paths = fixture_paths.iter().map(|c| convert(c.as_ref())).collect();
     let app = TerminalApp::initialize(
         &mut terminal,
-        WalkOptions {
-            threads: 1,
-            byte_format: ByteFormat::Metric,
-            apparent_size: true,
-            count_hard_links: false,
-            sorting: TraversalSorting::AlphabeticalByFileName,
-            cross_filesystems: false,
-            ignore_dirs: Default::default(),
-        },
+        ByteFormat::Metric,
         input_paths,
         keys_rx,
     )?
@@ -196,6 +188,16 @@ pub fn initialized_app_and_terminal_with_closure(
         terminal,
         app.expect("app that didn't try to abort iteration"),
     ))
+
+    // WalkOptions {
+    //     threads: 1,
+    //     byte_format: ,
+    //     apparent_size: true,
+    //     count_hard_links: false,
+    //     sorting: TraversalSorting::AlphabeticalByFileName,
+    //     cross_filesystems: false,
+    //     ignore_dirs: Default::default(),
+    // }
 }
 
 pub fn new_test_terminal() -> std::io::Result<Terminal<TestBackend>> {