Version: Alpha version

User reported this unwrap could fail, so log an error instead of using a
naked unwrap.

Cargo.lock

@@ -118,12 +118,6 @@ dependencies = [
  "toml",
 ]
 
-[[package]]
-name = "core-foundation-sys"
-version = "0.8.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5827cebf4670468b8772dd191856768aedcb1b0278a04f989f7766351917b9dc"
-
 [[package]]
 name = "crossbeam-channel"
 version = "0.5.6"
@@ -203,11 +197,10 @@ checksum = "fea41bba32d969b513997752735605054bc0dfa92b4c56bf1189f2e174be7a10"
 
 [[package]]
 name = "du-dust"
-version = "0.8.3"
+version = "0.8.3-alpha1"
 dependencies = [
  "ansi_term",
  "assert_cmd",
- "atty",
  "clap",
  "clap_complete",
  "config-file",
@@ -217,7 +210,6 @@ dependencies = [
  "regex",
  "serde",
  "stfu8",
- "sysinfo",
  "tempfile",
  "terminal_size",
  "thousands",
@@ -330,15 +322,6 @@ dependencies = [
  "autocfg",
 ]
 
-[[package]]
-name = "ntapi"
-version = "0.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bc51db7b362b205941f71232e56c625156eb9a929f8cf74a428fd5bc094a4afc"
-dependencies = [
- "winapi",
-]
-
 [[package]]
 name = "num_cpus"
 version = "1.13.1"
@@ -535,21 +518,6 @@ dependencies = [
  "unicode-ident",
 ]
 
-[[package]]
-name = "sysinfo"
-version = "0.26.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c375d5fd899e32847b8566e10598d6e9f1d9b55ec6de3cdf9e7da4bdc51371bc"
-dependencies = [
- "cfg-if",
- "core-foundation-sys",
- "libc",
- "ntapi",
- "once_cell",
- "rayon",
- "winapi",
-]
-
 [[package]]
 name = "tempfile"
 version = "3.3.0"

Cargo.toml

@@ -1,7 +1,7 @@
 [package]
 name = "du-dust"
 description = "A more intuitive version of du"
-version = "0.8.3"
+version = "0.8.3-alpha1"
 authors = ["bootandy <bootandy@gmail.com>", "nebkor <code@ardent.nebcorp.com>"]
 edition = "2021"
 readme = "README.md"
@@ -28,7 +28,6 @@ strip = true
 
 [dependencies]
 ansi_term = "0.12"
-atty = "0.2.14"
 clap = "3.2.17"
 lscolors = "0.7"
 terminal_size = "0.1"
@@ -40,7 +39,6 @@ regex = "1"
 config-file = "0.2"
 serde = { version = "1.0", features = ["derive"] }
 directories = "4"
-sysinfo = "0.26"
 
 [target.'cfg(windows)'.dependencies]
 winapi-util = "0.1"

README.md

@@ -30,10 +30,6 @@ Because I want an easy way to see where my disk is being used.
 
 - `pacstall -I dust-bin`
 
-#### [deb-get](https://github.com/wimpysworld/deb-get) (Debian/Ubuntu)
-
-- `deb-get install du-dust`
-
 #### Windows:
 
 - Windows GNU version - works
@@ -63,7 +59,6 @@ Usage: dust -p (full-path - Show fullpath of the subdirectories)
 Usage: dust -s (apparent-size - shows the length of the file as opposed to the amount of disk space it uses)
 Usage: dust -n 30  (Shows 30 directories instead of the default [default is terminal height])
 Usage: dust -d 3  (Shows 3 levels of subdirectories)
-Usage: dust -D (Show only directories (eg dust -D))
 Usage: dust -r (reverse order of output)
 Usage: dust -H (si print sizes in powers of 1000 instead of 1024)
 Usage: dust -X ignore  (ignore all files and directories with the name 'ignore')

completions/_dust

@@ -54,8 +54,6 @@ _dust() {
 '(-d --depth)--file_types[show only these file types]' \
 '-H[print sizes in powers of 1000 (e.g., 1.1G)]' \
 '--si[print sizes in powers of 1000 (e.g., 1.1G)]' \
-'-D[Only directories will be displayed.]' \
-'--only-dir[Only directories will be displayed.]' \
 '*::inputs:' \
 && ret=0
 }

completions/_dust.ps1

@@ -60,8 +60,6 @@ Register-ArgumentCompleter -Native -CommandName 'dust' -ScriptBlock {
             [CompletionResult]::new('--file_types', 'file_types', [CompletionResultType]::ParameterName, 'show only these file types')
             [CompletionResult]::new('-H', 'H', [CompletionResultType]::ParameterName, 'print sizes in powers of 1000 (e.g., 1.1G)')
             [CompletionResult]::new('--si', 'si', [CompletionResultType]::ParameterName, 'print sizes in powers of 1000 (e.g., 1.1G)')
-            [CompletionResult]::new('-D', 'D', [CompletionResultType]::ParameterName, 'Only directories will be displayed.')
-            [CompletionResult]::new('--only-dir', 'only-dir', [CompletionResultType]::ParameterName, 'Only directories will be displayed.')
             break
         }
     })

