From 20d89bef91428278f9425f0b8b323e4cb21ec063 Mon Sep 17 00:00:00 2001
From: "andy.boot" <bootandy@gmail.com>
Date: Mon, 3 Jan 2022 20:11:35 +0000
Subject: [PATCH] Neaten code

---
 src/display.rs | 18 ++++++------------
 src/main.rs    | 23 +++++++++++++----------
 2 files changed, 19 insertions(+), 22 deletions(-)

diff --git a/src/display.rs b/src/display.rs
index dcf1c8e..9480f15 100644
--- a/src/display.rs
+++ b/src/display.rs
@@ -114,14 +114,9 @@ pub fn draw_it(
     no_percents: bool,
     terminal_width: usize,
     by_filecount: bool,
-    option_root_node: Option<DisplayNode>,
+    root_node: DisplayNode,
     iso: bool,
 ) {
-    if option_root_node.is_none() {
-        return;
-    }
-    let root_node = option_root_node.unwrap();
-
     let num_chars_needed_on_left_most = if by_filecount {
         let max_size = root_node.size;
         max_size.separate_with_commas().chars().count()
@@ -134,15 +129,15 @@ pub fn draw_it(
         "Not enough terminal width"
     );
 
-    let t = terminal_width - num_chars_needed_on_left_most - 2;
+    let allowed_width = terminal_width - num_chars_needed_on_left_most - 2;
     let num_indent_chars = 3;
     let longest_string_length =
-        find_longest_dir_name(&root_node, num_indent_chars, t, !use_full_path);
+        find_longest_dir_name(&root_node, num_indent_chars, allowed_width, !use_full_path);
 
-    let max_bar_length = if no_percents || longest_string_length + 7 >= t as usize {
+    let max_bar_length = if no_percents || longest_string_length + 7 >= allowed_width as usize {
         0
     } else {
-        t as usize - longest_string_length - 7
+        allowed_width as usize - longest_string_length - 7
     };
 
     let first_size_bar = repeat(BLOCKS[0]).take(max_bar_length).collect::<String>();
@@ -273,7 +268,7 @@ fn pad_or_trim_filename(node: &DisplayNode, indent: &str, display_data: &Display
     // Add spaces after the filename so we can draw the % used bar chart.
     let name_and_padding = name
         + " "
-            .repeat((display_data.longest_string_length) - (width))
+            .repeat(display_data.longest_string_length - width)
             .as_str();
 
     name_and_padding
@@ -286,7 +281,6 @@ fn maybe_trim_filename(name_in: String, indent: &str, display_data: &DisplayData
         "Terminal width not wide enough to draw directory tree"
     );
 
-    // println!("{} : {} : {}", UnicodeWidthStr::width(&*name_in) ,display_data.longest_string_length, indent_length);
     let max_size = display_data.longest_string_length - indent_length;
     if UnicodeWidthStr::width(&*name_in) > max_size {
         let name = name_in.chars().take(max_size - 2).collect::<String>();
diff --git a/src/main.rs b/src/main.rs
index d3af480..e0e7c15 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -312,14 +312,17 @@ fn main() {
     if has_errors {
         eprintln!("Did not have permissions for all directories");
     }
-    draw_it(
-        options.is_present("display_full_paths"),
-        !options.is_present("reverse"),
-        no_colors,
-        options.is_present("no_bars"),
-        terminal_width,
-        by_filecount,
-        tree,
-        options.is_present("iso"),
-    );
+    match tree {
+        None => {}
+        Some(root_node) => draw_it(
+            options.is_present("display_full_paths"),
+            !options.is_present("reverse"),
+            no_colors,
+            options.is_present("no_bars"),
+            terminal_width,
+            by_filecount,
+            root_node,
+            options.is_present("iso"),
+        ),
+    }
 }