Increment version

fix: Stop progress indicator crashing into stderr
Feature: Add flag for screen readers
2025-12-05 20:40:11 -08:00 · 2023-01-29 10:24:36 +00:00 · 2023-01-29 10:24:36 +00:00 · 2023-01-29 09:52:10 +00:00 · 2023-01-29 09:52:10 +00:00 · 2023-01-29 09:52:10 +00:00
23 changed files with 947 additions and 205 deletions
--- a/.gitignore
+++ b/.gitignore
@@ -6,4 +6,7 @@
 **/*.rs.bk
 *.swp
 .vscode/*
-*.idea/*
+*.idea/*
+
+#ignore macos files
+.DS_Store
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -22,9 +22,9 @@ dependencies = [

 [[package]]
 name = "assert_cmd"
-version = "1.0.8"
+version = "2.0.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c98233c6673d8601ab23e77eb38f999c51100d46c5703b17288c57fddf3a1ffe"
+checksum = "9834fcc22e0874394a010230586367d4a3e9f11b560f469262678547e1d2575e"
 dependencies = [
 "bstr",
 "doc-comment",
@@ -59,15 +59,22 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"

 [[package]]
 name = "bstr"
-version = "0.2.17"
+version = "1.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ba3569f383e8f1598449f1a423e72e99569137b47740b1da11ef19af3d5c3223"
+checksum = "b45ea9b00a7b3f2988e9a65ad3917e62123c38dba709b666506207be96d1790b"
 dependencies = [
- "lazy_static",
 "memchr",
+ "once_cell",
 "regex-automata",
+ "serde",
 ]

+[[package]]
+name = "cc"
+version = "1.0.78"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a20104e2335ce8a659d6dd92a51a767a0c062599c73b343fd152cb401e828c3d"
+
 [[package]]
 name = "cfg-if"
 version = "1.0.0"
@@ -107,6 +114,16 @@ dependencies = [
 "os_str_bytes",
 ]

+[[package]]
+name = "clap_mangen"
+version = "0.1.11"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "105180c05a72388d5f5e4e4f6c79eecb92497bda749fa8f963a16647c5d5377f"
+dependencies = [
+ "clap",
+ "roff",
+]
+
 [[package]]
 name = "config-file"
 version = "0.2.3"
@@ -118,6 +135,12 @@ 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"
@@ -197,12 +220,14 @@ checksum = "fea41bba32d969b513997752735605054bc0dfa92b4c56bf1189f2e174be7a10"

 [[package]]
 name = "du-dust"
-version = "0.8.2"
+version = "0.8.4"
 dependencies = [
 "ansi_term",
 "assert_cmd",
+ "atty",
 "clap",
 "clap_complete",
+ "clap_mangen",
 "config-file",
 "directories",
 "lscolors",
@@ -210,6 +235,7 @@ dependencies = [
 "regex",
 "serde",
 "stfu8",
+ "sysinfo",
 "tempfile",
 "terminal_size",
 "thousands",
@@ -223,6 +249,27 @@ version = "1.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "90e5c1c8368803113bf0c9584fc495a58b86dc8a29edbf8fe877d21d9507e797"

+[[package]]
+name = "errno"
+version = "0.2.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f639046355ee4f37944e44f60642c6f3a7efa3cf6b78c78a0d989a8ce6c396a1"
+dependencies = [
+ "errno-dragonfly",
+ "libc",
+ "winapi",
+]
+
+[[package]]
+name = "errno-dragonfly"
+version = "0.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "aa68f1b12764fab894d2755d2518754e71b4fd80ecfb822714a1206c2aab39bf"
+dependencies = [
+ "cc",
+ "libc",
+]
+
 [[package]]
 name = "fastrand"
 version = "1.8.0"
@@ -277,6 +324,16 @@ dependencies = [
 "cfg-if",
 ]

+[[package]]
+name = "io-lifetimes"
+version = "1.0.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e7d6c6f8c91b4b9ed43484ad1a938e393caf35960fce7f82a040497207bd8e9e"
+dependencies = [
+ "libc",
+ "windows-sys",
+]
+
 [[package]]
 name = "itertools"
 version = "0.10.3"
@@ -294,17 +351,24 @@ checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646"

 [[package]]
 name = "libc"
-version = "0.2.132"
+version = "0.2.139"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8371e4e5341c3a96db127eb2465ac681ced4c433e01dd0e938adbef26ba93ba5"
+checksum = "201de327520df007757c1f0adce6e827fe8562fbc28bfd9c15571c66ca1f5f79"
+
+[[package]]
+name = "linux-raw-sys"
+version = "0.1.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f051f77a7c8e6957c0696eac88f26b0117e54f52d3fc682ab19397a8812846a4"

 [[package]]
 name = "lscolors"
-version = "0.7.1"
+version = "0.13.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d24b894c45c9da468621cdd615a5a79ee5e5523dd4f75c76ebc03d458940c16e"
+checksum = "c2dedc85d67baf5327114fad78ab9418f8893b1121c17d5538dd11005ad1ddf2"
 dependencies = [
 "ansi_term",
+ "nu-ansi-term",
 ]

 [[package]]
@@ -322,6 +386,25 @@ 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 = "nu-ansi-term"
+version = "0.46.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "77a8165726e8236064dbb45459242600304b42a5ea24ee2948e18e023bf7ba84"
+dependencies = [
+ "overload",
+ "winapi",
+]
+
 [[package]]
 name = "num_cpus"
 version = "1.13.1"
@@ -334,9 +417,9 @@ dependencies = [

 [[package]]
 name = "once_cell"
-version = "1.13.1"
+version = "1.17.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "074864da206b4973b84eb91683020dbefd6a8c3f0f38e054d93954e891935e4e"
+checksum = "6f61fba1741ea2b3d6a1e3178721804bb716a68a6aeba1149b5d52e3d464ea66"

 [[package]]
 name = "os_str_bytes"
@@ -344,6 +427,12 @@ version = "6.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9ff7415e9ae3fff1225851df9e0d9e4e5479f947619774677a63572e55e80eff"

+[[package]]
+name = "overload"
+version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b15813163c1d831bf4a13c3610c05c0d03b39feb07f7e09fa234dac9b15aaf39"
+
 [[package]]
 name = "predicates"
 version = "2.1.1"
@@ -465,6 +554,26 @@ dependencies = [
 "winapi",
 ]

+[[package]]
+name = "roff"
+version = "0.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b833d8d034ea094b1ea68aa6d5c740e0d04bad9d16568d08ba6f76823a114316"
+
+[[package]]
+name = "rustix"
+version = "0.36.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d4fdebc4b395b7fbb9ab11e462e20ed9051e7b16e42d24042c776eca0ac81b03"
+dependencies = [
+ "bitflags",
+ "errno",
+ "io-lifetimes",
+ "libc",
+ "linux-raw-sys",
+ "windows-sys",
+]
+
 [[package]]
 name = "scopeguard"
 version = "1.1.0"
@@ -518,6 +627,21 @@ dependencies = [
 "unicode-ident",
 ]

+[[package]]
+name = "sysinfo"
+version = "0.27.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "975fe381e0ecba475d4acff52466906d95b153a40324956552e027b2a9eaa89e"
+dependencies = [
+ "cfg-if",
+ "core-foundation-sys",
+ "libc",
+ "ntapi",
+ "once_cell",
+ "rayon",
+ "winapi",
+]
+
 [[package]]
 name = "tempfile"
 version = "3.3.0"
@@ -543,12 +667,12 @@ dependencies = [

 [[package]]
 name = "terminal_size"
-version = "0.1.17"
+version = "0.2.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "633c1a546cee861a1a6d0dc69ebeca693bf4296661ba7852b9d21d159e0506df"
+checksum = "cb20089a8ba2b69debd491f8d2d023761cbf196e999218c591fa1e7e15a21907"
 dependencies = [
- "libc",
- "winapi",
+ "rustix",
+ "windows-sys",
 ]

 [[package]]
@@ -655,3 +779,60 @@ name = "winapi-x86_64-pc-windows-gnu"
 version = "0.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
+
+[[package]]
+name = "windows-sys"
+version = "0.42.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5a3e1820f08b8513f676f7ab6c1f99ff312fb97b553d30ff4dd86f9f15728aa7"
+dependencies = [
+ "windows_aarch64_gnullvm",
+ "windows_aarch64_msvc",
+ "windows_i686_gnu",
+ "windows_i686_msvc",
+ "windows_x86_64_gnu",
+ "windows_x86_64_gnullvm",
+ "windows_x86_64_msvc",
+]
+
+[[package]]
+name = "windows_aarch64_gnullvm"
+version = "0.42.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8c9864e83243fdec7fc9c5444389dcbbfd258f745e7853198f365e3c4968a608"
+
+[[package]]
+name = "windows_aarch64_msvc"
+version = "0.42.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4c8b1b673ffc16c47a9ff48570a9d85e25d265735c503681332589af6253c6c7"
+
+[[package]]
+name = "windows_i686_gnu"
+version = "0.42.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "de3887528ad530ba7bdbb1faa8275ec7a1155a45ffa57c37993960277145d640"
+
+[[package]]
+name = "windows_i686_msvc"
+version = "0.42.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bf4d1122317eddd6ff351aa852118a2418ad4214e6613a50e0191f7004372605"
+
+[[package]]
+name = "windows_x86_64_gnu"
+version = "0.42.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c1040f221285e17ebccbc2591ffdc2d44ee1f9186324dd3e84e99ac68d699c45"
+
+[[package]]
+name = "windows_x86_64_gnullvm"
+version = "0.42.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "628bfdf232daa22b0d64fdb62b09fcc36bb01f05a3939e20ab73aaf9470d0463"
+
+[[package]]
+name = "windows_x86_64_msvc"
+version = "0.42.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "447660ad36a13288b1db4d4248e857b510e8c3a225c822ba4fb748c0aafecffd"
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "du-dust"
 description = "A more intuitive version of du"
-version = "0.8.2"
+version = "0.8.4"
 authors = ["bootandy <bootandy@gmail.com>", "nebkor <code@ardent.nebcorp.com>"]
 edition = "2021"
 readme = "README.md"
@@ -28,9 +28,10 @@ strip = true

 [dependencies]
 ansi_term = "0.12"
+atty = "0.2.14"
 clap = "3.2.17"
-lscolors = "0.7"
-terminal_size = "0.1"
+lscolors = "0.13"
+terminal_size = "0.2"
 unicode-width = "0.1"
 rayon = "1"
 thousands = "0.2"
@@ -39,17 +40,19 @@ regex = "1"
 config-file = "0.2"
 serde = { version = "1.0", features = ["derive"] }
 directories = "4"
+sysinfo = "0.27"

 [target.'cfg(windows)'.dependencies]
 winapi-util = "0.1"

 [dev-dependencies]
-assert_cmd = "1"
+assert_cmd = "2"
 tempfile = "=3"

 [build-dependencies]
 clap = "3.2.17"
 clap_complete = "3.2.4"
+clap_mangen = "0.1"

 [[test]]
 name = "integration"
--- a/2
+++ b/2
@@ -186,7 +186,7 @@
      same "printed page" as the copyright notice for easier
      identification within third-party archives.

-   Copyright [yyyy] [name of copyright owner]
+   Copyright [2023] [andrew boot]

   Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
--- a/README.md
+++ b/README.md
@@ -30,6 +30,10 @@ 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
@@ -59,6 +63,7 @@ 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')
--- a/build.rs
+++ b/build.rs
@@ -1,5 +1,8 @@
 use clap_complete::{generate_to, shells::*};
+use clap_mangen::Man;
+use std::fs::File;
 use std::io::Error;
+use std::path::Path;

 include!("src/cli.rs");

@@ -14,5 +17,11 @@ fn main() -> Result<(), Error> {
    generate_to(PowerShell, &mut cmd, app_name, outdir)?;
    generate_to(Elvish, &mut cmd, app_name, outdir)?;

+    let file = Path::new("man-page").join("dust.1");
+    std::fs::create_dir_all("man-page")?;
+    let mut file = File::create(file)?;
+
+    Man::new(cmd).render(&mut file)?;
+
    Ok(())
 }
--- a/ci/how2publish.txt
+++ b/ci/how2publish.txt
@@ -1,4 +1,8 @@
 # ----------- To do a release ---------
+# Compare times of runs to check no drastic slow down:
+#  time target/release/dust   ~/dev
+#  time dust ~dev
+
 # edit version in cargo.toml
 # tag a commit and push (increment version in Cargo.toml first):
 #   git tag v0.4.5
--- a/completions/_dust
+++ b/completions/_dust
@@ -35,6 +35,8 @@ _dust() {
 '--version[Print version information]' \
 '-p[Subdirectories will not have their path shortened]' \
 '--full-paths[Subdirectories will not have their path shortened]' \
+'-L[dereference sym links - Treat sym links as directories and go into them]' \
+'--dereference-links[dereference sym links - Treat sym links as directories and go into them]' \
 '-x[Only count the files and directories on the same filesystem as the supplied directory]' \
 '--limit-filesystem[Only count the files and directories on the same filesystem as the supplied directory]' \
 '-s[Use file length instead of blocks]' \
@@ -45,15 +47,23 @@ _dust() {
 '--no-colors[No colors will be printed (Useful for commands like: watch)]' \
 '-b[No percent bars or percentages will be displayed]' \
 '--no-percent-bars[No percent bars or percentages will be displayed]' \
+'-R[For screen readers. Removes bars. Adds new column: depth level (May want to use -p too for full path)]' \
+'--screen-reader[For screen readers. Removes bars. Adds new column: depth level (May want to use -p too for full path)]' \
 '--skip-total[No total row will be displayed]' \
 '-f[Directory '\''size'\'' is number of child files/dirs not disk size]' \
 '--filecount[Directory '\''size'\'' is number of child files/dirs not disk size]' \
 '-i[Do not display hidden files]' \
 '--ignore_hidden[Do not display hidden files]' \
-'(-d --depth)-t[show only these file types]' \
-'(-d --depth)--file_types[show only these file types]' \
+'(-d --depth -D --only-dir)-t[show only these file types]' \
+'(-d --depth -D --only-dir)--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)]' \
+'-P[Disable the progress indication.]' \
+'--no-progress[Disable the progress indication.]' \
+'(-F --only-file -t --file_types)-D[Only directories will be displayed.]' \
+'(-F --only-file -t --file_types)--only-dir[Only directories will be displayed.]' \
+'(-D --only-dir)-F[Only files will be displayed. (Finds your largest files)]' \
+'(-D --only-dir)--only-file[Only files will be displayed. (Finds your largest files)]' \
 '*::inputs:' \
 && ret=0
 }
--- a/completions/_dust.ps1
+++ b/completions/_dust.ps1
@@ -41,6 +41,8 @@ Register-ArgumentCompleter -Native -CommandName 'dust' -ScriptBlock {
            [CompletionResult]::new('--version', 'version', [CompletionResultType]::ParameterName, 'Print version information')
            [CompletionResult]::new('-p', 'p', [CompletionResultType]::ParameterName, 'Subdirectories will not have their path shortened')
            [CompletionResult]::new('--full-paths', 'full-paths', [CompletionResultType]::ParameterName, 'Subdirectories will not have their path shortened')
+            [CompletionResult]::new('-L', 'L', [CompletionResultType]::ParameterName, 'dereference sym links - Treat sym links as directories and go into them')
+            [CompletionResult]::new('--dereference-links', 'dereference-links', [CompletionResultType]::ParameterName, 'dereference sym links - Treat sym links as directories and go into them')
            [CompletionResult]::new('-x', 'x', [CompletionResultType]::ParameterName, 'Only count the files and directories on the same filesystem as the supplied directory')
            [CompletionResult]::new('--limit-filesystem', 'limit-filesystem', [CompletionResultType]::ParameterName, 'Only count the files and directories on the same filesystem as the supplied directory')
            [CompletionResult]::new('-s', 's', [CompletionResultType]::ParameterName, 'Use file length instead of blocks')
@@ -51,6 +53,8 @@ Register-ArgumentCompleter -Native -CommandName 'dust' -ScriptBlock {
            [CompletionResult]::new('--no-colors', 'no-colors', [CompletionResultType]::ParameterName, 'No colors will be printed (Useful for commands like: watch)')
            [CompletionResult]::new('-b', 'b', [CompletionResultType]::ParameterName, 'No percent bars or percentages will be displayed')
            [CompletionResult]::new('--no-percent-bars', 'no-percent-bars', [CompletionResultType]::ParameterName, 'No percent bars or percentages will be displayed')
+            [CompletionResult]::new('-R', 'R', [CompletionResultType]::ParameterName, 'For screen readers. Removes bars. Adds new column: depth level (May want to use -p too for full path)')
+            [CompletionResult]::new('--screen-reader', 'screen-reader', [CompletionResultType]::ParameterName, 'For screen readers. Removes bars. Adds new column: depth level (May want to use -p too for full path)')
            [CompletionResult]::new('--skip-total', 'skip-total', [CompletionResultType]::ParameterName, 'No total row will be displayed')
            [CompletionResult]::new('-f', 'f', [CompletionResultType]::ParameterName, 'Directory ''size'' is number of child files/dirs not disk size')
            [CompletionResult]::new('--filecount', 'filecount', [CompletionResultType]::ParameterName, 'Directory ''size'' is number of child files/dirs not disk size')
@@ -60,6 +64,12 @@ 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('-P', 'P', [CompletionResultType]::ParameterName, 'Disable the progress indication.')
+            [CompletionResult]::new('--no-progress', 'no-progress', [CompletionResultType]::ParameterName, 'Disable the progress indication.')
+            [CompletionResult]::new('-D', 'D', [CompletionResultType]::ParameterName, 'Only directories will be displayed.')
+            [CompletionResult]::new('--only-dir', 'only-dir', [CompletionResultType]::ParameterName, 'Only directories will be displayed.')
+            [CompletionResult]::new('-F', 'F', [CompletionResultType]::ParameterName, 'Only files will be displayed. (Finds your largest files)')
+            [CompletionResult]::new('--only-file', 'only-file', [CompletionResultType]::ParameterName, 'Only files will be displayed. (Finds your largest files)')
            break
        }
    })
--- a/completions/dust.bash
+++ b/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 --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>..."
+            opts="-h -V -d -n -p -X -L -x -s -r -c -b -z -R -f -i -v -e -t -w -H -P -D -F --help --version --depth --number-of-lines --full-paths --ignore-directory --dereference-links --limit-filesystem --apparent-size --reverse --no-colors --no-percent-bars --min-size --screen-reader --skip-total --filecount --ignore_hidden --invert-filter --filter --file_types --terminal_width --si --no-progress --only-dir --only-file <inputs>..."
            if [[ ${cur} == -* || ${COMP_CWORD} -eq 1 ]] ; then
                COMPREPLY=( $(compgen -W "${opts}" -- "${cur}") )
                return 0
--- a/completions/dust.elv
+++ b/completions/dust.elv
@@ -38,6 +38,8 @@ set edit:completion:arg-completer[dust] = {|@words|
            cand --version 'Print version information'
            cand -p 'Subdirectories will not have their path shortened'
            cand --full-paths 'Subdirectories will not have their path shortened'
+            cand -L 'dereference sym links - Treat sym links as directories and go into them'
+            cand --dereference-links 'dereference sym links - Treat sym links as directories and go into them'
            cand -x 'Only count the files and directories on the same filesystem as the supplied directory'
            cand --limit-filesystem 'Only count the files and directories on the same filesystem as the supplied directory'
            cand -s 'Use file length instead of blocks'
@@ -48,6 +50,8 @@ set edit:completion:arg-completer[dust] = {|@words|
            cand --no-colors 'No colors will be printed (Useful for commands like: watch)'
            cand -b 'No percent bars or percentages will be displayed'
            cand --no-percent-bars 'No percent bars or percentages will be displayed'
+            cand -R 'For screen readers. Removes bars. Adds new column: depth level (May want to use -p too for full path)'
+            cand --screen-reader 'For screen readers. Removes bars. Adds new column: depth level (May want to use -p too for full path)'
            cand --skip-total 'No total row will be displayed'
            cand -f 'Directory ''size'' is number of child files/dirs not disk size'
            cand --filecount 'Directory ''size'' is number of child files/dirs not disk size'
@@ -57,6 +61,12 @@ 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 -P 'Disable the progress indication.'
+            cand --no-progress 'Disable the progress indication.'
+            cand -D 'Only directories will be displayed.'
+            cand --only-dir 'Only directories will be displayed.'
+            cand -F 'Only files will be displayed. (Finds your largest files)'
+            cand --only-file 'Only files will be displayed. (Finds your largest files)'
        }
    ]
    $completions[$command]
--- a/completions/dust.fish
+++ b/completions/dust.fish
@@ -8,13 +8,18 @@ complete -c dust -s w -l terminal_width -d 'Specify width of output overriding t
 complete -c dust -s h -l help -d 'Print help information'
 complete -c dust -s V -l version -d 'Print version information'
 complete -c dust -s p -l full-paths -d 'Subdirectories will not have their path shortened'
+complete -c dust -s L -l dereference-links -d 'dereference sym links - Treat sym links as directories and go into them'
 complete -c dust -s x -l limit-filesystem -d 'Only count the files and directories on the same filesystem as the supplied directory'
 complete -c dust -s s -l apparent-size -d 'Use file length instead of blocks'
 complete -c dust -s r -l reverse -d 'Print tree upside down (biggest highest)'
 complete -c dust -s c -l no-colors -d 'No colors will be printed (Useful for commands like: watch)'
 complete -c dust -s b -l no-percent-bars -d 'No percent bars or percentages will be displayed'
+complete -c dust -s R -l screen-reader -d 'For screen readers. Removes bars. Adds new column: depth level (May want to use -p too for full path)'
 complete -c dust -l skip-total -d 'No total row will be displayed'
 complete -c dust -s f -l filecount -d 'Directory \'size\' is number of child files/dirs not disk size'
 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 P -l no-progress -d 'Disable the progress indication.'
+complete -c dust -s D -l only-dir -d 'Only directories will be displayed.'
+complete -c dust -s F -l only-file -d 'Only files will be displayed. (Finds your largest files)'
--- a/man-page/dust.1
+++ b/man-page/dust.1
@@ -0,0 +1,90 @@
+.ie \n(.g .ds Aq \(aq
+.el .ds Aq '
+.TH Dust 1  "Dust 0.8.4" 
+.SH NAME
+Dust \- Like du but more intuitive
+.SH SYNOPSIS
+\fBDust\fR [\fB\-h\fR|\fB\-\-help\fR] [\fB\-V\fR|\fB\-\-version\fR] [\fB\-d\fR|\fB\-\-depth\fR] [\fB\-n\fR|\fB\-\-number\-of\-lines\fR] [\fB\-p\fR|\fB\-\-full\-paths\fR] [\fB\-X\fR|\fB\-\-ignore\-directory\fR] [\fB\-L\fR|\fB\-\-dereference\-links\fR] [\fB\-x\fR|\fB\-\-limit\-filesystem\fR] [\fB\-s\fR|\fB\-\-apparent\-size\fR] [\fB\-r\fR|\fB\-\-reverse\fR] [\fB\-c\fR|\fB\-\-no\-colors\fR] [\fB\-b\fR|\fB\-\-no\-percent\-bars\fR] [\fB\-z\fR|\fB\-\-min\-size\fR] [\fB\-R\fR|\fB\-\-screen\-reader\fR] [\fB\-\-skip\-total\fR] [\fB\-f\fR|\fB\-\-filecount\fR] [\fB\-i\fR|\fB\-\-ignore_hidden\fR] [\fB\-v\fR|\fB\-\-invert\-filter\fR] [\fB\-e\fR|\fB\-\-filter\fR] [\fB\-t\fR|\fB\-\-file_types\fR] [\fB\-w\fR|\fB\-\-terminal_width\fR] [\fB\-H\fR|\fB\-\-si\fR] [\fB\-P\fR|\fB\-\-no\-progress\fR] [\fB\-D\fR|\fB\-\-only\-dir\fR] [\fB\-F\fR|\fB\-\-only\-file\fR] [\fIinputs\fR] 
+.SH DESCRIPTION
+Like du but more intuitive
+.SH OPTIONS
+.TP
+\fB\-h\fR, \fB\-\-help\fR
+Print help information
+.TP
+\fB\-V\fR, \fB\-\-version\fR
+Print version information
+.TP
+\fB\-d\fR, \fB\-\-depth\fR
+Depth to show
+.TP
+\fB\-n\fR, \fB\-\-number\-of\-lines\fR
+Number of lines of output to show. (Default is terminal_height \- 10)
+.TP
+\fB\-p\fR, \fB\-\-full\-paths\fR
+Subdirectories will not have their path shortened
+.TP
+\fB\-X\fR, \fB\-\-ignore\-directory\fR
+Exclude any file or directory with this name
+.TP
+\fB\-L\fR, \fB\-\-dereference\-links\fR
+dereference sym links \- Treat sym links as directories and go into them
+.TP
+\fB\-x\fR, \fB\-\-limit\-filesystem\fR
+Only count the files and directories on the same filesystem as the supplied directory
+.TP
+\fB\-s\fR, \fB\-\-apparent\-size\fR
+Use file length instead of blocks
+.TP
+\fB\-r\fR, \fB\-\-reverse\fR
+Print tree upside down (biggest highest)
+.TP
+\fB\-c\fR, \fB\-\-no\-colors\fR
+No colors will be printed (Useful for commands like: watch)
+.TP
+\fB\-b\fR, \fB\-\-no\-percent\-bars\fR
+No percent bars or percentages will be displayed
+.TP
+\fB\-z\fR, \fB\-\-min\-size\fR
+Minimum size file to include in output
+.TP
+\fB\-R\fR, \fB\-\-screen\-reader\fR
+For screen readers. Removes bars. Adds new column: depth level (May want to use \-p too for full path)
+.TP
+\fB\-\-skip\-total\fR
+No total row will be displayed
+.TP
+\fB\-f\fR, \fB\-\-filecount\fR
+Directory \*(Aqsize\*(Aq is number of child files/dirs not disk size
+.TP
+\fB\-i\fR, \fB\-\-ignore_hidden\fR
+Do not display hidden files
+.TP
+\fB\-v\fR, \fB\-\-invert\-filter\fR
+Exclude filepaths matching this regex. To ignore png files type: \-v "\\.png$" 
+.TP
+\fB\-e\fR, \fB\-\-filter\fR
+Only include filepaths matching this regex. For png files type: \-e "\\.png$" 
+.TP
+\fB\-t\fR, \fB\-\-file_types\fR
+show only these file types
+.TP
+\fB\-w\fR, \fB\-\-terminal_width\fR
+Specify width of output overriding the auto detection of terminal width
+.TP
+\fB\-H\fR, \fB\-\-si\fR
+print sizes in powers of 1000 (e.g., 1.1G)
+.TP
+\fB\-P\fR, \fB\-\-no\-progress\fR
+Disable the progress indication.
+.TP
+\fB\-D\fR, \fB\-\-only\-dir\fR
+Only directories will be displayed.
+.TP
+\fB\-F\fR, \fB\-\-only\-file\fR
+Only files will be displayed. (Finds your largest files)
+.TP
+[\fIinputs\fR]
+
+.SH VERSION
+v0.8.4
--- a/src/cli.rs
+++ b/src/cli.rs
@@ -1,5 +1,8 @@
 use clap::{Arg, Command};

+// For single thread mode set this variable on your command line:
+// export RAYON_NUM_THREADS=1
+
 pub fn build_cli() -> Command<'static> {
    Command::new("Dust")
        .about("Like du but more intuitive")
@@ -33,6 +36,12 @@ pub fn build_cli() -> Command<'static> {
                .number_of_values(1)
                .multiple_occurrences(true)
                .help("Exclude any file or directory with this name"),
+        )
+         .arg(
+            Arg::new("dereference_links")
+                .short('L')
+                .long("dereference-links")
+                .help("dereference sym links - Treat sym links as directories and go into them"),
        )
        .arg(
            Arg::new("limit_filesystem")
@@ -72,6 +81,12 @@ pub fn build_cli() -> Command<'static> {
                .number_of_values(1)
                .help("Minimum size file to include in output"),
        )
+        .arg(
+            Arg::new("screen_reader")
+                .short('R')
+                .long("screen-reader")
+                .help("For screen readers. Removes bars. Adds new column: depth level (May want to use -p too for full path)"),
+        )
        .arg(
            Arg::new("skip_total")
                .long("skip-total")
@@ -115,6 +130,7 @@ pub fn build_cli() -> Command<'static> {
                .short('t')
                .long("file_types")
                .conflicts_with("depth")
+                .conflicts_with("only_dir")
                .help("show only these file types"),
        )
        .arg(
@@ -131,5 +147,26 @@ 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).default_value("."))
+        .arg(
+            Arg::new("disable_progress")
+                .short('P')
+                .long("no-progress")
+                .help("Disable the progress indication."),
+        )
+        .arg(
+            Arg::new("only_dir")
+                .short('D')
+                .long("only-dir")
+                .conflicts_with("only_file")
+                .conflicts_with("types")
+                .help("Only directories will be displayed."),
+        )
+        .arg(
+            Arg::new("only_file")
+                .short('F')
+                .long("only-file")
+                .conflicts_with("only_dir")
+                .help("Only files will be displayed. (Finds your largest files)"),
+        )
+        .arg(Arg::new("inputs").multiple_occurrences(true))
 }
--- a/src/config.rs
+++ b/src/config.rs
@@ -16,15 +16,22 @@ pub struct Config {
    pub no_colors: Option<bool>,
    pub no_bars: Option<bool>,
    pub skip_total: Option<bool>,
+    pub screen_reader: Option<bool>,
    pub ignore_hidden: Option<bool>,
    pub iso: Option<bool>,
    pub min_size: Option<String>,
+    pub only_dir: Option<bool>,
+    pub only_file: Option<bool>,
+    pub disable_progress: Option<bool>,
 }

 impl Config {
    pub fn get_no_colors(&self, options: &ArgMatches) -> bool {
        Some(true) == self.no_colors || options.is_present("no_colors")
    }
+    pub fn get_disable_progress(&self, options: &ArgMatches) -> bool {
+        Some(true) == self.disable_progress || options.is_present("disable_progress")
+    }
    pub fn get_apparent_size(&self, options: &ArgMatches) -> bool {
        Some(true) == self.display_apparent_size || options.is_present("display_apparent_size")
    }
@@ -32,7 +39,10 @@ impl Config {
        Some(true) == self.ignore_hidden || options.is_present("ignore_hidden")
    }
    pub fn get_full_paths(&self, options: &ArgMatches) -> bool {
-        Some(true) == self.display_full_paths || options.is_present("display_full_paths")
+        // If we are only showing files, always show full paths
+        Some(true) == self.display_full_paths
+            || options.is_present("display_full_paths")
+            || self.get_only_file(options)
    }
    pub fn get_reverse(&self, options: &ArgMatches) -> bool {
        Some(true) == self.reverse || options.is_present("reverse")
@@ -46,6 +56,9 @@ impl Config {
    pub fn get_skip_total(&self, options: &ArgMatches) -> bool {
        Some(true) == self.skip_total || options.is_present("skip_total")
    }
+    pub fn get_screen_reader(&self, options: &ArgMatches) -> bool {
+        Some(true) == self.screen_reader || options.is_present("screen_reader")
+    }
    pub fn get_min_size(&self, options: &ArgMatches, iso: bool) -> Option<usize> {
        let size_from_param = options.value_of("min_size");
        self._get_min_size(size_from_param, iso)
@@ -61,6 +74,12 @@ impl Config {
            size_from_param
        }
    }
+    pub fn get_only_dir(&self, options: &ArgMatches) -> bool {
+        Some(true) == self.only_dir || options.is_present("only_dir")
+    }
+    pub fn get_only_file(&self, options: &ArgMatches) -> bool {
+        Some(true) == self.only_file || options.is_present("only_file")
+    }
 }

 fn convert_min_size(input: &str, iso: bool) -> Option<usize> {
@@ -78,7 +97,7 @@ fn convert_min_size(input: &str, iso: bool) -> Option<usize> {
                            Some(marker)
                        }
                        Err(_) => {
-                            eprintln!("Ignoring invalid min-size: {}", input);
+                            eprintln!("Ignoring invalid min-size: {input}");
                            None
                        }
                    };
@@ -88,7 +107,7 @@ fn convert_min_size(input: &str, iso: bool) -> Option<usize> {
            starts
                .parse()
                .map_err(|_| {
-                    eprintln!("Ignoring invalid min-size: {}", input);
+                    eprintln!("Ignoring invalid min-size: {input}");
                })
                .ok()
        }
--- a/src/dir_walker.rs
+++ b/src/dir_walker.rs
@@ -1,6 +1,10 @@
 use std::fs;
+use std::sync::Arc;

 use crate::node::Node;
+use crate::progress::Operation;
+use crate::progress::PAtomicInfo;
+use crate::progress::ORDERING;
 use crate::utils::is_filtered_out_due_to_invert_regex;
 use crate::utils::is_filtered_out_due_to_regex;
 use rayon::iter::ParallelBridge;
@@ -8,16 +12,12 @@ use rayon::prelude::ParallelIterator;
 use regex::Regex;
 use std::path::PathBuf;

-use std::sync::atomic;
-use std::sync::atomic::AtomicBool;
-
 use std::collections::HashSet;

 use crate::node::build_node;
 use std::fs::DirEntry;

 use crate::platform::get_metadata;
-
 pub struct WalkData<'a> {
    pub ignore_directories: HashSet<PathBuf>,
    pub filter_regex: &'a [Regex],
@@ -26,22 +26,25 @@ pub struct WalkData<'a> {
    pub use_apparent_size: bool,
    pub by_filecount: bool,
    pub ignore_hidden: bool,
+    pub follow_links: bool,
+    pub progress_data: Arc<PAtomicInfo>,
 }

-pub fn walk_it(dirs: HashSet<PathBuf>, walk_data: WalkData) -> (Vec<Node>, bool) {
-    let permissions_flag = AtomicBool::new(false);
-
+pub fn walk_it(dirs: HashSet<PathBuf>, walk_data: WalkData) -> Vec<Node> {
+    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 HashSet::new(),
-                walk_data.use_apparent_size,
-            )
+            let prog_data = &walk_data.progress_data;
+            prog_data.clear_state(&d);
+            let node = walk(d, &walk_data, 0)?;
+
+            prog_data.state.store(Operation::PREPARING, ORDERING);
+
+            clean_inodes(node, &mut inodes, walk_data.use_apparent_size)
        })
        .collect();
-    (top_level_nodes, permissions_flag.into_inner())
+    top_level_nodes
 }

 // Remove files which have the same inode, we don't want to double count them.
@@ -121,12 +124,8 @@ fn ignore_file(entry: &DirEntry, walk_data: &WalkData) -> bool {
    (is_dot_file && walk_data.ignore_hidden) || is_ignored_path
 }

-fn walk(
-    dir: PathBuf,
-    permissions_flag: &AtomicBool,
-    walk_data: &WalkData,
-    depth: usize,
-) -> Option<Node> {
+fn walk(dir: PathBuf, walk_data: &WalkData, depth: usize) -> Option<Node> {
+    let prog_data = &walk_data.progress_data;
    let mut children = vec![];

    if let Ok(entries) = fs::read_dir(&dir) {
@@ -139,38 +138,42 @@ fn walk(
                    // rayon doesn't parallelize as well giving a 3X performance drop
                    // hence we unravel the recursion a bit

-                    // return walk(entry.path(), permissions_flag, ignore_directories, allowed_filesystems, use_apparent_size, by_filecount, ignore_hidden);
+                    // return walk(entry.path(), walk_data, depth)

                    if !ignore_file(entry, walk_data) {
                        if let Ok(data) = entry.file_type() {
-                            return if data.is_dir() && !data.is_symlink() {
-                                walk(entry.path(), permissions_flag, walk_data, depth + 1)
-                            } else {
-                                build_node(
-                                    entry.path(),
-                                    vec![],
-                                    walk_data.filter_regex,
-                                    walk_data.invert_filter_regex,
-                                    walk_data.use_apparent_size,
-                                    data.is_symlink(),
-                                    data.is_file(),
-                                    walk_data.by_filecount,
-                                    depth,
-                                )
-                            };
+                            if data.is_dir() || (walk_data.follow_links && data.is_symlink()) {
+                                return walk(entry.path(), walk_data, depth + 1);
+                            }
+
+                            let node = build_node(
+                                entry.path(),
+                                vec![],
+                                walk_data.filter_regex,
+                                walk_data.invert_filter_regex,
+                                walk_data.use_apparent_size,
+                                data.is_symlink(),
+                                data.is_file(),
+                                walk_data.by_filecount,
+                                depth,
+                            );
+
+                            prog_data.num_files.fetch_add(1, ORDERING);
+                            if let Some(ref file) = node {
+                                prog_data.total_file_size.fetch_add(file.size, ORDERING);
+                            }
+
+                            return node;
                        }
                    }
                } else {
-                    permissions_flag.store(true, atomic::Ordering::Relaxed);
+                    prog_data.no_permissions.store(true, ORDERING)
                }
                None
            })
            .collect();
-    } else {
-        // Handle edge case where dust is called with a file instead of a directory
-        if !dir.exists() {
-            permissions_flag.store(true, atomic::Ordering::Relaxed);
-        }
+    } else if !dir.is_file() {
+        walk_data.progress_data.no_permissions.store(true, ORDERING)
    }
    build_node(
        dir,
--- a/src/display.rs
+++ b/src/display.rs
@@ -22,6 +22,7 @@ pub struct DisplayData {
    pub is_reversed: bool,
    pub colors_on: bool,
    pub by_filecount: bool,
+    pub is_screen_reader: bool,
    pub num_chars_needed_on_left_most: usize,
    pub base_size: u64,
    pub longest_string_length: usize,
@@ -83,12 +84,15 @@ impl DrawData<'_> {

    // TODO: can we test this?
    fn generate_bar(&self, node: &DisplayNode, level: usize) -> String {
+        if self.display_data.is_screen_reader {
+            return level.to_string();
+        }
        let chars_in_bar = self.percent_bar.chars().count();
        let num_bars = chars_in_bar as f32 * self.display_data.percent_size(node);
        let mut num_not_my_bar = (chars_in_bar as i32) - num_bars as i32;

        let mut new_bar = "".to_string();
-        let idx = 5 - min(4, max(1, level));
+        let idx = 5 - level.clamp(1, 4);

        for c in self.percent_bar.chars() {
            num_not_my_bar -= 1;
@@ -104,6 +108,7 @@ impl DrawData<'_> {
    }
 }

+// TODO: Push these into one object ?
 #[allow(clippy::too_many_arguments)]
 pub fn draw_it(
    use_full_path: bool,
@@ -115,6 +120,7 @@ pub fn draw_it(
    root_node: &DisplayNode,
    iso: bool,
    skip_total: bool,
+    is_screen_reader: bool,
 ) {
    let biggest = match skip_total {
        false => root_node,
@@ -138,13 +144,18 @@ pub fn draw_it(

    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, allowed_width, !use_full_path);
+    let longest_string_length = find_longest_dir_name(
+        root_node,
+        num_indent_chars,
+        allowed_width,
+        !use_full_path,
+        is_screen_reader,
+    );

-    let max_bar_length = if no_percent_bars || longest_string_length + 7 >= allowed_width as usize {
+    let max_bar_length = if no_percent_bars || longest_string_length + 7 >= allowed_width {
        0
    } else {
-        allowed_width as usize - longest_string_length - 7
+        allowed_width - longest_string_length - 7
    };

    let first_size_bar = repeat(BLOCKS[0]).take(max_bar_length).collect();
@@ -154,6 +165,7 @@ pub fn draw_it(
        is_reversed,
        colors_on: !no_colors,
        by_filecount,
+        is_screen_reader,
        num_chars_needed_on_left_most,
        base_size: biggest.size,
        longest_string_length,
@@ -193,17 +205,23 @@ fn find_longest_dir_name(
    indent: usize,
    terminal: usize,
    long_paths: bool,
+    is_screen_reader: bool,
 ) -> usize {
    let printable_name = get_printable_name(&node.name, long_paths);
-    let longest = min(
-        UnicodeWidthStr::width(&*printable_name) + 1 + indent,
-        terminal,
-    );
+
+    let longest = if is_screen_reader {
+        UnicodeWidthStr::width(&*printable_name) + 1
+    } else {
+        min(
+            UnicodeWidthStr::width(&*printable_name) + 1 + indent,
+            terminal,
+        )
+    };

    // each none root tree drawing is 2 more chars, hence we increment indent by 2
    node.children
        .iter()
-        .map(|c| find_longest_dir_name(c, indent + 2, terminal, long_paths))
+        .map(|c| find_longest_dir_name(c, indent + 2, terminal, long_paths, is_screen_reader))
        .fold(longest, max)
 }

@@ -216,7 +234,7 @@ fn display_node(node: &DisplayNode, draw_data: &DrawData, is_biggest: bool, is_l
    let to_print = format_string(node, &indent, &bar_text, is_biggest, draw_data.display_data);

    if !draw_data.display_data.is_reversed {
-        println!("{}", to_print)
+        println!("{to_print}")
    }

    let dd = DrawData {
@@ -237,7 +255,7 @@ fn display_node(node: &DisplayNode, draw_data: &DrawData, is_biggest: bool, is_l
    }

    if draw_data.display_data.is_reversed {
-        println!("{}", to_print)
+        println!("{to_print}")
    }
 }

@@ -258,10 +276,10 @@ fn clean_indentation_string(s: &str) -> String {
    is
 }

-fn get_printable_name<P: AsRef<Path>>(dir_name: &P, long_paths: bool) -> String {
+fn get_printable_name<P: AsRef<Path>>(dir_name: &P, short_paths: bool) -> String {
    let dir_name = dir_name.as_ref();
    let printable_name = {
-        if long_paths {
+        if short_paths {
            match dir_name.parent() {
                Some(prefix) => match dir_name.strip_prefix(prefix) {
                    Ok(base) => base,
@@ -278,7 +296,7 @@ fn get_printable_name<P: AsRef<Path>>(dir_name: &P, long_paths: bool) -> String

 fn pad_or_trim_filename(node: &DisplayNode, indent: &str, display_data: &DisplayData) -> String {
    let name = get_printable_name(&node.name, display_data.short_paths);
-    let indent_and_name = format!("{} {}", indent, name);
+    let indent_and_name = format!("{indent} {name}");
    let width = UnicodeWidthStr::width(&*indent_and_name);

    assert!(
@@ -314,14 +332,20 @@ fn maybe_trim_filename(name_in: String, indent: &str, display_data: &DisplayData
 pub fn format_string(
    node: &DisplayNode,
    indent: &str,
-    percent_bar: &str,
+    bars: &str,
    is_biggest: bool,
    display_data: &DisplayData,
 ) -> String {
-    let (percents, name_and_padding) = get_name_percent(node, indent, percent_bar, display_data);
+    let (percent, name_and_padding) = get_name_percent(node, indent, bars, display_data);
    let pretty_size = get_pretty_size(node, is_biggest, display_data);
    let pretty_name = get_pretty_name(node, name_and_padding, display_data);
-    format!("{} {} {}{}", pretty_size, indent, pretty_name, percents)
+    // we can clean this and the method below somehow, not sure yet
+    if display_data.is_screen_reader {
+        // if screen_reader then bars is 'depth'
+        format!("{pretty_name} {bars} {pretty_size}{percent}")
+    } else {
+        format!("{pretty_size} {indent} {pretty_name}{percent}")
+    }
 }

 fn get_name_percent(
@@ -330,9 +354,17 @@ fn get_name_percent(
    bar_chart: &str,
    display_data: &DisplayData,
 ) -> (String, String) {
-    if !bar_chart.is_empty() {
-        let percent_size_str = format!("{:.0}%", display_data.percent_size(node) * 100.0);
-        let percents = format!("│{} │ {:>4}", bar_chart, percent_size_str);
+    if display_data.is_screen_reader {
+        let percent = display_data.percent_size(node) * 100.0;
+        let percent_size_str = format!("{percent:.0}%");
+        let percents = format!(" {percent_size_str:>4}",);
+        let name = pad_or_trim_filename(node, "", display_data);
+        (percents, name)
+    // Bar chart being empty may come from either config or the screen not being wide enough
+    } else if !bar_chart.is_empty() {
+        let percent = display_data.percent_size(node) * 100.0;
+        let percent_size_str = format!("{percent:.0}%");
+        let percents = format!("│{bar_chart} │ {percent_size_str:>4}");
        let name_and_padding = pad_or_trim_filename(node, indent, display_data);
        (percents, name_and_padding)
    } else {
@@ -371,13 +403,14 @@ fn get_pretty_name(
        let ansi_style = directory_color
            .map(Style::to_ansi_term_style)
            .unwrap_or_default();
-        format!("{}", ansi_style.paint(name_and_padding))
+        let out = ansi_style.paint(name_and_padding);
+        format!("{out}")
    } else {
        name_and_padding
    }
 }

-fn human_readable_number(size: u64, iso: bool) -> String {
+pub fn human_readable_number(size: u64, iso: bool) -> String {
    for (i, u) in UNITS.iter().enumerate() {
        let num: u64 = if iso { 1000 } else { 1024 };
        let marker = num.pow((UNITS.len() - i) as u32);
@@ -389,7 +422,7 @@ fn human_readable_number(size: u64, iso: bool) -> String {
            }
        }
    }
-    format!("{}B", size)
+    format!("{size}B")
 }

 mod tests {
@@ -405,8 +438,9 @@ mod tests {
            is_reversed: false,
            colors_on: false,
            by_filecount: false,
+            is_screen_reader: false,
            num_chars_needed_on_left_most: 5,
-            base_size: 1,
+            base_size: 2_u64.pow(12), // 4.0K
            longest_string_length,
            ls_colors: LsColors::from_env().unwrap_or_default(),
            iso: false,
@@ -423,14 +457,9 @@ mod tests {
        let indent = "┌─┴";
        let percent_bar = "";
        let is_biggest = false;
+        let data = get_fake_display_data(20);

-        let s = format_string(
-            &n,
-            indent,
-            percent_bar,
-            is_biggest,
-            &get_fake_display_data(20),
-        );
+        let s = format_string(&n, indent, percent_bar, is_biggest, &data);
        assert_eq!(s, " 4.0K ┌─┴ short");
    }

@@ -446,14 +475,31 @@ mod tests {
        let percent_bar = "";
        let is_biggest = false;

-        let dd = get_fake_display_data(64);
-        let s = format_string(&n, indent, percent_bar, is_biggest, &dd);
+        let data = get_fake_display_data(64);
+        let s = format_string(&n, indent, percent_bar, is_biggest, &data);
        assert_eq!(
            s,
            " 4.0K ┌─┴ very_long_name_longer_than_the_eighty_character_limit_very_.."
        );
    }

+    #[test]
+    fn test_format_str_screen_reader() {
+        let n = DisplayNode {
+            name: PathBuf::from("/short"),
+            size: 2_u64.pow(12), // This is 4.0K
+            children: vec![],
+        };
+        let indent = "";
+        let percent_bar = "3";
+        let is_biggest = false;
+        let mut data = get_fake_display_data(20);
+        data.is_screen_reader = true;
+
+        let s = format_string(&n, indent, percent_bar, is_biggest, &data);
+        assert_eq!(s, "short               3  4.0K 100%");
+    }
+
    #[test]
    fn test_human_readable_number() {
        assert_eq!(human_readable_number(1, false), "1B");
--- a/src/display_node.rs
+++ b/src/display_node.rs
@@ -4,7 +4,7 @@ use std::path::PathBuf;
 pub struct DisplayNode {
    // Note: the order of fields in important here, for PartialEq and PartialOrd
    pub size: u64,
-    pub name: PathBuf, //todo: consider moving to a string?
+    pub name: PathBuf,
    pub children: Vec<DisplayNode>,
 }

--- a/src/filter.rs
+++ b/src/filter.rs
@@ -1,87 +1,143 @@
 use crate::display_node::DisplayNode;
 use crate::node::Node;
 use std::collections::BinaryHeap;
-use std::collections::HashSet;
+use std::collections::HashMap;
 use std::path::Path;
 use std::path::PathBuf;

-pub fn get_biggest(
-    top_level_nodes: Vec<Node>,
-    min_size: Option<usize>,
-    n: usize,
-    depth: usize,
-    using_a_filter: bool,
-) -> Option<DisplayNode> {
+pub struct AggregateData {
+    pub min_size: Option<usize>,
+    pub only_dir: bool,
+    pub only_file: bool,
+    pub number_of_lines: usize,
+    pub depth: usize,
+    pub using_a_filter: bool,
+}
+
+pub fn get_biggest(top_level_nodes: Vec<Node>, display_data: AggregateData) -> Option<DisplayNode> {
    if top_level_nodes.is_empty() {
        // perhaps change this, bring back Error object?
        return None;
    }
-
    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();
+    let root;

-    allowed_nodes.insert(root.name.as_path());
-    heap = add_children(using_a_filter, min_size, &root, depth, heap);
-
-    for _ in number_top_level_nodes..n {
-        let line = heap.pop();
-        match line {
-            Some(line) => {
-                allowed_nodes.insert(line.name.as_path());
-                heap = add_children(using_a_filter, min_size, line, depth, heap);
-            }
-            None => break,
-        }
-    }
-    recursive_rebuilder(&allowed_nodes, &root)
-}
-
-fn add_children<'a>(
-    using_a_filter: bool,
-    min_size: Option<usize>,
-    file_or_folder: &'a Node,
-    depth: usize,
-    mut heap: BinaryHeap<&'a Node>,
-) -> BinaryHeap<&'a Node> {
-    if depth > file_or_folder.depth {
-        heap.extend(file_or_folder.children.iter().filter(|c| match min_size {
-            Some(ms) => c.size > ms as u64,
-            None => !using_a_filter || c.name.is_file() || c.size > 0,
-        }))
-    }
-    heap
-}
-
-fn get_new_root(top_level_nodes: Vec<Node>) -> Node {
-    if top_level_nodes.len() != 1 {
+    if number_top_level_nodes > 1 {
        let size = top_level_nodes.iter().map(|node| node.size).sum();
-        Node {
+        root = Node {
            name: PathBuf::from("(total)"),
            size,
            children: top_level_nodes,
            inode_device: None,
            depth: 0,
-        }
+        };
+        // Always include the base nodes if we add a 'parent' (total) node
+        heap = always_add_children(&display_data, &root, heap);
    } else {
-        top_level_nodes.into_iter().next().unwrap()
+        root = top_level_nodes.into_iter().next().unwrap();
+        heap = add_children(&display_data, &root, heap);
+    }
+
+    fill_remaining_lines(heap, &root, display_data)
+}
+
+pub fn fill_remaining_lines<'a>(
+    mut heap: BinaryHeap<&'a Node>,
+    root: &'a Node,
+    display_data: AggregateData,
+) -> Option<DisplayNode> {
+    let mut allowed_nodes = HashMap::new();
+
+    while allowed_nodes.len() < display_data.number_of_lines {
+        let line = heap.pop();
+        match line {
+            Some(line) => {
+                if !display_data.only_file || line.children.is_empty() {
+                    allowed_nodes.insert(line.name.as_path(), line);
+                }
+                heap = add_children(&display_data, line, heap);
+            }
+            None => break,
+        }
+    }
+
+    if display_data.only_file {
+        flat_rebuilder(allowed_nodes, root)
+    } else {
+        recursive_rebuilder(&allowed_nodes, root)
    }
 }

-fn recursive_rebuilder(allowed_nodes: &HashSet<&Path>, current: &Node) -> Option<DisplayNode> {
-    let mut new_children: Vec<_> = current
+fn add_children<'a>(
+    display_data: &AggregateData,
+    file_or_folder: &'a Node,
+    heap: BinaryHeap<&'a Node>,
+) -> BinaryHeap<&'a Node> {
+    if display_data.depth > file_or_folder.depth {
+        always_add_children(display_data, file_or_folder, heap)
+    } else {
+        heap
+    }
+}
+
+fn always_add_children<'a>(
+    display_data: &AggregateData,
+    file_or_folder: &'a Node,
+    mut heap: BinaryHeap<&'a Node>,
+) -> BinaryHeap<&'a Node> {
+    heap.extend(
+        file_or_folder
+            .children
+            .iter()
+            .filter(|c| match display_data.min_size {
+                Some(ms) => c.size > ms as u64,
+                None => !display_data.using_a_filter || c.name.is_file() || c.size > 0,
+            })
+            .filter(|c| {
+                if display_data.only_dir {
+                    c.name.is_dir()
+                } else {
+                    true
+                }
+            }),
+    );
+    heap
+}
+
+// Finds children of current, if in allowed_nodes adds them as children to new DisplayNode
+fn recursive_rebuilder(
+    allowed_nodes: &HashMap<&Path, &Node>,
+    current: &Node,
+) -> Option<DisplayNode> {
+    let new_children: Vec<_> = current
        .children
        .iter()
-        .filter(|c| allowed_nodes.contains(c.name.as_path()))
+        .filter(|c| allowed_nodes.contains_key(c.name.as_path()))
        .filter_map(|c| recursive_rebuilder(allowed_nodes, c))
        .collect();

-    new_children.sort_by(|lhs, rhs| lhs.cmp(rhs).reverse());
+    Some(build_node(new_children, current))
+}

-    Some(DisplayNode {
+// Applies all allowed nodes as children to current node
+fn flat_rebuilder(allowed_nodes: HashMap<&Path, &Node>, current: &Node) -> Option<DisplayNode> {
+    let new_children: Vec<DisplayNode> = allowed_nodes
+        .into_values()
+        .map(|v| DisplayNode {
+            name: v.name.clone(),
+            size: v.size,
+            children: vec![],
+        })
+        .collect::<Vec<DisplayNode>>();
+    Some(build_node(new_children, current))
+}
+
+fn build_node(mut new_children: Vec<DisplayNode>, current: &Node) -> DisplayNode {
+    new_children.sort_by(|lhs, rhs| lhs.cmp(rhs).reverse());
+    DisplayNode {
        name: current.name.clone(),
        size: current.size,
        children: new_children,
-    })
+    }
 }
--- a/src/main.rs
+++ b/src/main.rs
@@ -7,18 +7,26 @@ mod filter;
 mod filter_type;
 mod node;
 mod platform;
+mod progress;
 mod utils;

 use crate::cli::build_cli;
+use dir_walker::WalkData;
+use filter::AggregateData;
+use progress::PIndicator;
+use progress::ORDERING;
 use std::collections::HashSet;
+use std::io::BufRead;
 use std::process;
+use sysinfo::{System, SystemExt};

 use self::display::draw_it;
 use clap::Values;
 use config::get_config;
-use dir_walker::{walk_it, WalkData};
+use dir_walker::walk_it;
 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;
@@ -82,21 +90,35 @@ fn get_regex_value(maybe_value: Option<Values>) -> Vec<Regex> {
        .unwrap_or_default()
        .map(|reg| {
            Regex::new(reg).unwrap_or_else(|err| {
-                eprintln!("Ignoring bad value for regex {:?}", err);
+                eprintln!("Ignoring bad value for regex {err:?}");
                process::exit(1)
            })
        })
        .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 = options
-        .values_of("inputs")
-        .expect("Should be a default value here")
-        .collect();
+    let target_dirs = match options.values_of("inputs") {
+        Some(values) => values.collect(),
+        None => stdin_lines.as_ref().map_or(vec!["."], |lines| {
+            lines.iter().map(String::as_str).collect()
+        }),
+    };

    let summarize_file_types = options.is_present("types");

@@ -135,6 +157,7 @@ fn main() {

    let by_filecount = options.is_present("by_filecount");
    let limit_filesystem = options.is_present("limit_filesystem");
+    let follow_links = options.is_present("dereference_links");

    let simplified_dirs = simplify_dir_names(target_dirs);
    let allowed_filesystems = limit_filesystem
@@ -145,6 +168,15 @@ fn main() {
        .flat_map(|x| simplified_dirs.iter().map(move |d| d.join(&x)))
        .collect();

+    let iso = config.get_iso(&options);
+
+    let ignore_hidden = config.get_ignore_hidden(&options);
+
+    let mut indicator = PIndicator::build_me();
+    if !config.get_disable_progress(&options) {
+        indicator.spawn(iso);
+    }
+
    let walk_data = WalkData {
        ignore_directories: ignored_full_path,
        filter_regex: &filter_regexs,
@@ -152,31 +184,38 @@ fn main() {
        allowed_filesystems,
        use_apparent_size: config.get_apparent_size(&options),
        by_filecount,
-        ignore_hidden: config.get_ignore_hidden(&options),
+        ignore_hidden,
+        follow_links,
+        progress_data: indicator.data.clone(),
    };
-    // Larger stack size to handle cases with lots of nested directories
-    rayon::ThreadPoolBuilder::new()
-        .stack_size(usize::pow(1024, 3))
-        .build_global()
-        .unwrap();

-    let iso = config.get_iso(&options);
-    let (top_level_nodes, has_errors) = walk_it(simplified_dirs, walk_data);
+    let _rayon = init_rayon();
+
+    let top_level_nodes = walk_it(simplified_dirs, walk_data);

    let tree = match summarize_file_types {
        true => get_all_file_types(&top_level_nodes, number_of_lines),
-        false => get_biggest(
-            top_level_nodes,
-            config.get_min_size(&options, iso),
-            number_of_lines,
-            depth,
-            options.values_of("filter").is_some() || options.value_of("invert_filter").is_some(),
-        ),
+        false => {
+            let agg_data = AggregateData {
+                min_size: config.get_min_size(&options, iso),
+                only_dir: config.get_only_dir(&options),
+                only_file: config.get_only_file(&options),
+                number_of_lines,
+                depth,
+                using_a_filter: options.values_of("filter").is_some()
+                    || options.value_of("invert_filter").is_some(),
+            };
+            get_biggest(top_level_nodes, agg_data)
+        }
    };

-    if has_errors {
+    let failed_permissions = indicator.data.no_permissions.load(ORDERING);
+    indicator.stop();
+    // Must have stopped indicator before we print to stderr
+    if failed_permissions {
        eprintln!("Did not have permissions for all directories");
    }
+
    if let Some(root_node) = tree {
        draw_it(
            config.get_full_paths(&options),
@@ -188,6 +227,23 @@ fn main() {
            &root_node,
            iso,
            config.get_skip_total(&options),
+            config.get_screen_reader(&options),
        )
    }
 }
+
+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(())
+    }
+}
--- a/src/progress.rs
+++ b/src/progress.rs
@@ -0,0 +1,145 @@
+use std::{
+    io::Write,
+    path::Path,
+    sync::{
+        atomic::{AtomicBool, AtomicU64, AtomicU8, AtomicUsize, Ordering},
+        mpsc::{self, RecvTimeoutError, Sender},
+        Arc, RwLock,
+    },
+    thread::JoinHandle,
+    time::Duration,
+};
+
+use crate::display::human_readable_number;
+
+/* -------------------------------------------------------------------------- */
+
+pub const ORDERING: Ordering = Ordering::Relaxed;
+
+const SPINNER_SLEEP_TIME: u64 = 100;
+const PROGRESS_CHARS: [char; 4] = ['-', '\\', '|', '/'];
+const PROGRESS_CHARS_LEN: usize = PROGRESS_CHARS.len();
+
+pub trait ThreadSyncTrait<T> {
+    fn set(&self, val: T);
+    fn get(&self) -> T;
+}
+
+#[derive(Default)]
+pub struct ThreadStringWrapper {
+    inner: RwLock<String>,
+}
+
+impl ThreadSyncTrait<String> for ThreadStringWrapper {
+    fn set(&self, val: String) {
+        *self.inner.write().unwrap() = val;
+    }
+
+    fn get(&self) -> String {
+        (*self.inner.read().unwrap()).clone()
+    }
+}
+
+/* -------------------------------------------------------------------------- */
+
+// creating an enum this way allows to have simpler syntax compared to a Mutex or a RwLock
+#[allow(non_snake_case)]
+pub mod Operation {
+    pub const INDEXING: u8 = 0;
+    pub const PREPARING: u8 = 1;
+}
+
+#[derive(Default)]
+pub struct PAtomicInfo {
+    pub num_files: AtomicUsize,
+    pub total_file_size: AtomicU64,
+    pub state: AtomicU8,
+    pub current_path: ThreadStringWrapper,
+    pub no_permissions: AtomicBool,
+}
+
+impl PAtomicInfo {
+    pub fn clear_state(&self, dir: &Path) {
+        self.state.store(Operation::INDEXING, ORDERING);
+        let dir_name = dir.to_string_lossy().to_string();
+        self.current_path.set(dir_name);
+        self.total_file_size.store(0, ORDERING);
+        self.num_files.store(0, ORDERING);
+    }
+}
+
+/* -------------------------------------------------------------------------- */
+
+fn format_preparing_str(prog_char: char, data: &PAtomicInfo, is_iso: bool) -> String {
+    let path_in = data.current_path.get();
+    let size = human_readable_number(data.total_file_size.load(ORDERING), is_iso);
+    format!("Preparing: {path_in} {size} ... {prog_char}")
+}
+
+fn format_indexing_str(prog_char: char, data: &PAtomicInfo, is_iso: bool) -> String {
+    let path_in = data.current_path.get();
+    let file_count = data.num_files.load(ORDERING);
+    let size = human_readable_number(data.total_file_size.load(ORDERING), is_iso);
+    let file_str = format!("{file_count} files, {size}");
+    format!("Indexing: {path_in} {file_str} ... {prog_char}")
+}
+
+pub struct PIndicator {
+    pub thread: Option<(Sender<()>, JoinHandle<()>)>,
+    pub data: Arc<PAtomicInfo>,
+}
+
+impl PIndicator {
+    pub fn build_me() -> Self {
+        Self {
+            thread: None,
+            data: Arc::new(PAtomicInfo {
+                ..Default::default()
+            }),
+        }
+    }
+
+    pub fn spawn(&mut self, is_iso: bool) {
+        let data = self.data.clone();
+        let (stop_handler, receiver) = mpsc::channel::<()>();
+
+        let time_info_thread = std::thread::spawn(move || {
+            let mut progress_char_i: usize = 0;
+            let mut stdout = std::io::stdout();
+            let mut msg = "".to_string();
+
+            // While the timeout triggers we go round the loop
+            // If we disconnect or the sender sends its message we exit the while loop
+            while let Err(RecvTimeoutError::Timeout) =
+                receiver.recv_timeout(Duration::from_millis(SPINNER_SLEEP_TIME))
+            {
+                // Clear the text written by 'write!'& Return at the start of line
+                print!("\r{:width$}", " ", width = msg.len());
+                let prog_char = PROGRESS_CHARS[progress_char_i];
+
+                msg = match data.state.load(ORDERING) {
+                    Operation::INDEXING => format_indexing_str(prog_char, &data, is_iso),
+                    Operation::PREPARING => format_preparing_str(prog_char, &data, is_iso),
+                    _ => panic!("Unknown State"),
+                };
+
+                write!(stdout, "\r{msg}").unwrap();
+                stdout.flush().unwrap();
+
+                progress_char_i += 1;
+                progress_char_i %= PROGRESS_CHARS_LEN;
+            }
+            print!("\r{:width$}", " ", width = msg.len());
+            print!("\r");
+            stdout.flush().unwrap();
+        });
+        self.thread = Some((stop_handler, time_info_thread))
+    }
+
+    pub fn stop(self) {
+        if let Some((stop_handler, thread)) = self.thread {
+            stop_handler.send(()).unwrap();
+            thread.join().unwrap();
+        }
+    }
+}
--- a/tests/test_flags.rs
+++ b/tests/test_flags.rs
@@ -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() {
@@ -116,6 +117,15 @@ pub fn test_show_files_by_type() {
    assert!(output.contains("┌─┴ (total)"));
 }

+#[test]
+#[cfg(target_family = "unix")]
+pub fn test_show_files_only() {
+    let output = build_command(vec!["-c", "-F", "tests/test_dir"]);
+    assert!(output.contains("tests/test_dir/many/a_file"));
+    assert!(output.contains("tests/test_dir/many/hello_file"));
+    assert!(!output.contains("tests/test_dir/many "));
+}
+
 #[test]
 pub fn test_output_skip_total() {
    let output = build_command(vec![
@@ -127,6 +137,23 @@ pub fn test_output_skip_total() {
    assert!(!output.contains("(total)"));
 }

+#[test]
+pub fn test_output_screen_reader() {
+    let output = build_command(vec!["--screen-reader", "-c", "tests/test_dir/"]);
+    println!("{}", output);
+    assert!(output.contains("test_dir   0"));
+    assert!(output.contains("many       1"));
+    assert!(output.contains("hello_file 2"));
+    assert!(output.contains("a_file     2"));
+
+    // Verify no 'symbols' reported by screen reader
+    assert!(!output.contains("│"));
+
+    for block in ['█', '▓', '▒', '░'] {
+        assert!(!output.contains(block));
+    }
+}
+
 #[test]
 pub fn test_show_files_by_regex_match_lots() {
    // Check we can see '.rs' files in the tests directory
--- a/tests/tests_symlinks.rs
+++ b/tests/tests_symlinks.rs
@@ -17,6 +17,18 @@ 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());
+    link_name_s.into()
+}
+
 #[cfg_attr(target_os = "windows", ignore)]
 #[test]
 pub fn test_soft_sym_link() {
@@ -26,13 +38,7 @@ 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_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 link_name_s = link_it(link_name, file_path_s, true);

    let c = format!(" ├── {}", link_name_s);
    let b = format!(" ┌── {}", file_path_s);
@@ -41,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;

@@ -61,19 +67,14 @@ pub fn test_hard_sym_link() {
    let file_path_s = file.to_str().unwrap();

    let link_name = dir.path().join("the_link");
-    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());
+    link_it(link_name, file_path_s, false);

    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.
@@ -82,6 +83,34 @@ 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() {
@@ -89,14 +118,7 @@ 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_name.to_str().unwrap();
-
-    let c = Command::new("ln")
-        .arg("-s")
-        .arg(dir_s)
-        .arg(link_name_s)
-        .output();
-    assert!(c.is_ok());
+    let link_name_s = link_it(link_name, dir_s, true);

    let a = format!("─┬ {}", dir_s);
    let b = format!(" └── {}", link_name_s);
@@ -107,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;
Author	SHA1	Message	Date
andy.boot	49a21b1121	Increment version	2023-01-29 10:24:36 +00:00
andy.boot	7efdf63fbc	fix: Stop progress indicator crashing into stderr	2023-01-29 10:24:36 +00:00
andy.boot	184d1ec5e8	Feature: Add flag for screen readers Screen reader mode will, Reverse direction Not shows symbols (directory hierarchy or percentage bars) Adds a column 'depth' to show depth of directory	2023-01-29 09:52:10 +00:00
andy.boot	1e87a0661b	fix: Fix bug in progress bar Must entirely clear screen before printing output	2023-01-29 09:52:10 +00:00
andy.boot	187b8be2fa	fix: only-dir flag conflicts with types If showing file types we can't limit output to directories only	2023-01-29 09:52:10 +00:00
andy.boot	1495251ebc	feature: --files-only -F Add feature to only show files skipping directories.	2023-01-29 09:34:40 +00:00
andy.boot	520c439edc	Update LICENSE	2023-01-27 22:47:59 +00:00
Alexander Kjäll	712acc67fe	use create_dir_all instead of create_dir as that doesn't fail if the directory already exists, and make sure to propagate the error out	2023-01-27 22:45:45 +00:00
Alexander Kjäll	fdbed14334	generate a man page as part of the build	2023-01-27 22:45:45 +00:00
andy.boot	810cc8b604	clippy: Fix new clippy rules	2023-01-26 23:37:55 +00:00
Alexander Kjäll	83ef2525aa	upgrade dependencies	2023-01-26 23:05:14 +00:00
andy.boot	af9f0b5125	refactor: progress bar Pull out display code into different functions Experimented with printing the actual directory currently being parsed but this resulted into too many flickering hard to follow prints. It's cleaner to just print the target directory rather than the directory currently being examined by the dir_walker.	2023-01-22 09:56:47 +00:00
andy.boot	9ff28b3456	refactor: progress bar code to clear line should be just before next write. Otherwise a buffer flush may occur that wipes out the line before it can be read by the user.	2023-01-22 09:56:47 +00:00
andy.boot	4242363f40	refactor: progress bar Change threading to use channels instead of atomic boolean Allows for early exit so we don't have to wait for spinner loop timeout	2023-01-21 16:40:21 +00:00
andy.boot	3fd78490e6	Comment: Remove comment This can't be done easily	2023-01-21 16:40:21 +00:00
andy.boot	b903f58cea	Comment: update comment	2023-01-21 16:40:21 +00:00
andy.boot	0f72ca328a	Refactor: rename var	2023-01-21 16:40:21 +00:00
andy.boot	6c130adb6c	Refactor: PAtomicInfo class	2023-01-17 23:34:20 +00:00
andy.boot	9f0f366187	Refactor: progress bar & file permissions Move permissions flag into shared pdata object. Fixed bug where permissions flag was not being set correctly	2023-01-17 23:34:20 +00:00
andy.boot	81ad921e25	Refactor: progress bar: rename vars	2023-01-17 23:34:20 +00:00
andy.boot	3708edc2d3	Refactor: Progress bar: Remove atomic classes On balance I'm not convinced these macro built wrapper classes are worth it - It's clearer to use the standard atomic classes	2023-01-17 23:34:20 +00:00
andy.boot	414bc9e5a7	Refactor: Progress bar: Remove PConfig	2023-01-17 23:34:20 +00:00
andy.boot	66ad504848	Refactor: progress bar: simplify	2023-01-17 23:34:20 +00:00
andy.boot	5bfa44ec77	Refactor: progress bar: rm unused field	2023-01-17 23:34:20 +00:00
andy.boot	03a8d643c5	Refactor: Simplify progress indicator Reduce & simlpify. Cut feature: where we only report file count, it is always useful to see file size as well. cut feature: plural of file. If dust has only indexed a single file by the time it prints the status then something has gone wrong, safe to always assume a plural.	2023-01-14 16:51:32 +00:00
andy.boot	29957c1f2c	refactor: update Progress bar: progress.rs Remove none-needed macro	2023-01-14 16:51:32 +00:00
andy.boot	400ff513f4	Refactor: Update main for progress bar	2023-01-14 16:51:32 +00:00
andy.boot	31eb650fbe	Refactor: Reduce complexity of progress bar code	2023-01-14 16:51:32 +00:00
NovaliX	f3c074759d	Implemented a progress indicator (#275 ) * v1.0 * renamed operations to be more clear * put info later because there is still operations par of the preparing process * updated the last line clearing * changed name of module and structs to ones that make more sens * Disable size computation when file_count option is set * added sleep during the thread waiting * use 1024 powered instead of 10 to compute showed number * include DS_Store * added files directories skipped information * small format update * implement the -H option * put wait back * remove PAtomicInfo since it's not used * cargo fmt * wrapped atomic operations to reduce overhead * updated comments * Use AtomicU64Wrapper instead of AtomicU64 in TotalSize * update size suffix * sto dividing size when larger than terabytes * Fix use_iso flag not be set properly * update properties display * some reformating * use stdout instead of print * Moved config instance into main because it's easier to read * merge base formatting into macro * update name to be more intuitive and separated math operations for more flexibility * print currently indexed path * cargo fmt * reset size between each target dirs * Access to TotalSize rather than it's inner * small comment change * Update sysinfo version to 0.26.7 * fix: update use of sysinfo.system System is now much quicker to start but requires an explicit call to refresh memory else it deafults to 0 (oops) * clippy: Fix new clippy * fix: bug where hard links could be double counted When running: dust dir_a dir_b if a file was hard linked in both dir_a and dir_b it would be double counted. This fix resolves this by keeping the shared hashmap around between runs for the second and subsequent arguments. https://github.com/bootandy/dust/issues/282 * Fix: depth=0 bug for multiple arguments https://github.com/bootandy/dust/issues/282 * refactor filter.rs * refactor filter.rs * refactor create AggregateData for filter.rs * feature: Support for dereference links -L follow du has -L flag which allows it to dereference or follow symlinks. Clone this feature into dust. https://github.com/bootandy/dust/issues/276 * refactor dir_walker I find this layout cleaner * v1.0 * changed name of module and structs to ones that make more sens * Disable size computation when file_count option is set * added files directories skipped information * implement the -H option * wrapped atomic operations to reduce overhead * used human_readable_number function in display module rather than our own * implemented progress disabling * cargo fmt & cargo clippy Co-authored-by: Guillaume Gomez <guillaume1.gomez@gmail.com> Co-authored-by: andy.boot <bootandy@gmail.com>	2023-01-14 11:43:22 +00:00
andy.boot	ea3cc537ea	Fix: naming of parameter	2023-01-08 11:51:32 +00:00
andy.boot	c012567c38	[documentation] Note about running single-threaded	2023-01-08 10:28:19 +00:00
andy.boot	26bc26277d	refactor dir_walker I find this layout cleaner	2023-01-07 14:49:02 +00:00
andy.boot	abcc46c5ea	feature: Support for dereference links -L follow du has -L flag which allows it to dereference or follow symlinks. Clone this feature into dust. https://github.com/bootandy/dust/issues/276	2023-01-07 14:49:02 +00:00
andy.boot	a3ab5bfe0f	refactor create AggregateData for filter.rs	2023-01-07 14:16:03 +00:00
andy.boot	04c4963a02	refactor filter.rs	2023-01-07 14:16:03 +00:00
andy.boot	40a6f098ae	refactor filter.rs	2023-01-07 14:16:03 +00:00
andy.boot	5e607cf210	Fix: depth=0 bug for multiple arguments https://github.com/bootandy/dust/issues/282	2023-01-05 09:22:38 +00:00
andy.boot	f546dbbede	fix: bug where hard links could be double counted When running: dust dir_a dir_b if a file was hard linked in both dir_a and dir_b it would be double counted. This fix resolves this by keeping the shared hashmap around between runs for the second and subsequent arguments. https://github.com/bootandy/dust/issues/282	2023-01-05 09:22:38 +00:00
andy.boot	a91aa62060	clippy: Fix new clippy	2023-01-04 20:08:20 +00:00
andy.boot	a7b82f32d7	fix: update use of sysinfo.system System is now much quicker to start but requires an explicit call to refresh memory else it deafults to 0 (oops)	2023-01-04 20:08:20 +00:00
Guillaume Gomez	72b811c278	Update sysinfo version to 0.26.7	2023-01-04 19:38:40 +00:00
Phil Clifford	b478534b22	added deb-get as installation source	2022-10-24 23:25:13 +01:00
DIRE	2ca7177446	FEATURE: support only directories will be displayed. Flag -D	2022-10-05 23:26:10 +01:00
Collin Styles	e858f9e976	Read `inputs` from stdin when applicable	2022-10-01 11:16:14 +01:00
Collin Styles	0a67191054	Add a direct dependency on the `atty` crate	2022-10-01 11:16:14 +01:00
andy.boot	c363e5ff8b	Fix: Only create large stack size if enough memory Small boxes do not have enough memory to create a large stack Conversely we want a large stack size for large boxes with a very highly nested directory structure. Version: New version	2022-08-31 21:14:56 +01:00