completions/dust.bash

@@ -19,7 +19,7 @@ _dust() {
 
     case "${cmd}" in
         dust)
-            opts="-h -V -d -n -p -X -x -s -r -c -b -z -f -i -v -e -t -w -H -D --help --version --depth --number-of-lines --full-paths --ignore-directory --limit-filesystem --apparent-size --reverse --no-colors --no-percent-bars --min-size --skip-total --filecount --ignore_hidden --invert-filter --filter --file_types --terminal_width --si --only-dir <inputs>..."
+            opts="-h -V -d -n -p -X -x -s -r -c -b -z -f -i -v -e -t -w -H --help --version --depth --number-of-lines --full-paths --ignore-directory --limit-filesystem --apparent-size --reverse --no-colors --no-percent-bars --min-size --skip-total --filecount --ignore_hidden --invert-filter --filter --file_types --terminal_width --si <inputs>..."
             if [[ ${cur} == -* || ${COMP_CWORD} -eq 1 ]] ; then
                 COMPREPLY=( $(compgen -W "${opts}" -- "${cur}") )
                 return 0

completions/dust.elv

@@ -57,8 +57,6 @@ set edit:completion:arg-completer[dust] = {|@words|
             cand --file_types 'show only these file types'
             cand -H 'print sizes in powers of 1000 (e.g., 1.1G)'
             cand --si 'print sizes in powers of 1000 (e.g., 1.1G)'
-            cand -D 'Only directories will be displayed.'
-            cand --only-dir 'Only directories will be displayed.'
         }
     ]
     $completions[$command]

completions/dust.fish

@@ -18,4 +18,3 @@ complete -c dust -s f -l filecount -d 'Directory \'size\' is number of child fil
 complete -c dust -s i -l ignore_hidden -d 'Do not display hidden files'
 complete -c dust -s t -l file_types -d 'show only these file types'
 complete -c dust -s H -l si -d 'print sizes in powers of 1000 (e.g., 1.1G)'
-complete -c dust -s D -l only-dir -d 'Only directories will be displayed.'

src/cli.rs

@@ -131,11 +131,5 @@ pub fn build_cli() -> Command<'static> {
                 .long("si")
                 .help("print sizes in powers of 1000 (e.g., 1.1G)")
         )
-        .arg(Arg::new("inputs").multiple_occurrences(true))
+        .arg(Arg::new("inputs").multiple_occurrences(true).default_value("."))
-        .arg(
-            Arg::new("only_dir")
-                .short('D')
-                .long("only-dir")
-                .help("Only directories will be displayed."), 
-        )
 }

src/config.rs

@@ -19,7 +19,6 @@ pub struct Config {
     pub ignore_hidden: Option<bool>,
     pub iso: Option<bool>,
     pub min_size: Option<String>,
-    pub only_dir: Option<bool>,
 }
 
 impl Config {
@@ -62,9 +61,6 @@ impl Config {
             size_from_param
         }
     }
