From ce0e14bf00276cabb5af7ca1f0b082cb4c01e849 Mon Sep 17 00:00:00 2001 From: "andy.boot" Date: Wed, 9 May 2018 10:58:32 +0100 Subject: [PATCH] =?UTF-8?q?Tweak=20output=20-=20the=20root=20node=20now=20?= =?UTF-8?q?has=20a:=20=E2=94=80=E2=94=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/display.rs | 3 ++- src/tests.rs | 54 +++++++++++++++++++++++++------------------------- 2 files changed, 29 insertions(+), 28 deletions(-) diff --git a/src/display.rs b/src/display.rs index 513f4fe..6966394 100644 --- a/src/display.rs +++ b/src/display.rs @@ -19,7 +19,7 @@ pub fn draw_it( for &(ref k, _) in to_display.iter() { if base_dirs.contains(k) { - display_node(&k, &mut found, &to_display, true, short_paths, depth, "") + display_node(&k, &mut found, &to_display, true, short_paths, depth, "─┬") } } } @@ -64,6 +64,7 @@ fn display_node>( is = is.replace("└──", " "); is = is.replace("├──", "│ "); is = is.replace("├─┬", "│ "); + is = is.replace("─┬", " "); let printable_node_slashes = node_to_print.matches('/').count(); diff --git a/src/tests.rs b/src/tests.rs index 7e5e728..648fa12 100644 --- a/src/tests.rs +++ b/src/tests.rs @@ -44,21 +44,21 @@ fn main_output(short_paths: bool) -> String { {} {} {}", - format_string("src/test_dir", true, short_paths, " 4.0K", ""), - format_string("src/test_dir/many", true, short_paths, " 4.0K", "└─┬",), + format_string("src/test_dir", true, short_paths, " 4.0K", "─┬"), + format_string("src/test_dir/many", true, short_paths, " 4.0K", " └─┬",), format_string( "src/test_dir/many/hello_file", true, short_paths, " 4.0K", - " ├──", + " ├──", ), format_string( "src/test_dir/many/a_file", false, short_paths, " 0B", - " └──", + " └──", ), ) } @@ -70,21 +70,21 @@ fn main_output(short_paths: bool) -> String { {} {} {}", - format_string("src/test_dir", true, short_paths, " 12K", ""), - format_string("src/test_dir/many", true, short_paths, " 8.0K", "└─┬",), + format_string("src/test_dir", true, short_paths, " 12K", "─┬"), + format_string("src/test_dir/many", true, short_paths, " 8.0K", " └─┬",), format_string( "src/test_dir/many/hello_file", true, short_paths, " 4.0K", - " ├──", + " ├──", ), format_string( "src/test_dir/many/a_file", false, short_paths, " 0B", - " └──", + " └──", ), ) } @@ -98,7 +98,7 @@ pub fn test_apparent_size() { true, true, " 6B", - " ├──", + " ├──", ), ); @@ -149,9 +149,9 @@ fn soft_sym_link_output(dir: &str, file_path: &str, link_name: &str) -> String { "{} {} {}", - format_string(dir, true, true, " 8.0K", ""), - format_string(file_path, true, true, " 4.0K", "├──",), - format_string(link_name, false, true, " 4.0K", "└──",), + format_string(dir, true, true, " 8.0K", "─┬"), + format_string(file_path, true, true, " 4.0K", " ├──",), + format_string(link_name, false, true, " 4.0K", " └──",), ) } @@ -161,9 +161,9 @@ fn soft_sym_link_output(dir: &str, file_path: &str, link_name: &str) -> String { "{} {} {}", - format_string(dir, true, true, " 8.0K", ""), - format_string(file_path, true, true, " 4.0K", "├──",), - format_string(link_name, false, true, " 0B", "└──",), + format_string(dir, true, true, " 8.0K", "─┬"), + format_string(file_path, true, true, " 4.0K", " ├──",), + format_string(link_name, false, true, " 0B", " └──",), ) } @@ -209,14 +209,14 @@ fn hard_link_output(dir_s: &str, file_path_s: &str, link_name_s: &str) -> (Strin let r = format!( "{} {}", - format_string(dir_s, true, true, " 4.0K", ""), - format_string(file_path_s, true, true, " 4.0K", "└──") + format_string(dir_s, true, true, " 4.0K", "─┬"), + format_string(file_path_s, true, true, " 4.0K", " └──") ); let r2 = format!( "{} {}", - format_string(dir_s, true, true, " 4.0K", ""), - format_string(link_name_s, true, true, " 4.0K", "└──") + format_string(dir_s, true, true, " 4.0K", "─┬"), + format_string(link_name_s, true, true, " 4.0K", " └──") ); (r, r2) } @@ -226,14 +226,14 @@ fn hard_link_output(dir_s: &str, file_path_s: &str, link_name_s: &str) -> (Strin let r = format!( "{} {}", - format_string(dir_s, true, true, " 8.0K", ""), - format_string(file_path_s, true, true, " 4.0K", "└──") + format_string(dir_s, true, true, " 8.0K", "─┬"), + format_string(file_path_s, true, true, " 4.0K", " └──") ); let r2 = format!( "{} {}", - format_string(dir_s, true, true, " 8.0K", ""), - format_string(link_name_s, true, true, " 4.0K", "└──") + format_string(dir_s, true, true, " 8.0K", "─┬"), + format_string(link_name_s, true, true, " 4.0K", " └──") ); (r, r2) } @@ -266,8 +266,8 @@ fn recursive_sym_link_output(dir: &str, link_name: &str) -> String { format!( "{} {}", - format_string(dir, true, true, " 4.0K", ""), - format_string(link_name, true, true, " 4.0K", "└──",), + format_string(dir, true, true, " 4.0K", "─┬"), + format_string(link_name, true, true, " 4.0K", " └──",), ) } #[cfg(target_os = "linux")] @@ -275,8 +275,8 @@ fn recursive_sym_link_output(dir: &str, link_name: &str) -> String { format!( "{} {}", - format_string(dir, true, true, " 4.0K", ""), - format_string(link_name, true, true, " 0B", "└──",), + format_string(dir, true, true, " 4.0K", "─┬"), + format_string(link_name, true, true, " 0B", " └──",), ) }