From 53af0d486d2fd82cf2e658a64983faabced0ae52 Mon Sep 17 00:00:00 2001 From: Ryan Winograd Date: Thu, 3 Sep 2020 15:19:53 -0500 Subject: [PATCH] Change behavior of depth flag Change the depth flag so that it only changes the depth of displayed subdirectories, not the depth of the directory size calculation (i.e., changing --depth does not change the displayed directory size, rather it only changes how many levels of subdirectories are shown). --- src/main.rs | 1 - src/utils/mod.rs | 7 +------ 2 files changed, 1 insertion(+), 7 deletions(-) diff --git a/src/main.rs b/src/main.rs index c727cc2..7c8685a 100644 --- a/src/main.rs +++ b/src/main.rs @@ -181,7 +181,6 @@ fn main() { limit_filesystem, by_filecount, show_hidden, - depth, ); let sorted_data = sort(nodes); let biggest_ones = { diff --git a/src/utils/mod.rs b/src/utils/mod.rs index 0fc2acf..d7d173c 100644 --- a/src/utils/mod.rs +++ b/src/utils/mod.rs @@ -82,7 +82,6 @@ fn prepare_walk_dir_builder>( top_level_names: &HashSet

, limit_filesystem: bool, show_hidden: bool, - max_depth: Option, ) -> WalkBuilder { let mut it = top_level_names.iter(); let mut builder = WalkBuilder::new(it.next().unwrap()); @@ -99,8 +98,6 @@ fn prepare_walk_dir_builder>( builder.same_file_system(true); } - builder.max_depth(max_depth); - for b in it { builder.add(b); } @@ -114,7 +111,6 @@ pub fn get_dir_tree>( limit_filesystem: bool, by_filecount: bool, show_hidden: bool, - max_depth: Option, ) -> (bool, HashMap) { let (tx, rx) = channel::bounded::(1000); @@ -123,8 +119,7 @@ pub fn get_dir_tree>( let t2 = HashSet::from_iter(top_level_names.iter().map(|p| p.as_ref().to_path_buf())); let t = create_reader_thread(rx, t2, apparent_size); - let walk_dir_builder = - prepare_walk_dir_builder(top_level_names, limit_filesystem, show_hidden, max_depth); + let walk_dir_builder = prepare_walk_dir_builder(top_level_names, limit_filesystem, show_hidden); walk_dir_builder.build_parallel().run(|| { let txc = tx.clone();