-    pub fn get_only_dir(&self, options: &ArgMatches) -> bool {
-        Some(true) == self.only_dir || options.is_present("only_dir")
-    }
 }
 
 fn convert_min_size(input: &str, iso: bool) -> Option<usize> {

src/dir_walker.rs

@@ -31,13 +31,12 @@ pub struct WalkData<'a> {
 pub fn walk_it(dirs: HashSet<PathBuf>, walk_data: WalkData) -> (Vec<Node>, bool) {
     let permissions_flag = AtomicBool::new(false);
 
-    let mut inodes = HashSet::new();
     let top_level_nodes: Vec<_> = dirs
         .into_iter()
         .filter_map(|d| {
             clean_inodes(
                 walk(d, &permissions_flag, &walk_data, 0)?,
-                &mut inodes,
+                &mut HashSet::new(),
                 walk_data.use_apparent_size,
             )
         })

src/display.rs

@@ -88,7 +88,7 @@ impl DrawData<'_> {
         let mut num_not_my_bar = (chars_in_bar as i32) - num_bars as i32;
 
         let mut new_bar = "".to_string();
-        let idx = 5 - level.clamp(1, 4);
+        let idx = 5 - min(4, max(1, level));
 
         for c in self.percent_bar.chars() {
             num_not_my_bar -= 1;
@@ -141,10 +141,10 @@ pub fn draw_it(
     let longest_string_length =
         find_longest_dir_name(root_node, num_indent_chars, allowed_width, !use_full_path);
 
-    let max_bar_length = if no_percent_bars || longest_string_length + 7 >= allowed_width {
+    let max_bar_length = if no_percent_bars || longest_string_length + 7 >= allowed_width as usize {
         0
     } else {
-        allowed_width - longest_string_length - 7
+        allowed_width as usize - longest_string_length - 7
     };
 
     let first_size_bar = repeat(BLOCKS[0]).take(max_bar_length).collect();

src/filter.rs

@@ -8,7 +8,6 @@ use std::path::PathBuf;
 pub fn get_biggest(
     top_level_nodes: Vec<Node>,
     min_size: Option<usize>,
-    only_dir: bool,
     n: usize,
     depth: usize,
     using_a_filter: bool,
@@ -20,25 +19,18 @@ 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, &root, depth, heap);
 
-    if number_top_level_nodes > 1 {
+    for _ in number_top_level_nodes..n {
-        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) => {
                 allowed_nodes.insert(line.name.as_path());
-                heap = add_children(using_a_filter, min_size, only_dir, line, depth, heap);
+                heap = add_children(using_a_filter, min_size, line, depth, heap);
             }
             None => break,
         }
@@ -49,22 +41,15 @@ pub fn get_biggest(
 fn add_children<'a>(
     using_a_filter: bool,
     min_size: Option<usize>,
-    only_dir: bool,
     file_or_folder: &'a Node,
     depth: usize,
     mut heap: BinaryHeap<&'a Node>,
 ) -> BinaryHeap<&'a Node> {
     if depth > file_or_folder.depth {
-        heap.extend(
+        heap.extend(file_or_folder.children.iter().filter(|c| match min_size {
-            file_or_folder
+            Some(ms) => c.size > ms as u64,
-                .children
+            None => !using_a_filter || c.name.is_file() || c.size > 0,
-                .iter()
+        }))
-                .filter(|c| match min_size {
-                    Some(ms) => c.size > ms as u64,
-                    None => !using_a_filter || c.name.is_file() || c.size > 0,
-                })
-                .filter(|c| if only_dir { c.name.is_dir() } else { true }),
-        )
     }
     heap
 }

src/main.rs

@@ -11,9 +11,7 @@ mod utils;
 
 use crate::cli::build_cli;
 use std::collections::HashSet;
-use std::io::BufRead;
 use std::process;
-use sysinfo::{System, SystemExt};
 
 use self::display::draw_it;
 use clap::Values;
@@ -21,7 +19,6 @@ use config::get_config;
 use dir_walker::{walk_it, WalkData};
 use filter::get_biggest;
 use filter_type::get_all_file_types;
-use rayon::ThreadPoolBuildError;
 use regex::Regex;
 use std::cmp::max;
 use std::path::PathBuf;
@@ -92,28 +89,14 @@ fn get_regex_value(maybe_value: Option<Values>) -> Vec<Regex> {
         .collect()
 }
 
-// Returns a list of lines from stdin or `None` if there's nothing to read
-fn get_lines_from_stdin() -> Option<Vec<String>> {
-    atty::isnt(atty::Stream::Stdin).then(|| {
-        std::io::stdin()
-            .lock()
-            .lines()
-            .collect::<Result<_, _>>()
-            .expect("Error reading from stdin")
-    })
-}
-
 fn main() {
     let options = build_cli().get_matches();
     let config = get_config();
-    let stdin_lines = get_lines_from_stdin();
 
-    let target_dirs = match options.values_of("inputs") {
+    let target_dirs = options
-        Some(values) => values.collect(),
+        .values_of("inputs")
-        None => stdin_lines.as_ref().map_or(vec!["."], |lines| {
+        .expect("Should be a default value here")
-            lines.iter().map(String::as_str).collect()
+        .collect();
-        }),
-    };
 
     let summarize_file_types = options.is_present("types");
 
@@ -171,7 +154,11 @@ fn main() {
         by_filecount,
         ignore_hidden: config.get_ignore_hidden(&options),
     };
-    let _rayon = init_rayon();
+    // Larger stack size to handle cases with lots of nested directories
+    rayon::ThreadPoolBuilder::new()
+        .stack_size(usize::pow(1024, 3))
+        .build_global()
+        .unwrap_or_else(|e| eprintln!("Warning: Could not configure threads {:?}", e));
 
     let iso = config.get_iso(&options);
     let (top_level_nodes, has_errors) = walk_it(simplified_dirs, walk_data);
@@ -181,7 +168,6 @@ fn main() {
         false => get_biggest(
             top_level_nodes,
             config.get_min_size(&options, iso),
-            config.get_only_dir(&options),
             number_of_lines,
             depth,
             options.values_of("filter").is_some() || options.value_of("invert_filter").is_some(),
@@ -205,19 +191,3 @@ fn main() {
         )
     }
 }
-
-fn init_rayon() -> Result<(), ThreadPoolBuildError> {
-    let large_stack = usize::pow(1024, 3);
-    let mut s = System::new();
-    s.refresh_memory();
-    let available = s.available_memory();
-
-    if available > large_stack.try_into().unwrap() {
-        // Larger stack size to handle cases with lots of nested directories
-        rayon::ThreadPoolBuilder::new()
-            .stack_size(large_stack)
-            .build_global()
-    } else {
-        Ok(())
-    }
-}

tests/test_flags.rs

@@ -73,7 +73,6 @@ 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() {

tests/tests_symlinks.rs

@@ -17,18 +17,6 @@ fn build_temp_file(dir: &TempDir) -> PathBuf {
     file_path
 }
 
-fn link_it(link_path: PathBuf, file_path_s: &str, is_soft: bool) -> String {
-    let link_name_s = link_path.to_str().unwrap();
-    let mut c = Command::new("ln");
-    if is_soft {
-        c.arg("-s");
-    }
-    c.arg(file_path_s);
-    c.arg(link_name_s);
-    assert!(c.output().is_ok());
-    return link_name_s.into();
-}
-
 #[cfg_attr(target_os = "windows", ignore)]
 #[test]
 pub fn test_soft_sym_link() {
@@ -38,7 +26,13 @@ pub fn test_soft_sym_link() {
     let file_path_s = file.to_str().unwrap();
 
     let link_name = dir.path().join("the_link");
-    let link_name_s = link_it(link_name, file_path_s, true);
+    let link_name_s = link_name.to_str().unwrap();
+    let c = Command::new("ln")
+        .arg("-s")
+        .arg(file_path_s)
+        .arg(link_name_s)
+        .output();
+    assert!(c.is_ok());
 
     let c = format!(" ├── {}", link_name_s);
     let b = format!(" ┌── {}", file_path_s);
@@ -47,7 +41,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;
 
@@ -67,14 +61,19 @@ pub fn test_hard_sym_link() {
     let file_path_s = file.to_str().unwrap();
 
     let link_name = dir.path().join("the_link");
-    link_it(link_name, file_path_s, false);
+    let link_name_s = link_name.to_str().unwrap();
+    let c = Command::new("ln")
+        .arg(file_path_s)
+        .arg(link_name_s)
+        .output();
+    assert!(c.is_ok());
 
     let file_output = format!(" ┌── {}", file_path_s);
     let dirs_output = format!("─┴ {}", dir_s);
 
     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.
@@ -83,34 +82,6 @@ pub fn test_hard_sym_link() {
     assert!(output.contains(file_output.as_str()));
 }
 
-#[cfg_attr(target_os = "windows", ignore)]
-#[test]
-pub fn test_hard_sym_link_no_dup_multi_arg() {
-    let dir = Builder::new().tempdir().unwrap();
-    let dir_link = Builder::new().tempdir().unwrap();
-    let file = build_temp_file(&dir);
-    let dir_s = dir.path().to_str().unwrap();
-    let dir_link_s = dir_link.path().to_str().unwrap();
-    let file_path_s = file.to_str().unwrap();
-
-    let link_name = dir_link.path().join("the_link");
-    let link_name_s = link_it(link_name, file_path_s, false);
-
-    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", "-b", dir_link_s, dir_s])
-        .unwrap()
-        .stdout;
-
-    // The link or the file should appear but not both
-    let output = str::from_utf8(&output).unwrap();
-    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);
-}
-
 #[cfg_attr(target_os = "windows", ignore)]
 #[test]
 pub fn test_recursive_sym_link() {
@@ -118,7 +89,14 @@ pub fn test_recursive_sym_link() {
     let dir_s = dir.path().to_str().unwrap();
 
     let link_name = dir.path().join("the_link");
-    let link_name_s = link_it(link_name, dir_s, true);
+    let link_name_s = link_name.to_str().unwrap();
+
+    let c = Command::new("ln")
+        .arg("-s")
+        .arg(dir_s)
+        .arg(link_name_s)
+        .output();
+    assert!(c.is_ok());
 
     let a = format!("─┬ {}", dir_s);
     let b = format!(" └── {}", link_name_s);
@@ -129,8 +107,7 @@ pub fn test_recursive_sym_link() {
         .arg("-c")
         .arg("-r")
         .arg("-s")
-        .arg("-w")
+        .arg("-w 999")
-        .arg("999")
         .arg(dir_s)
         .unwrap()
         .stdout;