Fix: depth=0 bug for multiple arguments

https://github.com/bootandy/dust/issues/282
This commit is contained in:
andy.boot
2023-01-04 22:59:38 +00:00
parent f546dbbede
commit 5e607cf210
3 changed files with 17 additions and 10 deletions
+9 -2
View File
@@ -20,13 +20,20 @@ pub fn get_biggest(
let mut heap = BinaryHeap::new();
let number_top_level_nodes = top_level_nodes.len();
let root = get_new_root(top_level_nodes);
let mut allowed_nodes = HashSet::new();
allowed_nodes.insert(root.name.as_path());
heap = add_children(using_a_filter, min_size, only_dir, &root, depth, heap);
for _ in number_top_level_nodes..n {
if number_top_level_nodes > 1 {
heap = add_children(using_a_filter, min_size, only_dir, &root, usize::MAX, heap);
} else {
heap = add_children(using_a_filter, min_size, only_dir, &root, depth, heap);
}
let number_of_lines_in_output = n - number_top_level_nodes;
for _ in 0..number_of_lines_in_output {
let line = heap.pop();
match line {
Some(line) => {
+1
View File
@@ -73,6 +73,7 @@ pub fn test_ignore_dir() {
let output = build_command(vec!["-c", "-X", "dir_substring", "tests/test_dir2/"]);
assert!(!output.contains("dir_substring"));
}
// Add test for multiple dirs - with -d 0 and maybe -d 1 check the
#[test]
pub fn test_with_bad_param() {
+7 -8
View File
@@ -47,7 +47,7 @@ pub fn test_soft_sym_link() {
let mut cmd = Command::cargo_bin("dust").unwrap();
// Mac test runners create long filenames in tmp directories
let output = cmd
.args(["-p", "-c", "-s", "-w 999", dir_s])
.args(["-p", "-c", "-s", "-w", "999", dir_s])
.unwrap()
.stdout;
@@ -74,7 +74,7 @@ pub fn test_hard_sym_link() {
let mut cmd = Command::cargo_bin("dust").unwrap();
// Mac test runners create long filenames in tmp directories
let output = cmd.args(["-p", "-c", "-w 999", dir_s]).unwrap().stdout;
let output = cmd.args(["-p", "-c", "-w", "999", dir_s]).unwrap().stdout;
// The link should not appear in the output because multiple inodes are now ordered
// then filtered.
@@ -100,17 +100,15 @@ pub fn test_hard_sym_link_no_dup_multi_arg() {
// Mac test runners create long filenames in tmp directories
let output = cmd
.args(["-p", "-c", "-w 999", "-b", dir_link_s, dir_s])
.args(["-p", "-c", "-w", "999", "-b", dir_link_s, dir_s])
.unwrap()
.stdout;
// The link or the file should appeart but not both
// The link or the file should appear but not both
let output = str::from_utf8(&output).unwrap();
println!("cmd:\n{:?}", cmd);
println!("output:\n{:?}", output);
let has_file_only = output.contains(file_path_s) && !output.contains(&link_name_s);
let has_link_only = !output.contains(file_path_s) && output.contains(&link_name_s);
assert!(has_file_only || has_link_only)
assert!(has_file_only || has_link_only);
}
#[cfg_attr(target_os = "windows", ignore)]
@@ -131,7 +129,8 @@ pub fn test_recursive_sym_link() {
.arg("-c")
.arg("-r")
.arg("-s")
.arg("-w 999")
.arg("-w")
.arg("999")
.arg(dir_s)
.unwrap()
.stdout;