Fix completions.

cargo update
Fix filename completions for zsh and bash (#331 )
2025-12-11 07:10:42 -08:00 · 2024-02-12 23:09:23 +00:00 · 2024-02-11 20:18:09 +00:00 · 2024-02-11 20:17:33 +00:00
23 changed files with 420 additions and 1381 deletions
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -4,28 +4,13 @@ version = 3

 [[package]]
 name = "aho-corasick"
-version = "1.1.3"
+version = "1.1.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8e60d3430d3a69478ad0993f19238d2df97c507009a52b3c10addcd7f6bcb916"
+checksum = "b2969dcb958b36655471fc61f7e416fa76033bdd4bfed0678d8fee1e2d07a1f0"
 dependencies = [
 "memchr",
 ]

-[[package]]
-name = "android-tzdata"
-version = "0.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e999941b234f3131b00bc13c22d06e8c5ff726d1b6318ac7eb276997bbb4fef0"
-
-[[package]]
-name = "android_system_properties"
-version = "0.1.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "819e7219dbd41043ac279b19830f2efc897156490d7fd6ea916720117ee66311"
-dependencies = [
- "libc",
-]
-
 [[package]]
 name = "ansi_term"
 version = "0.12.1"
@@ -37,9 +22,9 @@ dependencies = [

 [[package]]
 name = "anstream"
-version = "0.6.13"
+version = "0.6.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d96bd03f33fe50a863e394ee9718a706f988b9079b20c3784fb726e7678b62fb"
+checksum = "6e2e1ebcb11de5c03c67de28a7df593d32191b44939c482e97702baaaa6ab6a5"
 dependencies = [
 "anstyle",
 "anstyle-parse",
@@ -85,9 +70,9 @@ dependencies = [

 [[package]]
 name = "assert_cmd"
-version = "2.0.14"
+version = "2.0.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ed72493ac66d5804837f480ab3766c72bdfab91a65e565fc54fa9e42db0073a8"
+checksum = "00ad3f3a942eee60335ab4342358c161ee296829e0d16ff42fc1d6cb07815467"
 dependencies = [
 "anstyle",
 "bstr",
@@ -98,12 +83,6 @@ dependencies = [
 "wait-timeout",
 ]

-[[package]]
-name = "autocfg"
-version = "1.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0"
-
 [[package]]
 name = "bitflags"
 version = "1.3.2"
@@ -112,73 +91,41 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"

 [[package]]
 name = "bitflags"
-version = "2.5.0"
+version = "2.4.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cf4b9d6a944f767f8e5e0db018570623c85f3d925ac718db4e06d0187adb21c1"
+checksum = "ed570934406eb16438a4e976b1b4500774099c13b8cb96eec99f620f05090ddf"

 [[package]]
 name = "bstr"
-version = "1.9.1"
+version = "1.9.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "05efc5cfd9110c8416e471df0e96702d58690178e206e61b7173706673c93706"
+checksum = "c48f0051a4b4c5e0b6d365cd04af53aeaa209e3cc15ec2cdb69e73cc87fbd0dc"
 dependencies = [
 "memchr",
 "regex-automata",
 "serde",
 ]

-[[package]]
-name = "bumpalo"
-version = "3.16.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "79296716171880943b8470b5f8d03aa55eb2e645a4874bdbb28adb49162e012c"
-
-[[package]]
-name = "cc"
-version = "1.0.97"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "099a5357d84c4c61eb35fc8eafa9a79a902c2f76911e5747ced4e032edd8d9b4"
-
 [[package]]
 name = "cfg-if"
 version = "1.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"

-[[package]]
-name = "cfg_aliases"
-version = "0.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fd16c4719339c4530435d38e511904438d07cce7950afa3718a84ac36c10e89e"
-
-[[package]]
-name = "chrono"
-version = "0.4.38"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a21f936df1771bf62b77f047b726c4625ff2e8aa607c01ec06e5a05bd8463401"
-dependencies = [
- "android-tzdata",
- "iana-time-zone",
- "js-sys",
- "num-traits",
- "wasm-bindgen",
- "windows-targets 0.52.4",
-]
-
 [[package]]
 name = "clap"
-version = "4.5.4"
+version = "4.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "90bc066a67923782aa8515dbaea16946c5bcc5addbd668bb80af688e53e548a0"
+checksum = "80c21025abd42669a92efc996ef13cfb2c5c627858421ea58d5c3b331a6c134f"
 dependencies = [
 "clap_builder",
 ]

 [[package]]
 name = "clap_builder"
-version = "4.5.2"
+version = "4.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ae129e2e766ae0ec03484e609954119f123cc1fe650337e155d03b022f24f7b4"
+checksum = "458bf1f341769dfcf849846f65dffdf9146daa56bcd2a47cb4e1de9915567c99"
 dependencies = [
 "anstream",
 "anstyle",
@@ -188,9 +135,9 @@ dependencies = [

 [[package]]
 name = "clap_complete"
-version = "4.5.1"
+version = "4.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "885e4d7d5af40bfb99ae6f9433e292feac98d452dcb3ec3d25dfe7552b77da8c"
+checksum = "299353be8209bd133b049bf1c63582d184a8b39fd9c04f15fe65f50f88bdfe6c"
 dependencies = [
 "clap",
 ]
@@ -259,16 +206,6 @@ version = "0.8.19"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "248e3bacc7dc6baa3b21e405ee045c3047101a49145e7e9eca583ab4c2ca5345"

-[[package]]
-name = "ctrlc"
-version = "3.4.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "672465ae37dc1bc6380a6547a8883d5dd397b0f1faaad4f265726cc7042a5345"
-dependencies = [
- "nix",
- "windows-sys 0.52.0",
-]
-
 [[package]]
 name = "difflib"
 version = "0.4.0"
@@ -303,23 +240,19 @@ checksum = "fea41bba32d969b513997752735605054bc0dfa92b4c56bf1189f2e174be7a10"

 [[package]]
 name = "du-dust"
-version = "1.1.1"
+version = "0.9.0"
 dependencies = [
 "ansi_term",
 "assert_cmd",
- "chrono",
 "clap",
 "clap_complete",
 "clap_mangen",
 "config-file",
- "ctrlc",
 "directories",
- "filesize",
 "lscolors",
 "rayon",
 "regex",
 "serde",
- "serde_json",
 "stfu8",
 "sysinfo",
 "tempfile",
@@ -347,18 +280,9 @@ dependencies = [

 [[package]]
 name = "fastrand"
-version = "2.0.2"
+version = "2.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "658bd65b1cf4c852a3cc96f18a8ce7b5640f6b703f905c7d74532294c2a63984"
-
-[[package]]
-name = "filesize"
-version = "0.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "12d741e2415d4e2e5bd1c1d00409d1a8865a57892c2d689b504365655d237d43"
-dependencies = [
- "winapi",
-]
+checksum = "25cbce373ec4653f1a01a31e8a5e5ec0c622dc27ff9c4e6606eefef5cbbed4a5"

 [[package]]
 name = "getrandom"
@@ -373,32 +297,9 @@ dependencies = [

 [[package]]
 name = "hermit-abi"
-version = "0.3.9"
+version = "0.3.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d231dfb89cfffdbc30e7fc41579ed6066ad03abda9e567ccafae602b97ec5024"
-
-[[package]]
-name = "iana-time-zone"
-version = "0.1.60"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e7ffbb5a1b541ea2561f8c41c087286cc091e21e556a4f09a8f6cbf17b69b141"
-dependencies = [
- "android_system_properties",
- "core-foundation-sys",
- "iana-time-zone-haiku",
- "js-sys",
- "wasm-bindgen",
- "windows-core",
-]
-
-[[package]]
-name = "iana-time-zone-haiku"
-version = "0.1.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f31827a206f56af32e590ba56d5d2d085f558508192593743f16b2306495269f"
-dependencies = [
- "cc",
-]
+checksum = "d0c62115964e08cb8039170eb33c1d0e2388a256930279edca206fff675f82c3"

 [[package]]
 name = "io-lifetimes"
@@ -411,26 +312,11 @@ dependencies = [
 "windows-sys 0.48.0",
 ]

-[[package]]
-name = "itoa"
-version = "1.0.11"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "49f1f14873335454500d59611f1cf4a4b0f786f9ac11f4312a78e4cf2566695b"
-
-[[package]]
-name = "js-sys"
-version = "0.3.69"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "29c15563dc2726973df627357ce0c9ddddbea194836909d655df6a75d2cf296d"
-dependencies = [
- "wasm-bindgen",
-]
-
 [[package]]
 name = "libc"
-version = "0.2.155"
+version = "0.2.153"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "97b3888a4aecf77e811145cadf6eef5901f4782c53886191b2f693f24761847c"
+checksum = "9c198f91728a82281a64e1f4f9eeb25d82cb32a5de251c6bd1b5154d63a8e7bd"

 [[package]]
 name = "libredox"
@@ -438,7 +324,7 @@ version = "0.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "85c833ca1e66078851dba29046874e38f08b2c883700aa29a03ddd3b23814ee8"
 dependencies = [
- "bitflags 2.5.0",
+ "bitflags 2.4.2",
 "libc",
 "redox_syscall",
 ]
@@ -455,12 +341,6 @@ version = "0.4.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "01cda141df6706de531b6c46c3a33ecca755538219bd484262fa09410c13539c"

-[[package]]
-name = "log"
-version = "0.4.21"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "90ed8c1e510134f979dbc4f070f87d4313098b704861a105fe34231c70a3901c"
-
 [[package]]
 name = "lscolors"
 version = "0.13.0"
@@ -477,18 +357,6 @@ version = "2.7.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "523dc4f511e55ab87b694dc30d0f820d60906ef06413f93d4d7a1385599cc149"

-[[package]]
-name = "nix"
-version = "0.28.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ab2156c4fce2f8df6c499cc1c763e4394b7482525bf2a9701c9d79d215f519e4"
-dependencies = [
- "bitflags 2.5.0",
- "cfg-if",
- "cfg_aliases",
- "libc",
-]
-
 [[package]]
 name = "ntapi"
 version = "0.4.1"
@@ -508,15 +376,6 @@ dependencies = [
 "winapi",
 ]

-[[package]]
-name = "num-traits"
-version = "0.2.19"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "071dfc062690e90b734c0b2273ce72ad0ffa95f0c74596bc250dcfd960262841"
-dependencies = [
- "autocfg",
-]
-
 [[package]]
 name = "once_cell"
 version = "1.19.0"
@@ -558,9 +417,9 @@ dependencies = [

 [[package]]
 name = "proc-macro2"
-version = "1.0.79"
+version = "1.0.78"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e835ff2298f5721608eb1a980ecaee1aef2c132bf95ecc026a11b7bf3c01c02e"
+checksum = "e2422ad645d89c99f8f3e6b88a9fdeca7fabeac836b1002371c4367c8f984aae"
 dependencies = [
 "unicode-ident",
 ]
@@ -576,9 +435,9 @@ dependencies = [

 [[package]]
 name = "rayon"
-version = "1.10.0"
+version = "1.8.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b418a60154510ca1a002a752ca9714984e21e4241e804d32555251faf8b78ffa"
+checksum = "fa7237101a77a10773db45d62004a272517633fbcc3df19d96455ede1122e051"
 dependencies = [
 "either",
 "rayon-core",
@@ -616,9 +475,9 @@ dependencies = [

 [[package]]
 name = "regex"
-version = "1.10.4"
+version = "1.10.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c117dbdfde9c8308975b6a18d71f3f385c89461f7b3fb054288ecf2a2058ba4c"
+checksum = "b62dbe01f0b06f9d8dc7d49e05a0785f153b00b2c227856282f671e0318c9b15"
 dependencies = [
 "aho-corasick",
 "memchr",
@@ -628,9 +487,9 @@ dependencies = [

 [[package]]
 name = "regex-automata"
-version = "0.4.6"
+version = "0.4.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "86b83b8b9847f9bf95ef68afb0b8e6cdb80f498442f5179a29fad448fcc1eaea"
+checksum = "5bb987efffd3c6d0d8f5f89510bb458559eab11e4f869acb20bf845e016259cd"
 dependencies = [
 "aho-corasick",
 "memchr",
@@ -665,54 +524,37 @@ dependencies = [

 [[package]]
 name = "rustix"
-version = "0.38.32"
+version = "0.38.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "65e04861e65f21776e67888bfbea442b3642beaa0138fdb1dd7a84a52dffdb89"
+checksum = "6ea3e1a662af26cd7a3ba09c0297a31af215563ecf42817c98df621387f4e949"
 dependencies = [
- "bitflags 2.5.0",
+ "bitflags 2.4.2",
 "errno",
 "libc",
 "linux-raw-sys 0.4.13",
 "windows-sys 0.52.0",
 ]

-[[package]]
-name = "ryu"
-version = "1.0.17"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e86697c916019a8588c99b5fac3cead74ec0b4b819707a682fd4d23fa0ce1ba1"
-
 [[package]]
 name = "serde"
-version = "1.0.197"
+version = "1.0.196"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3fb1c873e1b9b056a4dc4c0c198b24c3ffa059243875552b2bd0933b1aee4ce2"
+checksum = "870026e60fa08c69f064aa766c10f10b1d62db9ccd4d0abb206472bee0ce3b32"
 dependencies = [
 "serde_derive",
 ]

 [[package]]
 name = "serde_derive"
-version = "1.0.197"
+version = "1.0.196"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7eb0b34b42edc17f6b7cac84a52a1c5f0e1bb2227e997ca9011ea3dd34e8610b"
+checksum = "33c85360c95e7d137454dc81d9a4ed2b8efd8fbe19cee57357b32b9771fccb67"
 dependencies = [
 "proc-macro2",
 "quote",
 "syn",
 ]

-[[package]]
-name = "serde_json"
-version = "1.0.116"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3e17db7126d17feb94eb3fad46bf1a96b034e8aacbc2e775fe81505f8b0b2813"
-dependencies = [
- "itoa",
- "ryu",
- "serde",
-]
-
 [[package]]
 name = "stfu8"
 version = "0.2.7"
@@ -727,9 +569,9 @@ checksum = "5ee073c9e4cd00e28217186dbe12796d692868f432bf2e97ee73bed0c56dfa01"

 [[package]]
 name = "syn"
-version = "2.0.55"
+version = "2.0.48"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "002a1b3dbf967edfafc32655d0f377ab0bb7b994aa1d32c8cc7e9b8bf3ebb8f0"
+checksum = "0f3531638e407dfc0814761abb7c00a5b54992b849452a0646b7f65c9f770f3f"
 dependencies = [
 "proc-macro2",
 "quote",
@@ -753,13 +595,13 @@ dependencies = [

 [[package]]
 name = "tempfile"
-version = "3.10.1"
+version = "3.10.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "85b77fafb263dd9d05cbeac119526425676db3784113aa9295c88498cbf8bff1"
+checksum = "a365e8cd18e44762ef95d87f284f4b5cd04107fec2ff3052bd6a3e6069669e67"
 dependencies = [
 "cfg-if",
 "fastrand",
- "rustix 0.38.32",
+ "rustix 0.38.31",
 "windows-sys 0.52.0",
 ]

@@ -781,18 +623,18 @@ checksum = "3369f5ac52d5eb6ab48c6b4ffdc8efbcad6b89c765749064ba298f2c68a16a76"

 [[package]]
 name = "thiserror"
-version = "1.0.58"
+version = "1.0.57"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "03468839009160513471e86a034bb2c5c0e4baae3b43f79ffc55c4a5427b3297"
+checksum = "1e45bcbe8ed29775f228095caf2cd67af7a4ccf756ebff23a306bf3e8b47b24b"
 dependencies = [
 "thiserror-impl",
 ]

 [[package]]
 name = "thiserror-impl"
-version = "1.0.58"
+version = "1.0.57"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c61f3ba182994efc43764a46c018c347bc492c79f024e705f46567b418f6d4f7"
+checksum = "a953cb265bef375dae3de6663da4d3804eee9682ea80d8e2542529b73c531c81"
 dependencies = [
 "proc-macro2",
 "quote",
@@ -847,60 +689,6 @@ version = "0.11.0+wasi-snapshot-preview1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423"

-[[package]]
-name = "wasm-bindgen"
-version = "0.2.92"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4be2531df63900aeb2bca0daaaddec08491ee64ceecbee5076636a3b026795a8"
-dependencies = [
- "cfg-if",
- "wasm-bindgen-macro",
-]
-
-[[package]]
-name = "wasm-bindgen-backend"
-version = "0.2.92"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "614d787b966d3989fa7bb98a654e369c762374fd3213d212cfc0251257e747da"
-dependencies = [
- "bumpalo",
- "log",
- "once_cell",
- "proc-macro2",
- "quote",
- "syn",
- "wasm-bindgen-shared",
-]
-
-[[package]]
-name = "wasm-bindgen-macro"
-version = "0.2.92"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a1f8823de937b71b9460c0c34e25f3da88250760bec0ebac694b49997550d726"
-dependencies = [
- "quote",
- "wasm-bindgen-macro-support",
-]
-
-[[package]]
-name = "wasm-bindgen-macro-support"
-version = "0.2.92"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e94f17b526d0a461a191c78ea52bbce64071ed5c04c9ffe424dcb38f74171bb7"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn",
- "wasm-bindgen-backend",
- "wasm-bindgen-shared",
-]
-
-[[package]]
-name = "wasm-bindgen-shared"
-version = "0.2.92"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "af190c94f2773fdb3729c55b007a722abb5384da03bc0986df4c289bf5567e96"
-
 [[package]]
 name = "winapi"
 version = "0.3.9"
@@ -919,11 +707,11 @@ checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6"

 [[package]]
 name = "winapi-util"
-version = "0.1.8"
+version = "0.1.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4d4cc384e1e73b93bafa6fb4f1df8c41695c8a91cf9c4c64358067d15a7b6c6b"
+checksum = "f29e6f9198ba0d26b4c9f07dbe6f9ed633e1f3d5b8b414090084349e46a52596"
 dependencies = [
- "windows-sys 0.52.0",
+ "winapi",
 ]

 [[package]]
@@ -932,15 +720,6 @@ version = "0.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"

-[[package]]
-name = "windows-core"
-version = "0.52.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "33ab640c8d7e35bf8ba19b884ba838ceb4fba93a4e8c65a9059d08afcfc683d9"
-dependencies = [
- "windows-targets 0.52.4",
-]
-
 [[package]]
 name = "windows-sys"
 version = "0.48.0"
@@ -956,7 +735,7 @@ version = "0.52.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d"
 dependencies = [
- "windows-targets 0.52.4",
+ "windows-targets 0.52.0",
 ]

 [[package]]
@@ -976,17 +755,17 @@ dependencies = [

 [[package]]
 name = "windows-targets"
-version = "0.52.4"
+version = "0.52.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7dd37b7e5ab9018759f893a1952c9420d060016fc19a472b4bb20d1bdd694d1b"
+checksum = "8a18201040b24831fbb9e4eb208f8892e1f50a37feb53cc7ff887feb8f50e7cd"
 dependencies = [
- "windows_aarch64_gnullvm 0.52.4",
- "windows_aarch64_msvc 0.52.4",
- "windows_i686_gnu 0.52.4",
- "windows_i686_msvc 0.52.4",
- "windows_x86_64_gnu 0.52.4",
- "windows_x86_64_gnullvm 0.52.4",
- "windows_x86_64_msvc 0.52.4",
+ "windows_aarch64_gnullvm 0.52.0",
+ "windows_aarch64_msvc 0.52.0",
+ "windows_i686_gnu 0.52.0",
+ "windows_i686_msvc 0.52.0",
+ "windows_x86_64_gnu 0.52.0",
+ "windows_x86_64_gnullvm 0.52.0",
+ "windows_x86_64_msvc 0.52.0",
 ]

 [[package]]
@@ -997,9 +776,9 @@ checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8"

 [[package]]
 name = "windows_aarch64_gnullvm"
-version = "0.52.4"
+version = "0.52.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bcf46cf4c365c6f2d1cc93ce535f2c8b244591df96ceee75d8e83deb70a9cac9"
+checksum = "cb7764e35d4db8a7921e09562a0304bf2f93e0a51bfccee0bd0bb0b666b015ea"

 [[package]]
 name = "windows_aarch64_msvc"
@@ -1009,9 +788,9 @@ checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc"

 [[package]]
 name = "windows_aarch64_msvc"
-version = "0.52.4"
+version = "0.52.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "da9f259dd3bcf6990b55bffd094c4f7235817ba4ceebde8e6d11cd0c5633b675"
+checksum = "bbaa0368d4f1d2aaefc55b6fcfee13f41544ddf36801e793edbbfd7d7df075ef"

 [[package]]
 name = "windows_i686_gnu"
@@ -1021,9 +800,9 @@ checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e"

 [[package]]
 name = "windows_i686_gnu"
-version = "0.52.4"
+version = "0.52.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b474d8268f99e0995f25b9f095bc7434632601028cf86590aea5c8a5cb7801d3"
+checksum = "a28637cb1fa3560a16915793afb20081aba2c92ee8af57b4d5f28e4b3e7df313"

 [[package]]
 name = "windows_i686_msvc"
@@ -1033,9 +812,9 @@ checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406"

 [[package]]
 name = "windows_i686_msvc"
-version = "0.52.4"
+version = "0.52.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1515e9a29e5bed743cb4415a9ecf5dfca648ce85ee42e15873c3cd8610ff8e02"
+checksum = "ffe5e8e31046ce6230cc7215707b816e339ff4d4d67c65dffa206fd0f7aa7b9a"

 [[package]]
 name = "windows_x86_64_gnu"
@@ -1045,9 +824,9 @@ checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e"

 [[package]]
 name = "windows_x86_64_gnu"
-version = "0.52.4"
+version = "0.52.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5eee091590e89cc02ad514ffe3ead9eb6b660aedca2183455434b93546371a03"
+checksum = "3d6fa32db2bc4a2f5abeacf2b69f7992cd09dca97498da74a151a3132c26befd"

 [[package]]
 name = "windows_x86_64_gnullvm"
@@ -1057,9 +836,9 @@ checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc"

 [[package]]
 name = "windows_x86_64_gnullvm"
-version = "0.52.4"
+version = "0.52.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "77ca79f2451b49fa9e2af39f0747fe999fcda4f5e241b2898624dca97a1f2177"
+checksum = "1a657e1e9d3f514745a572a6846d3c7aa7dbe1658c056ed9c3344c4109a6949e"

 [[package]]
 name = "windows_x86_64_msvc"
@@ -1069,6 +848,6 @@ checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538"

 [[package]]
 name = "windows_x86_64_msvc"
-version = "0.52.4"
+version = "0.52.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "32b752e52a2da0ddfbdbcc6fceadfeede4c939ed16d13e648833a61dfb611ed8"
+checksum = "dff9641d1cd4be8d1a070daf9e3773c5f67e78b4d9d42263020c057706765c04"
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "du-dust"
 description = "A more intuitive version of du"
-version = "1.1.1"
+version = "0.9.0"
 authors = ["bootandy <bootandy@gmail.com>", "nebkor <code@ardent.nebcorp.com>"]
 edition = "2021"
 readme = "README.md"
@@ -38,15 +38,11 @@ stfu8 = "0.2"
 regex = "1"
 config-file = "0.2"
 serde = { version = "1.0", features = ["derive"] }
-serde_json = "1.0"
 directories = "4"
 sysinfo = "0.27"
-ctrlc = "3.4"
-chrono = "0.4"

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

 [dev-dependencies]
 assert_cmd = "2"
--- a/README.md
+++ b/README.md
@@ -25,16 +25,12 @@ Because I want an easy way to see where my disk is being used.

 #### 🍺 Homebrew (Linux)

- `brew install dust`
+- `brew tap tgotwig/linux-dust && brew install dust`

 #### [Pacstall](https://github.com/pacstall/pacstall) (Debian/Ubuntu)

 - `pacstall -I dust-bin`

-### Anaconda (conda-forge)
-
- `conda install -c conda-forge dust`
-
 #### [deb-get](https://github.com/wimpysworld/deb-get) (Debian/Ubuntu)

 - `deb-get install du-dust`
@@ -72,14 +68,13 @@ Usage: dust -d 3  (Shows 3 levels of subdirectories)
 Usage: dust -D (Show only directories (eg dust -D))
 Usage: dust -F (Show only files - finds your largest files)
 Usage: dust -r (reverse order of output)
-Usage: dust -o si/b/kb/kib/mb/mib/gb/gib (si - prints sizes in powers of 1000. Others print size in that format).
+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')
 Usage: dust -x (Only show directories on the same filesystem)
 Usage: dust -b (Do not show percentages or draw ASCII bars)
-Usage: dust -B (--bars-on-right - Percent bars moved to right side of screen)
+Usage: dust -B (--bars-on-right - Percent bars moved to right side of screen])
 Usage: dust -i (Do not show hidden files)
 Usage: dust -c (No colors [monochrome])
-Usage: dust -C (Force colors)
 Usage: dust -f (Count files instead of diskspace)
 Usage: dust -t (Group by filetype)
 Usage: dust -z 10M (min-size, Only include files larger than 10M)
@@ -90,9 +85,7 @@ Usage: dust -P (Disable the progress indicator)
 Usage: dust -R (For screen readers. Removes bars/symbols. Adds new column: depth level. (May want to use -p for full path too))
 Usage: dust -S (Custom Stack size - Use if you see: 'fatal runtime error: stack overflow' (default allocation: low memory=1048576, high memory=1073741824)"),
 Usage: dust --skip-total (No total row will be displayed)
-Usage: dust -z 40000/30MB/20kib (Exclude output files/directories below size 40000 bytes / 30MB / 20KiB)
-Usage: dust -j (Prints JSON representation of directories, try: dust -j  | jq)
-Usage: dust --files0-from=FILE (Reads null-terminated file paths from FILE); If FILE is - then read from stdin
+Usage: dust -z 4000000 (Exclude output files/directories below size 4MB)
 ```

 ## Config file
--- a/ci/how2publish.txt
+++ b/ci/how2publish.txt
@@ -1,21 +1,14 @@
 # ----------- To do a release ---------
-
-# ----------- Pre release ---------
 # Compare times of runs to check no drastic slow down:
-#  hyperfine 'target/release/dust /home/andy'
-#  hyperfine 'dust /home/andy'
-
-# ----------- Release ---------
-# inc version in cargo.toml
-# cargo build --release
-# commit changed files
-# merge to master in github
+#  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
 #   git push origin v0.4.5

 # cargo publish to put it in crates.io
- 
-# Optional: To install locally
+
+# To install locally [Do before pushing it]
 #cargo install --path .
--- a/completions/_dust
+++ b/completions/_dust
@@ -15,35 +15,24 @@ _dust() {

    local context curcontext="$curcontext" state line
    _arguments "${_arguments_options[@]}" \
-'-d+[Depth to show]:DEPTH: ' \
-'--depth=[Depth to show]:DEPTH: ' \
-'-T+[Number of threads to use]: : ' \
-'--threads=[Number of threads to use]: : ' \
-'-n+[Number of lines of output to show. (Default is terminal_height - 10)]:NUMBER: ' \
-'--number-of-lines=[Number of lines of output to show. (Default is terminal_height - 10)]:NUMBER: ' \
-'*-X+[Exclude any file or directory with this name]:PATH:_files' \
-'*--ignore-directory=[Exclude any file or directory with this name]:PATH:_files' \
-'-I+[Exclude any file or directory with a regex matching that listed in this file, the file entries will be added to the ignore regexs provided by --invert_filter]:FILE:_files' \
-'--ignore-all-in-file=[Exclude any file or directory with a regex matching that listed in this file, the file entries will be added to the ignore regexs provided by --invert_filter]:FILE:_files' \
-'-z+[Minimum size file to include in output]:MIN_SIZE: ' \
-'--min-size=[Minimum size file to include in output]:MIN_SIZE: ' \
-'(-e --filter -t --file_types)*-v+[Exclude filepaths matching this regex. To ignore png files type\: -v "\\.png\$" ]:REGEX: ' \
-'(-e --filter -t --file_types)*--invert-filter=[Exclude filepaths matching this regex. To ignore png files type\: -v "\\.png\$" ]:REGEX: ' \
-'(-t --file_types)*-e+[Only include filepaths matching this regex. For png files type\: -e "\\.png\$" ]:REGEX: ' \
-'(-t --file_types)*--filter=[Only include filepaths matching this regex. For png files type\: -e "\\.png\$" ]:REGEX: ' \
-'-w+[Specify width of output overriding the auto detection of terminal width]:WIDTH: ' \
-'--terminal_width=[Specify width of output overriding the auto detection of terminal width]:WIDTH: ' \
-'-o+[Changes output display size. si will print sizes in powers of 1000. b k m g t kb mb gb tb will print the whole tree in that size.]:FORMAT:(si b k m g t kb mb gb tb)' \
-'--output-format=[Changes output display size. si will print sizes in powers of 1000. b k m g t kb mb gb tb will print the whole tree in that size.]:FORMAT:(si b k m g t kb mb gb tb)' \
-'-S+[Specify memory to use as stack size - use if you see\: '\''fatal runtime error\: stack overflow'\'' (default low memory=1048576, high memory=1073741824)]:STACK_SIZE: ' \
-'--stack-size=[Specify memory to use as stack size - use if you see\: '\''fatal runtime error\: stack overflow'\'' (default low memory=1048576, high memory=1073741824)]:STACK_SIZE: ' \
-'-M+[+/-n matches files modified more/less than n days ago , and n matches files modified exactly n days ago, days are rounded down.That is +n => (−∞, curr−(n+1)), n => \[curr−(n+1), curr−n), and -n => (𝑐𝑢𝑟𝑟−𝑛, +∞)]: : ' \
-'--mtime=[+/-n matches files modified more/less than n days ago , and n matches files modified exactly n days ago, days are rounded down.That is +n => (−∞, curr−(n+1)), n => \[curr−(n+1), curr−n), and -n => (𝑐𝑢𝑟𝑟−𝑛, +∞)]: : ' \
-'-A+[just like -mtime, but based on file access time]: : ' \
-'--atime=[just like -mtime, but based on file access time]: : ' \
-'-y+[just like -mtime, but based on file change time]: : ' \
-'--ctime=[just like -mtime, but based on file change time]: : ' \
-'--files0-from=[run dust on NUL-terminated file names specified in file; if argument is -, then read names from standard input]: :_files' \
+'-d+[Depth to show]: : ' \
+'--depth=[Depth to show]: : ' \
+'-n+[Number of lines of output to show. (Default is terminal_height - 10)]: : ' \
+'--number-of-lines=[Number of lines of output to show. (Default is terminal_height - 10)]: : ' \
+'*-X+[Exclude any file or directory with this name]: : ' \
+'*--ignore-directory=[Exclude any file or directory with this name]: : ' \
+'-I+[Exclude any file or directory with a regex matching that listed in this file, the file entries will be added to the ignore regexs provided by --invert_filter]: : ' \
+'--ignore-all-in-file=[Exclude any file or directory with a regex matching that listed in this file, the file entries will be added to the ignore regexs provided by --invert_filter]: : ' \
+'-z+[Minimum size file to include in output]: : ' \
+'--min-size=[Minimum size file to include in output]: : ' \
+'(-e --filter -t --file_types)*-v+[Exclude filepaths matching this regex. To ignore png files type\: -v "\\.png\$" ]: : ' \
+'(-e --filter -t --file_types)*--invert-filter=[Exclude filepaths matching this regex. To ignore png files type\: -v "\\.png\$" ]: : ' \
+'(-t --file_types)*-e+[Only include filepaths matching this regex. For png files type\: -e "\\.png\$" ]: : ' \
+'(-t --file_types)*--filter=[Only include filepaths matching this regex. For png files type\: -e "\\.png\$" ]: : ' \
+'-w+[Specify width of output overriding the auto detection of terminal width]: : ' \
+'--terminal_width=[Specify width of output overriding the auto detection of terminal width]: : ' \
+'-S+[Specify memory to use as stack size - use if you see\: '\''fatal runtime error\: stack overflow'\'' (default low memory=1048576, high memory=1073741824)]: : ' \
+'--stack-size=[Specify memory to use as stack size - use if you see\: '\''fatal runtime error\: stack overflow'\'' (default low memory=1048576, high memory=1073741824)]: : ' \
 '-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]' \
@@ -56,8 +45,6 @@ _dust() {
 '--reverse[Print tree upside down (biggest highest)]' \
 '-c[No colors will be printed (Useful for commands like\: watch)]' \
 '--no-colors[No colors will be printed (Useful for commands like\: watch)]' \
-'-C[Force colors print]' \
-'--force-colors[Force colors print]' \
 '-b[No percent bars or percentages will be displayed]' \
 '--no-percent-bars[No percent bars or percentages will be displayed]' \
 '-B[percent bars moved to right side of screen]' \
@@ -71,15 +58,14 @@ _dust() {
 '--ignore_hidden[Do not display hidden files]' \
 '(-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.]' \
-'--print-errors[Print path with errors.]' \
 '(-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)]' \
-'-j[Output the directory tree as json to the current directory]' \
-'--output-json[Output the directory tree as json to the current directory]' \
 '-h[Print help]' \
 '--help[Print help]' \
 '-V[Print version]' \
--- a/completions/_dust.ps1
+++ b/completions/_dust.ps1
@@ -23,8 +23,6 @@ Register-ArgumentCompleter -Native -CommandName 'dust' -ScriptBlock {
        'dust' {
            [CompletionResult]::new('-d', 'd', [CompletionResultType]::ParameterName, 'Depth to show')
            [CompletionResult]::new('--depth', 'depth', [CompletionResultType]::ParameterName, 'Depth to show')
-            [CompletionResult]::new('-T', 'T ', [CompletionResultType]::ParameterName, 'Number of threads to use')
-            [CompletionResult]::new('--threads', 'threads', [CompletionResultType]::ParameterName, 'Number of threads to use')
            [CompletionResult]::new('-n', 'n', [CompletionResultType]::ParameterName, 'Number of lines of output to show. (Default is terminal_height - 10)')
            [CompletionResult]::new('--number-of-lines', 'number-of-lines', [CompletionResultType]::ParameterName, 'Number of lines of output to show. (Default is terminal_height - 10)')
            [CompletionResult]::new('-X', 'X ', [CompletionResultType]::ParameterName, 'Exclude any file or directory with this name')
@@ -39,17 +37,8 @@ Register-ArgumentCompleter -Native -CommandName 'dust' -ScriptBlock {
            [CompletionResult]::new('--filter', 'filter', [CompletionResultType]::ParameterName, 'Only include filepaths matching this regex. For png files type: -e "\.png$" ')
            [CompletionResult]::new('-w', 'w', [CompletionResultType]::ParameterName, 'Specify width of output overriding the auto detection of terminal width')
            [CompletionResult]::new('--terminal_width', 'terminal_width', [CompletionResultType]::ParameterName, 'Specify width of output overriding the auto detection of terminal width')
-            [CompletionResult]::new('-o', 'o', [CompletionResultType]::ParameterName, 'Changes output display size. si will print sizes in powers of 1000. b k m g t kb mb gb tb will print the whole tree in that size.')
-            [CompletionResult]::new('--output-format', 'output-format', [CompletionResultType]::ParameterName, 'Changes output display size. si will print sizes in powers of 1000. b k m g t kb mb gb tb will print the whole tree in that size.')
            [CompletionResult]::new('-S', 'S ', [CompletionResultType]::ParameterName, 'Specify memory to use as stack size - use if you see: ''fatal runtime error: stack overflow'' (default low memory=1048576, high memory=1073741824)')
            [CompletionResult]::new('--stack-size', 'stack-size', [CompletionResultType]::ParameterName, 'Specify memory to use as stack size - use if you see: ''fatal runtime error: stack overflow'' (default low memory=1048576, high memory=1073741824)')
-            [CompletionResult]::new('-M', 'M ', [CompletionResultType]::ParameterName, '+/-n matches files modified more/less than n days ago , and n matches files modified exactly n days ago, days are rounded down.That is +n => (−∞, curr−(n+1)), n => [curr−(n+1), curr−n), and -n => (𝑐𝑢𝑟𝑟−𝑛, +∞)')
-            [CompletionResult]::new('--mtime', 'mtime', [CompletionResultType]::ParameterName, '+/-n matches files modified more/less than n days ago , and n matches files modified exactly n days ago, days are rounded down.That is +n => (−∞, curr−(n+1)), n => [curr−(n+1), curr−n), and -n => (𝑐𝑢𝑟𝑟−𝑛, +∞)')
-            [CompletionResult]::new('-A', 'A ', [CompletionResultType]::ParameterName, 'just like -mtime, but based on file access time')
-            [CompletionResult]::new('--atime', 'atime', [CompletionResultType]::ParameterName, 'just like -mtime, but based on file access time')
-            [CompletionResult]::new('-y', 'y', [CompletionResultType]::ParameterName, 'just like -mtime, but based on file change time')
-            [CompletionResult]::new('--ctime', 'ctime', [CompletionResultType]::ParameterName, 'just like -mtime, but based on file change time')
-            [CompletionResult]::new('--files0-from', 'files0-from', [CompletionResultType]::ParameterName, 'run dust on NUL-terminated file names specified in file; if argument is -, then read names from standard input')
            [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')
@@ -62,8 +51,6 @@ Register-ArgumentCompleter -Native -CommandName 'dust' -ScriptBlock {
            [CompletionResult]::new('--reverse', 'reverse', [CompletionResultType]::ParameterName, 'Print tree upside down (biggest highest)')
            [CompletionResult]::new('-c', 'c', [CompletionResultType]::ParameterName, 'No colors will be printed (Useful for commands like: watch)')
            [CompletionResult]::new('--no-colors', 'no-colors', [CompletionResultType]::ParameterName, 'No colors will be printed (Useful for commands like: watch)')
-            [CompletionResult]::new('-C', 'C ', [CompletionResultType]::ParameterName, 'Force colors print')
-            [CompletionResult]::new('--force-colors', 'force-colors', [CompletionResultType]::ParameterName, 'Force colors print')
            [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('-B', 'B ', [CompletionResultType]::ParameterName, 'percent bars moved to right side of screen')
@@ -77,15 +64,14 @@ Register-ArgumentCompleter -Native -CommandName 'dust' -ScriptBlock {
            [CompletionResult]::new('--ignore_hidden', 'ignore_hidden', [CompletionResultType]::ParameterName, 'Do not display hidden files')
            [CompletionResult]::new('-t', 't', [CompletionResultType]::ParameterName, 'show only these file types')
            [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('--print-errors', 'print-errors', [CompletionResultType]::ParameterName, 'Print path with errors.')
            [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)')
-            [CompletionResult]::new('-j', 'j', [CompletionResultType]::ParameterName, 'Output the directory tree as json to the current directory')
-            [CompletionResult]::new('--output-json', 'output-json', [CompletionResultType]::ParameterName, 'Output the directory tree as json to the current directory')
            [CompletionResult]::new('-h', 'h', [CompletionResultType]::ParameterName, 'Print help')
            [CompletionResult]::new('--help', 'help', [CompletionResultType]::ParameterName, 'Print help')
            [CompletionResult]::new('-V', 'V ', [CompletionResultType]::ParameterName, 'Print version')
--- a/completions/dust.bash
+++ b/completions/dust.bash
@@ -19,10 +19,13 @@ _dust() {

    case "${cmd}" in
        dust)
-            opts="-d -T -n -p -X -I -L -x -s -r -c -C -b -B -z -R -f -i -v -e -t -w -P -D -F -o -S -j -M -A -y -h -V --depth --threads --number-of-lines --full-paths --ignore-directory --ignore-all-in-file --dereference-links --limit-filesystem --apparent-size --reverse --no-colors --force-colors --no-percent-bars --bars-on-right --min-size --screen-reader --skip-total --filecount --ignore_hidden --invert-filter --filter --file_types --terminal_width --no-progress --print-errors --only-dir --only-file --output-format --stack-size --output-json --mtime --atime --ctime --files0-from --help --version [PATH]..."
-            if [[ ${cur} == -* || ${COMP_CWORD} -eq 1 ]] ; then
+            opts="-d -n -p -X -I -L -x -s -r -c -b -B -z -R -f -i -v -e -t -w -H -P -D -F -S -h -V --depth --number-of-lines --full-paths --ignore-directory --ignore-all-in-file --dereference-links --limit-filesystem --apparent-size --reverse --no-colors --no-percent-bars --bars-on-right --min-size --screen-reader --skip-total --filecount --ignore_hidden --invert-filter --filter --file_types --terminal_width --si --no-progress --only-dir --only-file --stack-size --help --version [params]..."
+            if [[ ${cur} == -* ]] ; then
                COMPREPLY=( $(compgen -W "${opts}" -- "${cur}") )
                return 0
+            elif [[ ${cur} == * ]] ; then
+                _filedir
+                return 0
            fi
            case "${prev}" in
                --depth)
@@ -33,14 +36,6 @@ _dust() {
                    COMPREPLY=($(compgen -f "${cur}"))
                    return 0
                    ;;
-                --threads)
-                    COMPREPLY=($(compgen -f "${cur}"))
-                    return 0
-                    ;;
-                -T)
-                    COMPREPLY=($(compgen -f "${cur}"))
-                    return 0
-                    ;;
                --number-of-lines)
                    COMPREPLY=($(compgen -f "${cur}"))
                    return 0
@@ -58,33 +53,11 @@ _dust() {
                    return 0
                    ;;
                --ignore-all-in-file)
-                    local oldifs
-                    if [[ -v IFS ]]; then
-                        oldifs="$IFS"
-                    fi
-                    IFS=$'\n'
                    COMPREPLY=($(compgen -f "${cur}"))
-                    if [[ -v oldifs ]]; then
-                        IFS="$oldifs"
-                    fi
-                    if [[ "${BASH_VERSINFO[0]}" -ge 4 ]]; then
-                        compopt -o filenames
-                    fi
                    return 0
                    ;;
                -I)
-                    local oldifs
-                    if [[ -v IFS ]]; then
-                        oldifs="$IFS"
-                    fi
-                    IFS=$'\n'
                    COMPREPLY=($(compgen -f "${cur}"))
-                    if [[ -v oldifs ]]; then
-                        IFS="$oldifs"
-                    fi
-                    if [[ "${BASH_VERSINFO[0]}" -ge 4 ]]; then
-                        compopt -o filenames
-                    fi
                    return 0
                    ;;
                --min-size)
@@ -119,14 +92,6 @@ _dust() {
                    COMPREPLY=($(compgen -f "${cur}"))
                    return 0
                    ;;
-                --output-format)
-                    COMPREPLY=($(compgen -W "si b k m g t kb mb gb tb" -- "${cur}"))
-                    return 0
-                    ;;
-                -o)
-                    COMPREPLY=($(compgen -W "si b k m g t kb mb gb tb" -- "${cur}"))
-                    return 0
-                    ;;
                --stack-size)
                    COMPREPLY=($(compgen -f "${cur}"))
                    return 0
@@ -135,34 +100,6 @@ _dust() {
                    COMPREPLY=($(compgen -f "${cur}"))
                    return 0
                    ;;
-                --mtime)
-                    COMPREPLY=($(compgen -f "${cur}"))
-                    return 0
-                    ;;
-                -M)
-                    COMPREPLY=($(compgen -f "${cur}"))
-                    return 0
-                    ;;
-                --atime)
-                    COMPREPLY=($(compgen -f "${cur}"))
-                    return 0
-                    ;;
-                -A)
-                    COMPREPLY=($(compgen -f "${cur}"))
-                    return 0
-                    ;;
-                --ctime)
-                    COMPREPLY=($(compgen -f "${cur}"))
-                    return 0
-                    ;;
-                -y)
-                    COMPREPLY=($(compgen -f "${cur}"))
-                    return 0
-                    ;;
-                --files0-from)
-                    COMPREPLY=($(compgen -f "${cur}"))
-                    return 0
-                    ;;
                *)
                    COMPREPLY=()
                    ;;
--- a/completions/dust.elv
+++ b/completions/dust.elv
@@ -20,8 +20,6 @@ set edit:completion:arg-completer[dust] = {|@words|
        &'dust'= {
            cand -d 'Depth to show'
            cand --depth 'Depth to show'
-            cand -T 'Number of threads to use'
-            cand --threads 'Number of threads to use'
            cand -n 'Number of lines of output to show. (Default is terminal_height - 10)'
            cand --number-of-lines 'Number of lines of output to show. (Default is terminal_height - 10)'
            cand -X 'Exclude any file or directory with this name'
@@ -36,17 +34,8 @@ set edit:completion:arg-completer[dust] = {|@words|
            cand --filter 'Only include filepaths matching this regex. For png files type: -e "\.png$" '
            cand -w 'Specify width of output overriding the auto detection of terminal width'
            cand --terminal_width 'Specify width of output overriding the auto detection of terminal width'
-            cand -o 'Changes output display size. si will print sizes in powers of 1000. b k m g t kb mb gb tb will print the whole tree in that size.'
-            cand --output-format 'Changes output display size. si will print sizes in powers of 1000. b k m g t kb mb gb tb will print the whole tree in that size.'
            cand -S 'Specify memory to use as stack size - use if you see: ''fatal runtime error: stack overflow'' (default low memory=1048576, high memory=1073741824)'
            cand --stack-size 'Specify memory to use as stack size - use if you see: ''fatal runtime error: stack overflow'' (default low memory=1048576, high memory=1073741824)'
-            cand -M '+/-n matches files modified more/less than n days ago , and n matches files modified exactly n days ago, days are rounded down.That is +n => (−∞, curr−(n+1)), n => [curr−(n+1), curr−n), and -n => (𝑐𝑢𝑟𝑟−𝑛, +∞)'
-            cand --mtime '+/-n matches files modified more/less than n days ago , and n matches files modified exactly n days ago, days are rounded down.That is +n => (−∞, curr−(n+1)), n => [curr−(n+1), curr−n), and -n => (𝑐𝑢𝑟𝑟−𝑛, +∞)'
-            cand -A 'just like -mtime, but based on file access time'
-            cand --atime 'just like -mtime, but based on file access time'
-            cand -y 'just like -mtime, but based on file change time'
-            cand --ctime 'just like -mtime, but based on file change time'
-            cand --files0-from 'run dust on NUL-terminated file names specified in file; if argument is -, then read names from standard input'
            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'
@@ -59,8 +48,6 @@ set edit:completion:arg-completer[dust] = {|@words|
            cand --reverse 'Print tree upside down (biggest highest)'
            cand -c 'No colors will be printed (Useful for commands like: watch)'
            cand --no-colors 'No colors will be printed (Useful for commands like: watch)'
-            cand -C 'Force colors print'
-            cand --force-colors 'Force colors print'
            cand -b 'No percent bars or percentages will be displayed'
            cand --no-percent-bars 'No percent bars or percentages will be displayed'
            cand -B 'percent bars moved to right side of screen'
@@ -74,15 +61,14 @@ set edit:completion:arg-completer[dust] = {|@words|
            cand --ignore_hidden 'Do not display hidden files'
            cand -t 'show only these file types'
            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 --print-errors 'Print path with errors.'
            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)'
-            cand -j 'Output the directory tree as json to the current directory'
-            cand --output-json 'Output the directory tree as json to the current directory'
            cand -h 'Print help'
            cand --help 'Print help'
            cand -V 'Print version'
--- a/completions/dust.fish
+++ b/completions/dust.fish
@@ -1,25 +1,18 @@
 complete -c dust -s d -l depth -d 'Depth to show' -r
-complete -c dust -s T -l threads -d 'Number of threads to use' -r
 complete -c dust -s n -l number-of-lines -d 'Number of lines of output to show. (Default is terminal_height - 10)' -r
-complete -c dust -s X -l ignore-directory -d 'Exclude any file or directory with this name' -r -F
-complete -c dust -s I -l ignore-all-in-file -d 'Exclude any file or directory with a regex matching that listed in this file, the file entries will be added to the ignore regexs provided by --invert_filter' -r -F
+complete -c dust -s X -l ignore-directory -d 'Exclude any file or directory with this name' -r
+complete -c dust -s I -l ignore-all-in-file -d 'Exclude any file or directory with a regex matching that listed in this file, the file entries will be added to the ignore regexs provided by --invert_filter' -r
 complete -c dust -s z -l min-size -d 'Minimum size file to include in output' -r
 complete -c dust -s v -l invert-filter -d 'Exclude filepaths matching this regex. To ignore png files type: -v "\\.png$" ' -r
 complete -c dust -s e -l filter -d 'Only include filepaths matching this regex. For png files type: -e "\\.png$" ' -r
 complete -c dust -s w -l terminal_width -d 'Specify width of output overriding the auto detection of terminal width' -r
-complete -c dust -s o -l output-format -d 'Changes output display size. si will print sizes in powers of 1000. b k m g t kb mb gb tb will print the whole tree in that size.' -r -f -a "{si	'',b	'',k	'',m	'',g	'',t	'',kb	'',mb	'',gb	'',tb	''}"
 complete -c dust -s S -l stack-size -d 'Specify memory to use as stack size - use if you see: \'fatal runtime error: stack overflow\' (default low memory=1048576, high memory=1073741824)' -r
-complete -c dust -s M -l mtime -d '+/-n matches files modified more/less than n days ago , and n matches files modified exactly n days ago, days are rounded down.That is +n => (−∞, curr−(n+1)), n => [curr−(n+1), curr−n), and -n => (𝑐𝑢𝑟𝑟−𝑛, +∞)' -r
-complete -c dust -s A -l atime -d 'just like -mtime, but based on file access time' -r
-complete -c dust -s y -l ctime -d 'just like -mtime, but based on file change time' -r
-complete -c dust -l files0-from -d 'run dust on NUL-terminated file names specified in file; if argument is -, then read names from standard input' -r -F
 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 C -l force-colors -d 'Force colors print'
 complete -c dust -s b -l no-percent-bars -d 'No percent bars or percentages will be displayed'
 complete -c dust -s B -l bars-on-right -d 'percent bars moved to right side of screen'
 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)'
@@ -27,10 +20,9 @@ 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 instead of 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 -l print-errors -d 'Print path with errors.'
 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)'
-complete -c dust -s j -l output-json -d 'Output the directory tree as json to the current directory'
 complete -c dust -s h -l help -d 'Print help'
 complete -c dust -s V -l version -d 'Print version'
--- a/man-page/dust.1
+++ b/man-page/dust.1
@@ -1,30 +1,27 @@
 .ie \n(.g .ds Aq \(aq
 .el .ds Aq '
-.TH Dust 1  "Dust 1.1.1" 
+.TH Dust 1  "Dust 0.9.0" 
 .SH NAME
 Dust \- Like du but more intuitive
 .SH SYNOPSIS
-\fBdust\fR [\fB\-d\fR|\fB\-\-depth\fR] [\fB\-T\fR|\fB\-\-threads\fR] [\fB\-n\fR|\fB\-\-number\-of\-lines\fR] [\fB\-p\fR|\fB\-\-full\-paths\fR] [\fB\-X\fR|\fB\-\-ignore\-directory\fR] [\fB\-I\fR|\fB\-\-ignore\-all\-in\-file\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\-C\fR|\fB\-\-force\-colors\fR] [\fB\-b\fR|\fB\-\-no\-percent\-bars\fR] [\fB\-B\fR|\fB\-\-bars\-on\-right\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\-P\fR|\fB\-\-no\-progress\fR] [\fB\-\-print\-errors\fR] [\fB\-D\fR|\fB\-\-only\-dir\fR] [\fB\-F\fR|\fB\-\-only\-file\fR] [\fB\-o\fR|\fB\-\-output\-format\fR] [\fB\-S\fR|\fB\-\-stack\-size\fR] [\fB\-j\fR|\fB\-\-output\-json\fR] [\fB\-M\fR|\fB\-\-mtime\fR] [\fB\-A\fR|\fB\-\-atime\fR] [\fB\-y\fR|\fB\-\-ctime\fR] [\fB\-\-files0\-from\fR] [\fB\-h\fR|\fB\-\-help\fR] [\fB\-V\fR|\fB\-\-version\fR] [\fIPATH\fR] 
+\fBDust\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\-I\fR|\fB\-\-ignore\-all\-in\-file\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\-B\fR|\fB\-\-bars\-on\-right\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] [\fB\-S\fR|\fB\-\-stack\-size\fR] [\fB\-h\fR|\fB\-\-help\fR] [\fB\-V\fR|\fB\-\-version\fR] [\fIparams\fR] 
 .SH DESCRIPTION
 Like du but more intuitive
 .SH OPTIONS
 .TP
-\fB\-d\fR, \fB\-\-depth\fR=\fIDEPTH\fR
+\fB\-d\fR, \fB\-\-depth\fR
 Depth to show
 .TP
-\fB\-T\fR, \fB\-\-threads\fR
-Number of threads to use
-.TP
-\fB\-n\fR, \fB\-\-number\-of\-lines\fR=\fINUMBER\fR
+\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=\fIPATH\fR
+\fB\-X\fR, \fB\-\-ignore\-directory\fR
 Exclude any file or directory with this name
 .TP
-\fB\-I\fR, \fB\-\-ignore\-all\-in\-file\fR=\fIFILE\fR
+\fB\-I\fR, \fB\-\-ignore\-all\-in\-file\fR
 Exclude any file or directory with a regex matching that listed in this file, the file entries will be added to the ignore regexs provided by \-\-invert_filter
 .TP
 \fB\-L\fR, \fB\-\-dereference\-links\fR
@@ -42,16 +39,13 @@ Print tree upside down (biggest highest)
 \fB\-c\fR, \fB\-\-no\-colors\fR
 No colors will be printed (Useful for commands like: watch)
 .TP
-\fB\-C\fR, \fB\-\-force\-colors\fR
-Force colors print
-.TP
 \fB\-b\fR, \fB\-\-no\-percent\-bars\fR
 No percent bars or percentages will be displayed
 .TP
 \fB\-B\fR, \fB\-\-bars\-on\-right\fR
 percent bars moved to right side of screen
 .TP
-\fB\-z\fR, \fB\-\-min\-size\fR=\fIMIN_SIZE\fR
+\fB\-z\fR, \fB\-\-min\-size\fR
 Minimum size file to include in output
 .TP
 \fB\-R\fR, \fB\-\-screen\-reader\fR
@@ -66,62 +60,40 @@ Directory \*(Aqsize\*(Aq is number of child files instead of disk size
 \fB\-i\fR, \fB\-\-ignore_hidden\fR
 Do not display hidden files
 .TP
-\fB\-v\fR, \fB\-\-invert\-filter\fR=\fIREGEX\fR
+\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=\fIREGEX\fR
+\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=\fIWIDTH\fR
+\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\-\-print\-errors\fR
-Print path with errors.
-.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
-\fB\-o\fR, \fB\-\-output\-format\fR=\fIFORMAT\fR
-Changes output display size. si will print sizes in powers of 1000. b k m g t kb mb gb tb will print the whole tree in that size.
-.br
-
-.br
-[\fIpossible values: \fRsi, b, k, m, g, t, kb, mb, gb, tb]
-.TP
-\fB\-S\fR, \fB\-\-stack\-size\fR=\fISTACK_SIZE\fR
+\fB\-S\fR, \fB\-\-stack\-size\fR
 Specify memory to use as stack size \- use if you see: \*(Aqfatal runtime error: stack overflow\*(Aq (default low memory=1048576, high memory=1073741824)
 .TP
-\fB\-j\fR, \fB\-\-output\-json\fR
-Output the directory tree as json to the current directory
-.TP
-\fB\-M\fR, \fB\-\-mtime\fR
-+/\-n matches files modified more/less than n days ago , and n matches files modified exactly n days ago, days are rounded down.That is +n => (−∞, curr−(n+1)), n => [curr−(n+1), curr−n), and \-n => (𝑐𝑢𝑟𝑟−𝑛, +∞)
-.TP
-\fB\-A\fR, \fB\-\-atime\fR
-just like \-mtime, but based on file access time
-.TP
-\fB\-y\fR, \fB\-\-ctime\fR
-just like \-mtime, but based on file change time
-.TP
-\fB\-\-files0\-from\fR
-run dust on NUL\-terminated file names specified in file; if argument is \-, then read names from standard input
-.TP
 \fB\-h\fR, \fB\-\-help\fR
 Print help
 .TP
 \fB\-V\fR, \fB\-\-version\fR
 Print version
 .TP
-[\fIPATH\fR]
+[\fIparams\fR]

 .SH VERSION
-v1.1.1
+v0.9.0
--- a/src/cli.rs
+++ b/src/cli.rs
@@ -1,4 +1,4 @@
-use clap::{builder::PossibleValue, value_parser, Arg, Command};
+use clap::{value_parser, Arg, Command};

 // For single thread mode set this variable on your command line:
 // export RAYON_NUM_THREADS=1
@@ -7,28 +7,19 @@ pub fn build_cli() -> Command {
    Command::new("Dust")
        .about("Like du but more intuitive")
        .version(env!("CARGO_PKG_VERSION"))
+        .trailing_var_arg(true)
        .arg(
            Arg::new("depth")
                .short('d')
                .long("depth")
-                .value_name("DEPTH")
                .value_parser(value_parser!(usize))
                .help("Depth to show")
                .num_args(1)
        )
-        .arg(
-            Arg::new("threads")
-                .short('T')
-                .long("threads")
-                .value_parser(value_parser!(usize))
-                .help("Number of threads to use")
-                .num_args(1)
-        )
        .arg(
            Arg::new("number_of_lines")
                .short('n')
                .long("number-of-lines")
-                .value_name("NUMBER")
                .value_parser(value_parser!(usize))
                .help("Number of lines of output to show. (Default is terminal_height - 10)")
                .num_args(1)
@@ -44,8 +35,6 @@ pub fn build_cli() -> Command {
            Arg::new("ignore_directory")
                .short('X')
                .long("ignore-directory")
-                .value_name("PATH")
-                .value_hint(clap::ValueHint::AnyPath)
                .action(clap::ArgAction::Append)
                .help("Exclude any file or directory with this name"),
        )
@@ -53,8 +42,6 @@ pub fn build_cli() -> Command {
            Arg::new("ignore_all_in_file")
                .short('I')
                .long("ignore-all-in-file")
-                .value_name("FILE")
-                .value_hint(clap::ValueHint::FilePath)
                .value_parser(value_parser!(String))
                .help("Exclude any file or directory with a regex matching that listed in this file, the file entries will be added to the ignore regexs provided by --invert_filter"),
        )
@@ -93,13 +80,6 @@ pub fn build_cli() -> Command {
                .action(clap::ArgAction::SetTrue)
                .help("No colors will be printed (Useful for commands like: watch)"),
        )
-        .arg(
-            Arg::new("force_colors")
-                .short('C')
-                .long("force-colors")
-                .action(clap::ArgAction::SetTrue)
-                .help("Force colors print"),
-        )
        .arg(
            Arg::new("no_bars")
                .short('b')
@@ -118,7 +98,6 @@ pub fn build_cli() -> Command {
            Arg::new("min_size")
                .short('z')
                .long("min-size")
-                .value_name("MIN_SIZE")
                .num_args(1)
                .help("Minimum size file to include in output"),
        )
@@ -153,7 +132,6 @@ pub fn build_cli() -> Command {
            Arg::new("invert_filter")
                .short('v')
                .long("invert-filter")
-                .value_name("REGEX")
                .action(clap::ArgAction::Append)
                .conflicts_with("filter")
                .conflicts_with("types")
@@ -163,7 +141,6 @@ pub fn build_cli() -> Command {
            Arg::new("filter")
                .short('e')
                .long("filter")
-                .value_name("REGEX")
                .action(clap::ArgAction::Append)
                .conflicts_with("types")
                .help("Only include filepaths matching this regex. For png files type: -e \"\\.png$\" "),
@@ -181,11 +158,17 @@ pub fn build_cli() -> Command {
            Arg::new("width")
                .short('w')
                .long("terminal_width")
-                .value_name("WIDTH")
-                .value_parser(value_parser!(usize))
                .num_args(1)
+                .value_parser(value_parser!(usize))
                .help("Specify width of output overriding the auto detection of terminal width"),
        )
+        .arg(
+            Arg::new("iso")
+                .short('H')
+                .long("si")
+                .action(clap::ArgAction::SetTrue)
+                .help("print sizes in powers of 1000 (e.g., 1.1G)")
+        )
        .arg(
            Arg::new("disable_progress")
                .short('P')
@@ -193,12 +176,6 @@ pub fn build_cli() -> Command {
                .action(clap::ArgAction::SetTrue)
                .help("Disable the progress indication."),
        )
-        .arg(
-            Arg::new("print_errors")
-                .long("print-errors")
-                .action(clap::ArgAction::SetTrue)
-                .help("Print path with errors."),
-        )
        .arg(
            Arg::new("only_dir")
                .short('D')
@@ -216,82 +193,14 @@ pub fn build_cli() -> Command {
                .action(clap::ArgAction::SetTrue)
                .help("Only files will be displayed. (Finds your largest files)"),
        )
-        .arg(
-            Arg::new("output_format")
-                .short('o')
-                .long("output-format")
-                .value_name("FORMAT")
-                .value_parser([
-                    PossibleValue::new("si"),
-                    PossibleValue::new("b"),
-                    PossibleValue::new("k").alias("kib"),
-                    PossibleValue::new("m").alias("mib"),
-                    PossibleValue::new("g").alias("gib"),
-                    PossibleValue::new("t").alias("tib"),
-                    PossibleValue::new("kb"),
-                    PossibleValue::new("mb"),
-                    PossibleValue::new("gb"),
-                    PossibleValue::new("tb"),
-                ])
-                .ignore_case(true)
-                .help("Changes output display size. si will print sizes in powers of 1000. b k m g t kb mb gb tb will print the whole tree in that size.")
-        )
        .arg(
            Arg::new("stack_size")
                .short('S')
                .long("stack-size")
-                .value_name("STACK_SIZE")
-                .value_parser(value_parser!(usize))
                .num_args(1)
+                .value_parser(value_parser!(usize))
                .help("Specify memory to use as stack size - use if you see: 'fatal runtime error: stack overflow' (default low memory=1048576, high memory=1073741824)"),
        )
-        .arg(
-            Arg::new("params")
-                .value_name("PATH")
-                .value_hint(clap::ValueHint::AnyPath)
-                .value_parser(value_parser!(String))
-                .num_args(1..)
-        )
-        .arg(
-            Arg::new("output_json")
-                .short('j')
-                .long("output-json")
-                .action(clap::ArgAction::SetTrue)
-                .help("Output the directory tree as json to the current directory"),
-        )
-        .arg(
-            Arg::new("mtime")
-            .short('M')
-            .long("mtime")
-            .num_args(1)
-            .allow_hyphen_values(true)
-            .value_parser(value_parser!(String))
-            .help("+/-n matches files modified more/less than n days ago , and n matches files modified exactly n days ago, days are rounded down.That is +n => (−∞, curr−(n+1)), n => [curr−(n+1), curr−n), and -n => (𝑐𝑢𝑟𝑟−𝑛, +∞)")
-        )
-        .arg(
-            Arg::new("atime")
-            .short('A')
-            .long("atime")
-            .num_args(1)
-            .allow_hyphen_values(true)
-            .value_parser(value_parser!(String))
-            .help("just like -mtime, but based on file access time")
-        )
-        .arg(
-            Arg::new("ctime")
-            .short('y')
-            .long("ctime")
-            .num_args(1)
-            .allow_hyphen_values(true)
-            .value_parser(value_parser!(String))
-            .help("just like -mtime, but based on file change time")
-        )
-        .arg(
-            Arg::new("files0_from")
-                .long("files0-from")
-                .value_hint(clap::ValueHint::AnyPath)
-                .value_parser(value_parser!(String))
-                .num_args(1)
-                .help("run dust on NUL-terminated file names specified in file; if argument is -, then read names from standard input"),
-        )
+        .arg(Arg::new("params").num_args(1..)
+            .value_parser(value_parser!(String)))
 }
--- a/src/config.rs
+++ b/src/config.rs
@@ -1,16 +1,11 @@
-use chrono::{Local, TimeZone};
 use clap::ArgMatches;
 use config_file::FromConfigFile;
-use regex::Regex;
 use serde::Deserialize;
 use std::io::IsTerminal;
 use std::path::Path;
 use std::path::PathBuf;

-use crate::dir_walker::Operater;
-use crate::display::get_number_format;
-
-pub static DAY_SECONDS: i64 = 24 * 60 * 60;
+use crate::display::UNITS;

 #[derive(Deserialize, Default)]
 #[serde(rename_all = "kebab-case")]
@@ -20,12 +15,11 @@ pub struct Config {
    pub display_apparent_size: Option<bool>,
    pub reverse: Option<bool>,
    pub no_colors: Option<bool>,
-    pub force_colors: Option<bool>,
    pub no_bars: Option<bool>,
    pub skip_total: Option<bool>,
    pub screen_reader: Option<bool>,
    pub ignore_hidden: Option<bool>,
-    pub output_format: Option<String>,
+    pub iso: Option<bool>,
    pub min_size: Option<String>,
    pub only_dir: Option<bool>,
    pub only_file: Option<bool>,
@@ -33,26 +27,12 @@ pub struct Config {
    pub depth: Option<usize>,
    pub bars_on_right: Option<bool>,
    pub stack_size: Option<usize>,
-    pub threads: Option<usize>,
-    pub output_json: Option<bool>,
-    pub print_errors: Option<bool>,
-    pub files0_from: Option<String>,
 }

 impl Config {
-    pub fn get_files_from(&self, options: &ArgMatches) -> Option<String> {
-        let from_file = options.get_one::<String>("files0_from");
-        match from_file {
-            None => self.files0_from.as_ref().map(|x| x.to_string()),
-            Some(x) => Some(x.to_string()),
-        }
-    }
    pub fn get_no_colors(&self, options: &ArgMatches) -> bool {
        Some(true) == self.no_colors || options.get_flag("no_colors")
    }
-    pub fn get_force_colors(&self, options: &ArgMatches) -> bool {
-        Some(true) == self.force_colors || options.get_flag("force_colors")
-    }
    pub fn get_disable_progress(&self, options: &ArgMatches) -> bool {
        Some(true) == self.disable_progress
            || options.get_flag("disable_progress")
@@ -65,7 +45,10 @@ impl Config {
        Some(true) == self.ignore_hidden || options.get_flag("ignore_hidden")
    }
    pub fn get_full_paths(&self, options: &ArgMatches) -> bool {
-        Some(true) == self.display_full_paths || options.get_flag("display_full_paths")
+        // If we are only showing files, always show full paths
+        Some(true) == self.display_full_paths
+            || options.get_flag("display_full_paths")
+            || self.get_only_file(options)
    }
    pub fn get_reverse(&self, options: &ArgMatches) -> bool {
        Some(true) == self.reverse || options.get_flag("reverse")
@@ -73,16 +56,8 @@ impl Config {
    pub fn get_no_bars(&self, options: &ArgMatches) -> bool {
        Some(true) == self.no_bars || options.get_flag("no_bars")
    }
-    pub fn get_output_format(&self, options: &ArgMatches) -> String {
-        let out_fmt = options.get_one::<String>("output_format");
-        (match out_fmt {
-            None => match &self.output_format {
-                None => "".to_string(),
-                Some(x) => x.to_string(),
-            },
-            Some(x) => x.into(),
-        })
-        .to_lowercase()
+    pub fn get_iso(&self, options: &ArgMatches) -> bool {
+        Some(true) == self.iso || options.get_flag("iso")
    }
    pub fn get_skip_total(&self, options: &ArgMatches) -> bool {
        Some(true) == self.skip_total || options.get_flag("skip_total")
@@ -97,17 +72,17 @@ impl Config {

        self.depth.unwrap_or(usize::MAX)
    }
-    pub fn get_min_size(&self, options: &ArgMatches) -> Option<usize> {
+    pub fn get_min_size(&self, options: &ArgMatches, iso: bool) -> Option<usize> {
        let size_from_param = options.get_one::<String>("min_size");
-        self._get_min_size(size_from_param)
+        self._get_min_size(size_from_param, iso)
    }
-    fn _get_min_size(&self, min_size: Option<&String>) -> Option<usize> {
-        let size_from_param = min_size.and_then(|a| convert_min_size(a));
+    fn _get_min_size(&self, min_size: Option<&String>, iso: bool) -> Option<usize> {
+        let size_from_param = min_size.and_then(|a| convert_min_size(a, iso));

        if size_from_param.is_none() {
            self.min_size
                .as_ref()
-                .and_then(|a| convert_min_size(a.as_ref()))
+                .and_then(|a| convert_min_size(a.as_ref(), iso))
        } else {
            size_from_param
        }
@@ -115,10 +90,6 @@ impl Config {
    pub fn get_only_dir(&self, options: &ArgMatches) -> bool {
        Some(true) == self.only_dir || options.get_flag("only_dir")
    }
-
-    pub fn get_print_errors(&self, options: &ArgMatches) -> bool {
-        Some(true) == self.print_errors || options.get_flag("print_errors")
-    }
    pub fn get_only_file(&self, options: &ArgMatches) -> bool {
        Some(true) == self.only_file || options.get_flag("only_file")
    }
@@ -133,102 +104,38 @@ impl Config {
            from_cmd_line.copied()
        }
    }
-    pub fn get_threads(&self, options: &ArgMatches) -> Option<usize> {
-        let from_cmd_line = options.get_one::<usize>("threads");
-        if from_cmd_line.is_none() {
-            self.threads
-        } else {
-            from_cmd_line.copied()
-        }
-    }
-    pub fn get_output_json(&self, options: &ArgMatches) -> bool {
-        Some(true) == self.output_json || options.get_flag("output_json")
-    }
-
-    pub fn get_modified_time_operator(&self, options: &ArgMatches) -> Option<(Operater, i64)> {
-        get_filter_time_operator(
-            options.get_one::<String>("mtime"),
-            get_current_date_epoch_seconds(),
-        )
-    }
-
-    pub fn get_accessed_time_operator(&self, options: &ArgMatches) -> Option<(Operater, i64)> {
-        get_filter_time_operator(
-            options.get_one::<String>("atime"),
-            get_current_date_epoch_seconds(),
-        )
-    }
-
-    pub fn get_created_time_operator(&self, options: &ArgMatches) -> Option<(Operater, i64)> {
-        get_filter_time_operator(
-            options.get_one::<String>("ctime"),
-            get_current_date_epoch_seconds(),
-        )
-    }
 }

-fn get_current_date_epoch_seconds() -> i64 {
-    // calcurate current date epoch seconds
-    let now = Local::now();
-    let current_date = now.date_naive();
+fn convert_min_size(input: &str, iso: bool) -> Option<usize> {
+    let chars_as_vec: Vec<char> = input.chars().collect();
+    match chars_as_vec.split_last() {
+        Some((last, start)) => {
+            let mut starts: String = start.iter().collect::<String>();

-    let current_date_time = current_date.and_hms_opt(0, 0, 0).unwrap();
-    Local
-        .from_local_datetime(&current_date_time)
-        .unwrap()
-        .timestamp()
-}
-
-fn get_filter_time_operator(
-    option_value: Option<&String>,
-    current_date_epoch_seconds: i64,
-) -> Option<(Operater, i64)> {
-    match option_value {
-        Some(val) => {
-            let time = current_date_epoch_seconds
-                - val
-                    .parse::<i64>()
-                    .unwrap_or_else(|_| panic!("invalid data format"))
-                    .abs()
-                    * DAY_SECONDS;
-            match val.chars().next().expect("Value should not be empty") {
-                '+' => Some((Operater::LessThan, time - DAY_SECONDS)),
-                '-' => Some((Operater::GreaterThan, time)),
-                _ => Some((Operater::Equal, time - DAY_SECONDS)),
-            }
-        }
-        None => None,
-    }
-}
-
-fn convert_min_size(input: &str) -> Option<usize> {
-    let re = Regex::new(r"([0-9]+)(\w*)").unwrap();
-
-    if let Some(cap) = re.captures(input) {
-        let (_, [digits, letters]) = cap.extract();
-
-        // Failure to parse should be impossible due to regex match
-        let digits_as_usize: Option<usize> = digits.parse().ok();
-
-        match digits_as_usize {
-            Some(parsed_digits) => {
-                let number_format = get_number_format(&letters.to_lowercase());
-                match number_format {
-                    Some((multiple, _)) => Some(parsed_digits * (multiple as usize)),
-                    None => {
-                        if letters.eq("") {
-                            Some(parsed_digits)
-                        } else {
+            for (i, u) in UNITS.iter().rev().enumerate() {
+                if Some(*u) == last.to_uppercase().next() {
+                    return match starts.parse::<usize>() {
+                        Ok(pure) => {
+                            let num: usize = if iso { 1000 } else { 1024 };
+                            let marker = pure * num.pow((i + 1) as u32);
+                            Some(marker)
+                        }
+                        Err(_) => {
                            eprintln!("Ignoring invalid min-size: {input}");
                            None
                        }
-                    }
+                    };
                }
            }
-            None => None,
+            starts.push(*last);
+            starts
+                .parse()
+                .map_err(|_| {
+                    eprintln!("Ignoring invalid min-size: {input}");
+                })
+                .ok()
        }
-    } else {
-        None
+        None => None,
    }
 }

@@ -258,45 +165,30 @@ pub fn get_config() -> Config {
 mod tests {
    #[allow(unused_imports)]
    use super::*;
-    use chrono::{Datelike, Timelike};
    use clap::{value_parser, Arg, ArgMatches, Command};

-    #[test]
-    fn test_get_current_date_epoch_seconds() {
-        let epoch_seconds = get_current_date_epoch_seconds();
-        let dt = Local.timestamp_opt(epoch_seconds, 0).unwrap();
-
-        assert_eq!(dt.hour(), 0);
-        assert_eq!(dt.minute(), 0);
-        assert_eq!(dt.second(), 0);
-        assert_eq!(dt.date_naive().day(), Local::now().date_naive().day());
-        assert_eq!(dt.date_naive().month(), Local::now().date_naive().month());
-        assert_eq!(dt.date_naive().year(), Local::now().date_naive().year());
-    }
-
    #[test]
    fn test_conversion() {
-        assert_eq!(convert_min_size("55"), Some(55));
-        assert_eq!(convert_min_size("12344321"), Some(12344321));
-        assert_eq!(convert_min_size("95RUBBISH"), None);
-        assert_eq!(convert_min_size("10Ki"), Some(10 * 1024));
-        assert_eq!(convert_min_size("10MiB"), Some(10 * 1024usize.pow(2)));
-        assert_eq!(convert_min_size("10M"), Some(10 * 1024usize.pow(2)));
-        assert_eq!(convert_min_size("10Mb"), Some(10 * 1000usize.pow(2)));
-        assert_eq!(convert_min_size("2Gi"), Some(2 * 1024usize.pow(3)));
+        assert_eq!(convert_min_size("55", false), Some(55));
+        assert_eq!(convert_min_size("12344321", false), Some(12344321));
+        assert_eq!(convert_min_size("95RUBBISH", false), None);
+        assert_eq!(convert_min_size("10K", false), Some(10 * 1024));
+        assert_eq!(convert_min_size("10M", false), Some(10 * 1024usize.pow(2)));
+        assert_eq!(convert_min_size("10M", true), Some(10 * 1000usize.pow(2)));
+        assert_eq!(convert_min_size("2G", false), Some(2 * 1024usize.pow(3)));
    }

    #[test]
    fn test_min_size_from_config_applied_or_overridden() {
        let c = Config {
-            min_size: Some("1KiB".to_owned()),
+            min_size: Some("1K".to_owned()),
            ..Default::default()
        };
-        assert_eq!(c._get_min_size(None), Some(1024));
-        assert_eq!(c._get_min_size(Some(&"2KiB".into())), Some(2048));
+        assert_eq!(c._get_min_size(None, false), Some(1024));
+        assert_eq!(c._get_min_size(Some(&"2K".into()), false), Some(2048));

-        assert_eq!(c._get_min_size(Some(&"1kb".into())), Some(1000));
-        assert_eq!(c._get_min_size(Some(&"2KB".into())), Some(2000));
+        assert_eq!(c._get_min_size(None, true), Some(1000));
+        assert_eq!(c._get_min_size(Some(&"2K".into()), true), Some(2000));
    }

    #[test]
--- a/src/dir_walker.rs
+++ b/src/dir_walker.rs
@@ -1,4 +1,3 @@
-use std::cmp::Ordering;
 use std::fs;
 use std::sync::Arc;
 use std::sync::Mutex;
@@ -8,7 +7,6 @@ use crate::progress::Operation;
 use crate::progress::PAtomicInfo;
 use crate::progress::RuntimeErrors;
 use crate::progress::ORDERING;
-use crate::utils::is_filtered_out_due_to_file_time;
 use crate::utils::is_filtered_out_due_to_invert_regex;
 use crate::utils::is_filtered_out_due_to_regex;
 use rayon::iter::ParallelBridge;
@@ -22,22 +20,11 @@ use crate::node::build_node;
 use std::fs::DirEntry;

 use crate::platform::get_metadata;
-
-#[derive(Debug)]
-pub enum Operater {
-    Equal = 0,
-    LessThan = 1,
-    GreaterThan = 2,
-}
-
 pub struct WalkData<'a> {
    pub ignore_directories: HashSet<PathBuf>,
    pub filter_regex: &'a [Regex],
    pub invert_filter_regex: &'a [Regex],
    pub allowed_filesystems: HashSet<u64>,
-    pub filter_modified_time: Option<(Operater, i64)>,
-    pub filter_accessed_time: Option<(Operater, i64)>,
-    pub filter_changed_time: Option<(Operater, i64)>,
    pub use_apparent_size: bool,
    pub by_filecount: bool,
    pub ignore_hidden: bool,
@@ -96,20 +83,16 @@ fn clean_inodes(

 fn sort_by_inode(a: &Node, b: &Node) -> std::cmp::Ordering {
    // Sorting by inode is quicker than by sorting by name/size
-    match (a.inode_device, b.inode_device) {
-        (Some(x), Some(y)) => {
+    if let Some(x) = a.inode_device {
+        if let Some(y) = b.inode_device {
            if x.0 != y.0 {
-                x.0.cmp(&y.0)
+                return x.0.cmp(&y.0);
            } else if x.1 != y.1 {
-                x.1.cmp(&y.1)
-            } else {
-                a.name.cmp(&b.name)
+                return x.1.cmp(&y.1);
            }
        }
-        (Some(_), None) => Ordering::Greater,
-        (None, Some(_)) => Ordering::Less,
-        (None, None) => a.name.cmp(&b.name),
    }
+    a.name.cmp(&b.name)
 }

 fn ignore_file(entry: &DirEntry, walk_data: &WalkData) -> bool {
@@ -117,34 +100,14 @@ fn ignore_file(entry: &DirEntry, walk_data: &WalkData) -> bool {
    let is_ignored_path = walk_data.ignore_directories.contains(&entry.path());

    if !walk_data.allowed_filesystems.is_empty() {
-        let size_inode_device = get_metadata(entry.path(), false);
-        if let Some((_size, Some((_id, dev)), _gunk)) = size_inode_device {
+        let size_inode_device = get_metadata(&entry.path(), false);
+
+        if let Some((_size, Some((_id, dev)))) = size_inode_device {
            if !walk_data.allowed_filesystems.contains(&dev) {
                return true;
            }
        }
    }
-    if walk_data.filter_accessed_time.is_some()
-        || walk_data.filter_modified_time.is_some()
-        || walk_data.filter_changed_time.is_some()
-    {
-        let size_inode_device = get_metadata(entry.path(), false);
-        if let Some((_, _, (modified_time, accessed_time, changed_time))) = size_inode_device {
-            if entry.path().is_file()
-                && [
-                    (&walk_data.filter_modified_time, modified_time),
-                    (&walk_data.filter_accessed_time, accessed_time),
-                    (&walk_data.filter_changed_time, changed_time),
-                ]
-                .iter()
-                .any(|(filter_time, actual_time)| {
-                    is_filtered_out_due_to_file_time(filter_time, *actual_time)
-                })
-            {
-                return true;
-            }
-        }
-    }

    // Keeping `walk_data.filter_regex.is_empty()` is important for performance reasons, it stops unnecessary work
    if !walk_data.filter_regex.is_empty()
@@ -168,10 +131,6 @@ fn walk(dir: PathBuf, walk_data: &WalkData, depth: usize) -> Option<Node> {
    let prog_data = &walk_data.progress_data;
    let errors = &walk_data.errors;

-    if errors.lock().unwrap().abort {
-        return None;
-    }
-
    let children = if dir.is_dir() {
        let read_dir = fs::read_dir(&dir);
        match read_dir {
@@ -180,46 +139,44 @@ fn walk(dir: PathBuf, walk_data: &WalkData, depth: usize) -> Option<Node> {
                    .into_iter()
                    .par_bridge()
                    .filter_map(|entry| {
-                        match entry {
-                            Ok(ref entry) => {
-                                // uncommenting the below line gives simpler code but
-                                // rayon doesn't parallelize as well giving a 3X performance drop
-                                // hence we unravel the recursion a bit
+                        if let Ok(ref entry) = entry {
+                            // uncommenting the below line gives simpler code but
+                            // rayon doesn't parallelize as well giving a 3X performance drop
+                            // hence we unravel the recursion a bit

-                                // return walk(entry.path(), walk_data, depth)
+                            // return walk(entry.path(), walk_data, depth)

-                                if !ignore_file(entry, walk_data) {
-                                    if let Ok(data) = entry.file_type() {
-                                        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![],
-                                            data.is_symlink(),
-                                            data.is_file(),
-                                            depth,
-                                            walk_data,
-                                        );
-
-                                        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;
+                            if !ignore_file(entry, walk_data) {
+                                if let Ok(data) = entry.file_type() {
+                                    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;
                                }
                            }
-                            Err(ref failed) => {
-                                let mut editable_error = errors.lock().unwrap();
-                                editable_error.no_permissions.insert(failed.to_string());
-                            }
+                        } else {
+                            let mut editable_error = errors.lock().unwrap();
+                            editable_error.no_permissions = true
                        }
                        None
                    })
@@ -229,9 +186,7 @@ fn walk(dir: PathBuf, walk_data: &WalkData, depth: usize) -> Option<Node> {
                let mut editable_error = errors.lock().unwrap();
                match failed.kind() {
                    std::io::ErrorKind::PermissionDenied => {
-                        editable_error
-                            .no_permissions
-                            .insert(dir.to_string_lossy().into());
+                        editable_error.no_permissions = true;
                    }
                    std::io::ErrorKind::NotFound => {
                        editable_error.file_not_found.insert(failed.to_string());
@@ -251,11 +206,20 @@ fn walk(dir: PathBuf, walk_data: &WalkData, depth: usize) -> Option<Node> {
        }
        vec![]
    };
-    build_node(dir, children, false, false, depth, walk_data)
+    build_node(
+        dir,
+        children,
+        walk_data.filter_regex,
+        walk_data.invert_filter_regex,
+        walk_data.use_apparent_size,
+        false,
+        false,
+        walk_data.by_filecount,
+        depth,
+    )
 }

 mod tests {
-
    #[allow(unused_imports)]
    use super::*;

@@ -293,41 +257,4 @@ mod tests {
        assert_eq!(clean_inodes(n.clone(), &mut inodes, true), Some(n.clone()));
        assert_eq!(clean_inodes(n.clone(), &mut inodes, true), Some(n.clone()));
    }
-
-    #[test]
-    fn test_total_ordering_of_sort_by_inode() {
-        use std::str::FromStr;
-
-        let a = Node {
-            name: PathBuf::from_str("a").unwrap(),
-            size: 0,
-            children: vec![],
-            inode_device: Some((3, 66310)),
-            depth: 0,
-        };
-
-        let b = Node {
-            name: PathBuf::from_str("b").unwrap(),
-            size: 0,
-            children: vec![],
-            inode_device: None,
-            depth: 0,
-        };
-
-        let c = Node {
-            name: PathBuf::from_str("c").unwrap(),
-            size: 0,
-            children: vec![],
-            inode_device: Some((1, 66310)),
-            depth: 0,
-        };
-
-        assert_eq!(sort_by_inode(&a, &b), Ordering::Greater);
-        assert_eq!(sort_by_inode(&a, &c), Ordering::Greater);
-        assert_eq!(sort_by_inode(&c, &b), Ordering::Greater);
-
-        assert_eq!(sort_by_inode(&b, &a), Ordering::Less);
-        assert_eq!(sort_by_inode(&c, &a), Ordering::Less);
-        assert_eq!(sort_by_inode(&b, &c), Ordering::Less);
-    }
 }
--- a/src/display.rs
+++ b/src/display.rs
@@ -23,7 +23,7 @@ pub struct InitialDisplayData {
    pub colors_on: bool,
    pub by_filecount: bool,
    pub is_screen_reader: bool,
-    pub output_format: String,
+    pub iso: bool,
    pub bars_on_right: bool,
 }

@@ -142,7 +142,7 @@ pub fn draw_it(
        let max_size = biggest.size;
        max_size.separate_with_commas().chars().count()
    } else {
-        find_biggest_size_str(root_node, &idd.output_format)
+        find_biggest_size_str(root_node, idd.iso)
    };

    assert!(
@@ -190,12 +190,10 @@ pub fn draw_it(
    }
 }

-fn find_biggest_size_str(node: &DisplayNode, output_format: &str) -> usize {
-    let mut mx = human_readable_number(node.size, output_format)
-        .chars()
-        .count();
+fn find_biggest_size_str(node: &DisplayNode, iso: bool) -> usize {
+    let mut mx = human_readable_number(node.size, iso).chars().count();
    for n in node.children.iter() {
-        mx = max(mx, find_biggest_size_str(n, output_format));
+        mx = max(mx, find_biggest_size_str(n, iso));
    }
    mx
 }
@@ -377,7 +375,7 @@ fn get_pretty_size(node: &DisplayNode, is_biggest: bool, display_data: &DisplayD
    let output = if display_data.initial.by_filecount {
        node.size.separate_with_commas()
    } else {
-        human_readable_number(node.size, &display_data.initial.output_format)
+        human_readable_number(node.size, display_data.initial.iso)
    };
    let spaces_to_add = display_data.num_chars_needed_on_left_most - output.chars().count();
    let output = " ".repeat(spaces_to_add) + output.as_str();
@@ -409,51 +407,19 @@ fn get_pretty_name(
    }
 }

-// If we are working with SI units or not
-pub fn get_type_of_thousand(output_str: &str) -> u64 {
-    if output_str.is_empty() {
-        1024
-    } else if output_str == "si" {
-        1000
-    } else if output_str.contains('i') || output_str.len() == 1 {
-        1024
-    } else {
-        1000
-    }
-}
-
-pub fn get_number_format(output_str: &str) -> Option<(u64, char)> {
-    if output_str.starts_with('b') {
-        return Some((1, 'B'));
-    }
+pub fn human_readable_number(size: u64, iso: bool) -> String {
    for (i, u) in UNITS.iter().enumerate() {
-        if output_str.starts_with((*u).to_ascii_lowercase()) {
-            let marker = get_type_of_thousand(output_str).pow((UNITS.len() - i) as u32);
-            return Some((marker, *u));
-        }
-    }
-    None
-}
-
-pub fn human_readable_number(size: u64, output_str: &str) -> String {
-    match get_number_format(output_str) {
-        Some((x, u)) => {
-            format!("{}{}", (size / x), u)
-        }
-        None => {
-            for (i, u) in UNITS.iter().enumerate() {
-                let marker = get_type_of_thousand(output_str).pow((UNITS.len() - i) as u32);
-                if size >= marker {
-                    if size / marker < 10 {
-                        return format!("{:.1}{}", (size as f32 / marker as f32), u);
-                    } else {
-                        return format!("{}{}", (size / marker), u);
-                    }
-                }
+        let num: u64 = if iso { 1000 } else { 1024 };
+        let marker = num.pow((UNITS.len() - i) as u32);
+        if size >= marker {
+            if size / marker < 10 {
+                return format!("{:.1}{}", (size as f32 / marker as f32), u);
+            } else {
+                return format!("{}{}", (size / marker), u);
            }
-            format!("{size}B")
        }
    }
+    format!("{size}B")
 }

 mod tests {
@@ -470,7 +436,7 @@ mod tests {
            colors_on: false,
            by_filecount: false,
            is_screen_reader: false,
-            output_format: "".into(),
+            iso: false,
            bars_on_right: false,
        };
        DisplayData {
@@ -537,43 +503,26 @@ mod tests {

    #[test]
    fn test_human_readable_number() {
-        assert_eq!(human_readable_number(1, ""), "1B");
-        assert_eq!(human_readable_number(956, ""), "956B");
-        assert_eq!(human_readable_number(1004, ""), "1004B");
-        assert_eq!(human_readable_number(1024, ""), "1.0K");
-        assert_eq!(human_readable_number(1536, ""), "1.5K");
-        assert_eq!(human_readable_number(1024 * 512, ""), "512K");
-        assert_eq!(human_readable_number(1024 * 1024, ""), "1.0M");
-        assert_eq!(human_readable_number(1024 * 1024 * 1024 - 1, ""), "1023M");
-        assert_eq!(human_readable_number(1024 * 1024 * 1024 * 20, ""), "20G");
-        assert_eq!(human_readable_number(1024 * 1024 * 1024 * 1024, ""), "1.0T");
-    }
-
-    #[test]
-    fn test_human_readable_number_si() {
-        assert_eq!(human_readable_number(1024 * 100, ""), "100K");
-        assert_eq!(human_readable_number(1024 * 100, "si"), "102K");
-    }
-
-    // Refer to https://en.wikipedia.org/wiki/Byte#Multiple-byte_units
-    #[test]
-    fn test_human_readable_number_kb() {
-        let hrn = human_readable_number;
-        assert_eq!(hrn(1023, "b"), "1023B");
-        assert_eq!(hrn(1000 * 1000, "bytes"), "1000000B");
-        assert_eq!(hrn(1023, "kb"), "1K");
-        assert_eq!(hrn(1023, "k"), "0K");
-        assert_eq!(hrn(1023, "kib"), "0K");
-        assert_eq!(hrn(1024, "kib"), "1K");
-        assert_eq!(hrn(1024 * 512, "kib"), "512K");
-        assert_eq!(hrn(1024 * 1024, "kib"), "1024K");
-        assert_eq!(hrn(1024 * 1000 * 1000 * 20, "kib"), "20000000K");
-        assert_eq!(hrn(1024 * 1024 * 1000 * 20, "mib"), "20000M");
-        assert_eq!(hrn(1024 * 1024 * 1024 * 20, "gib"), "20G");
+        assert_eq!(human_readable_number(1, false), "1B");
+        assert_eq!(human_readable_number(956, false), "956B");
+        assert_eq!(human_readable_number(1004, false), "1004B");
+        assert_eq!(human_readable_number(1024, false), "1.0K");
+        assert_eq!(human_readable_number(1536, false), "1.5K");
+        assert_eq!(human_readable_number(1024 * 512, false), "512K");
+        assert_eq!(human_readable_number(1024 * 1024, false), "1.0M");
+        assert_eq!(
+            human_readable_number(1024 * 1024 * 1024 - 1, false),
+            "1023M"
+        );
+        assert_eq!(human_readable_number(1024 * 1024 * 1024 * 20, false), "20G");
+        assert_eq!(
+            human_readable_number(1024 * 1024 * 1024 * 1024, false),
+            "1.0T"
+        );
    }

    #[cfg(test)]
-    fn build_draw_data(disp: &DisplayData, size: u32) -> (DrawData<'_>, DisplayNode) {
+    fn build_draw_data<'a>(disp: &'a DisplayData, size: u32) -> (DrawData<'a>, DisplayNode) {
        let n = DisplayNode {
            name: PathBuf::from("/short"),
            size: 2_u64.pow(size),
--- a/src/display_node.rs
+++ b/src/display_node.rs
@@ -1,8 +1,6 @@
 use std::path::PathBuf;

-use serde::Serialize;
-
-#[derive(Debug, PartialEq, Eq, PartialOrd, Ord, Clone, Serialize)]
+#[derive(Debug, PartialEq, Eq, PartialOrd, Ord, Clone)]
 pub struct DisplayNode {
    // Note: the order of fields in important here, for PartialEq and PartialOrd
    pub size: u64,
--- a/src/filter.rs
+++ b/src/filter.rs
@@ -114,7 +114,7 @@ fn recursive_rebuilder(allowed_nodes: &HashMap<&Path, &Node>, current: &Node) ->
        .map(|c| recursive_rebuilder(allowed_nodes, c))
        .collect();

-    build_display_node(new_children, current)
+    build_node(new_children, current)
 }

 // Applies all allowed nodes as children to current node
@@ -127,10 +127,10 @@ fn flat_rebuilder(allowed_nodes: HashMap<&Path, &Node>, current: &Node) -> Displ
            children: vec![],
        })
        .collect::<Vec<DisplayNode>>();
-    build_display_node(new_children, current)
+    build_node(new_children, current)
 }

-fn build_display_node(mut new_children: Vec<DisplayNode>, current: &Node) -> DisplayNode {
+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(),
--- a/src/main.rs
+++ b/src/main.rs
@@ -19,13 +19,9 @@ use filter::AggregateData;
 use progress::PIndicator;
 use regex::Error;
 use std::collections::HashSet;
-use std::env;
 use std::fs::read_to_string;
-use std::io;
 use std::panic;
 use std::process;
-use std::sync::atomic::AtomicBool;
-use std::sync::atomic::Ordering;
 use std::sync::Arc;
 use std::sync::Mutex;
 use sysinfo::{System, SystemExt};
@@ -45,38 +41,29 @@ use utils::simplify_dir_names;
 static DEFAULT_NUMBER_OF_LINES: usize = 30;
 static DEFAULT_TERMINAL_WIDTH: usize = 80;

-fn should_init_color(no_color: bool, force_color: bool) -> bool {
-    if force_color {
-        return true;
-    }
-    if no_color {
-        return false;
-    }
-    // check if NO_COLOR is set
-    // https://no-color.org/
-    if env::var_os("NO_COLOR").is_some() {
-        return false;
-    }
-    if terminal_size().is_none() {
-        // we are not in a terminal, color may not be needed
-        return false;
-    }
-    // we are in a terminal
+fn init_color(no_color: bool) -> bool {
    #[cfg(windows)]
    {
-        // Required for windows 10
-        // Fails to resolve for windows 8 so disable color
-        match ansi_term::enable_ansi_support() {
-            Ok(_) => true,
-            Err(_) => {
-                eprintln!("This version of Windows does not support ANSI colors");
-                false
+        // If no color is already set do not print a warning message
+        if no_color {
+            true
+        } else {
+            // Required for windows 10
+            // Fails to resolve for windows 8 so disable color
+            match ansi_term::enable_ansi_support() {
+                Ok(_) => no_color,
+                Err(_) => {
+                    eprintln!(
+                    "This version of Windows does not support ANSI colors, setting no_color flag"
+                );
+                    true
+                }
            }
        }
    }
    #[cfg(not(windows))]
    {
-        true
+        no_color
    }
 }

@@ -118,53 +105,10 @@ fn main() {
    let options = build_cli().get_matches();
    let config = get_config();

-    let errors = RuntimeErrors::default();
-    let error_listen_for_ctrlc = Arc::new(Mutex::new(errors));
-    let errors_for_rayon = error_listen_for_ctrlc.clone();
-    let errors_final = error_listen_for_ctrlc.clone();
-    let is_in_listing = Arc::new(AtomicBool::new(false));
-    let cloned_is_in_listing = Arc::clone(&is_in_listing);
-
-    ctrlc::set_handler(move || {
-        error_listen_for_ctrlc.lock().unwrap().abort = true;
-        println!("\nAborting");
-        if cloned_is_in_listing.load(Ordering::Relaxed) {
-            process::exit(1);
-        }
-    })
-    .expect("Error setting Ctrl-C handler");
-
-    is_in_listing.store(true, Ordering::Relaxed);
-    let target_dirs = match config.get_files_from(&options) {
-        Some(path) => {
-            if path == "-" {
-                let mut targets_to_add = io::stdin()
-                    .lines()
-                    .map_while(Result::ok)
-                    .collect::<Vec<String>>();
-
-                if targets_to_add.is_empty() {
-                    eprintln!("No input provided, defaulting to current directory");
-                    targets_to_add.push(".".to_owned());
-                }
-                targets_to_add
-            } else {
-                // read file
-                match read_to_string(path) {
-                    Ok(file_content) => file_content.lines().map(|x| x.to_string()).collect(),
-                    Err(e) => {
-                        eprintln!("Error reading file: {e}");
-                        vec![".".to_owned()]
-                    }
-                }
-            }
-        }
-        None => match options.get_many::<String>("params") {
-            Some(values) => values.cloned().collect(),
-            None => vec![".".to_owned()],
-        },
+    let target_dirs = match options.get_many::<String>("params") {
+        Some(values) => values.map(|v| v.as_str()).collect::<Vec<&str>>(),
+        None => vec!["."],
    };
-    is_in_listing.store(false, Ordering::Relaxed);

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

@@ -192,10 +136,7 @@ fn main() {
        }
    };

-    let is_colors = should_init_color(
-        config.get_no_colors(&options),
-        config.get_force_colors(&options),
-    );
+    let no_colors = init_color(config.get_no_colors(&options));

    let ignore_directories = match options.get_many::<String>("ignore_directory") {
        Some(values) => values
@@ -227,47 +168,39 @@ fn main() {
    let limit_filesystem = options.get_flag("limit_filesystem");
    let follow_links = options.get_flag("dereference_links");

+    let simplified_dirs = simplify_dir_names(target_dirs);
    let allowed_filesystems = limit_filesystem
-        .then(|| get_filesystem_devices(&target_dirs))
+        .then(|| get_filesystem_devices(simplified_dirs.iter()))
        .unwrap_or_default();
-    let simplified_dirs = simplify_dir_names(&target_dirs);

    let ignored_full_path: HashSet<PathBuf> = ignore_directories
        .into_iter()
        .flat_map(|x| simplified_dirs.iter().map(move |d| d.join(&x)))
        .collect();

-    let output_format = config.get_output_format(&options);
+    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(output_format.clone())
+        indicator.spawn(iso);
    }

-    let filter_modified_time = config.get_modified_time_operator(&options);
-    let filter_accessed_time = config.get_accessed_time_operator(&options);
-    let filter_changed_time = config.get_created_time_operator(&options);
-
    let walk_data = WalkData {
        ignore_directories: ignored_full_path,
        filter_regex: &filter_regexs,
        invert_filter_regex: &invert_filter_regexs,
        allowed_filesystems,
-        filter_modified_time,
-        filter_accessed_time,
-        filter_changed_time,
        use_apparent_size: config.get_apparent_size(&options),
        by_filecount,
        ignore_hidden,
        follow_links,
        progress_data: indicator.data.clone(),
-        errors: errors_for_rayon,
+        errors: Arc::new(Mutex::new(RuntimeErrors::default())),
    };
-    let threads_to_use = config.get_threads(&options);
    let stack_size = config.get_custom_stack_size(&options);
-    init_rayon(&stack_size, &threads_to_use);
+    init_rayon(&stack_size);

    let top_level_nodes = walk_it(simplified_dirs, &walk_data);

@@ -275,7 +208,7 @@ fn main() {
        true => get_all_file_types(&top_level_nodes, number_of_lines),
        false => {
            let agg_data = AggregateData {
-                min_size: config.get_min_size(&options),
+                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,
@@ -289,11 +222,8 @@ fn main() {
    // Must have stopped indicator before we print to stderr
    indicator.stop();

-    if errors_final.lock().unwrap().abort {
-        return;
-    }
-
    let final_errors = walk_data.errors.lock().unwrap();
+    let failed_permissions = final_errors.no_permissions;
    if !final_errors.file_not_found.is_empty() {
        let err = final_errors
            .file_not_found
@@ -303,20 +233,8 @@ fn main() {
            .join(", ");
        eprintln!("No such file or directory: {}", err);
    }
-    if !final_errors.no_permissions.is_empty() {
-        if config.get_print_errors(&options) {
-            let err = final_errors
-                .no_permissions
-                .iter()
-                .map(|a| a.as_ref())
-                .collect::<Vec<&str>>()
-                .join(", ");
-            eprintln!("Did not have permissions for directories: {}", err);
-        } else {
-            eprintln!(
-                "Did not have permissions for all directories (add --print-errors to see errors)"
-            );
-        }
+    if failed_permissions {
+        eprintln!("Did not have permissions for all directories");
    }
    if !final_errors.unknown_error.is_empty() {
        let err = final_errors
@@ -332,65 +250,50 @@ fn main() {
        let idd = InitialDisplayData {
            short_paths: !config.get_full_paths(&options),
            is_reversed: !config.get_reverse(&options),
-            colors_on: is_colors,
+            colors_on: !no_colors,
            by_filecount,
+            iso,
            is_screen_reader: config.get_screen_reader(&options),
-            output_format,
            bars_on_right: config.get_bars_on_right(&options),
        };
-
-        if config.get_output_json(&options) {
-            println!("{}", serde_json::to_string(&root_node).unwrap());
-        } else {
-            draw_it(
-                idd,
-                config.get_no_bars(&options),
-                terminal_width,
-                &root_node,
-                config.get_skip_total(&options),
-            )
-        }
+        draw_it(
+            idd,
+            config.get_no_bars(&options),
+            terminal_width,
+            &root_node,
+            config.get_skip_total(&options),
+        )
    }
 }

-fn init_rayon(stack_size: &Option<usize>, threads: &Option<usize>) {
+fn init_rayon(stack_size: &Option<usize>) {
    // Rayon seems to raise this error on 32-bit builds
    // The global thread pool has not been initialized.: ThreadPoolBuildError { kind: GlobalPoolAlreadyInitialized }
    if cfg!(target_pointer_width = "64") {
-        let result = panic::catch_unwind(|| build_thread_pool(*stack_size, *threads));
+        let result = panic::catch_unwind(|| {
+            match stack_size {
+                Some(n) => rayon::ThreadPoolBuilder::new()
+                    .stack_size(*n)
+                    .build_global(),
+                None => {
+                    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 {
+                        rayon::ThreadPoolBuilder::new().build_global()
+                    }
+                }
+            }
+        });
        if result.is_err() {
            eprintln!("Problem initializing rayon, try: export RAYON_NUM_THREADS=1")
        }
    }
 }
-
-fn build_thread_pool(
-    stack: Option<usize>,
-    threads: Option<usize>,
-) -> Result<(), rayon::ThreadPoolBuildError> {
-    let mut pool = rayon::ThreadPoolBuilder::new();
-
-    if let Some(thread_count) = threads {
-        pool = pool.num_threads(thread_count);
-    }
-
-    let stack_size = match stack {
-        Some(s) => Some(s),
-        None => {
-            let large_stack = usize::pow(1024, 3);
-            let mut s = System::new();
-            s.refresh_memory();
-            // Larger stack size if possible to handle cases with lots of nested directories
-            let available = s.available_memory();
-            if available > large_stack.try_into().unwrap() {
-                Some(large_stack)
-            } else {
-                None
-            }
-        }
-    };
-    if let Some(stack_size_param) = stack_size {
-        pool = pool.stack_size(stack_size_param);
-    }
-    pool.build_global()
-}
--- a/src/node.rs
+++ b/src/node.rs
@@ -1,9 +1,8 @@
-use crate::dir_walker::WalkData;
 use crate::platform::get_metadata;
-use crate::utils::is_filtered_out_due_to_file_time;
 use crate::utils::is_filtered_out_due_to_invert_regex;
 use crate::utils::is_filtered_out_due_to_regex;

+use regex::Regex;
 use std::cmp::Ordering;
 use std::path::PathBuf;

@@ -20,14 +19,14 @@ pub struct Node {
 pub fn build_node(
    dir: PathBuf,
    children: Vec<Node>,
+    filter_regex: &[Regex],
+    invert_filter_regex: &[Regex],
+    use_apparent_size: bool,
    is_symlink: bool,
    is_file: bool,
+    by_filecount: bool,
    depth: usize,
-    walk_data: &WalkData,
 ) -> Option<Node> {
-    let use_apparent_size = walk_data.use_apparent_size;
-    let by_filecount = walk_data.by_filecount;
-
    get_metadata(&dir, use_apparent_size).map(|data| {
        let inode_device = if is_symlink && !use_apparent_size {
            None
@@ -35,19 +34,11 @@ pub fn build_node(
            data.1
        };

-        let size = if is_filtered_out_due_to_regex(walk_data.filter_regex, &dir)
-            || is_filtered_out_due_to_invert_regex(walk_data.invert_filter_regex, &dir)
+        let size = if is_filtered_out_due_to_regex(filter_regex, &dir)
+            || is_filtered_out_due_to_invert_regex(invert_filter_regex, &dir)
            || (is_symlink && !use_apparent_size)
            || by_filecount && !is_file
-            || [
-                (&walk_data.filter_modified_time, data.2 .0),
-                (&walk_data.filter_accessed_time, data.2 .1),
-                (&walk_data.filter_changed_time, data.2 .2),
-            ]
-            .iter()
-            .any(|(filter_time, actual_time)| {
-                is_filtered_out_due_to_file_time(filter_time, *actual_time)
-            }) {
+        {
            0
        } else if by_filecount {
            1
--- a/src/platform.rs
+++ b/src/platform.rs
@@ -10,29 +10,15 @@ fn get_block_size() -> u64 {
    512
 }

-type InodeAndDevice = (u64, u64);
-type FileTime = (i64, i64, i64);
-
 #[cfg(target_family = "unix")]
-pub fn get_metadata<P: AsRef<Path>>(
-    path: P,
-    use_apparent_size: bool,
-) -> Option<(u64, Option<InodeAndDevice>, FileTime)> {
+pub fn get_metadata(d: &Path, use_apparent_size: bool) -> Option<(u64, Option<(u64, u64)>)> {
    use std::os::unix::fs::MetadataExt;
-    match path.as_ref().metadata() {
+    match d.metadata() {
        Ok(md) => {
            if use_apparent_size {
-                Some((
-                    md.len(),
-                    Some((md.ino(), md.dev())),
-                    (md.mtime(), md.atime(), md.ctime()),
-                ))
+                Some((md.len(), Some((md.ino(), md.dev()))))
            } else {
-                Some((
-                    md.blocks() * get_block_size(),
-                    Some((md.ino(), md.dev())),
-                    (md.mtime(), md.atime(), md.ctime()),
-                ))
+                Some((md.blocks() * get_block_size(), Some((md.ino(), md.dev()))))
            }
        }
        Err(_e) => None,
@@ -40,10 +26,7 @@ pub fn get_metadata<P: AsRef<Path>>(
 }

 #[cfg(target_family = "windows")]
-pub fn get_metadata<P: AsRef<Path>>(
-    path: P,
-    use_apparent_size: bool,
-) -> Option<(u64, Option<InodeAndDevice>, FileTime)> {
+pub fn get_metadata(d: &Path, _use_apparent_size: bool) -> Option<(u64, Option<(u64, u64)>)> {
    // On windows opening the file to get size, file ID and volume can be very
    // expensive because 1) it causes a few system calls, and more importantly 2) it can cause
    // windows defender to scan the file.
@@ -82,7 +65,7 @@ pub fn get_metadata<P: AsRef<Path>>(

    use std::io;
    use winapi_util::Handle;
-    fn handle_from_path_limited(path: &Path) -> io::Result<Handle> {
+    fn handle_from_path_limited<P: AsRef<Path>>(path: P) -> io::Result<Handle> {
        use std::fs::OpenOptions;
        use std::os::windows::fs::OpenOptionsExt;
        const FILE_READ_ATTRIBUTES: u32 = 0x0080;
@@ -107,42 +90,20 @@ pub fn get_metadata<P: AsRef<Path>>(
        Ok(Handle::from_file(file))
    }

-    fn get_metadata_expensive(
-        path: &Path,
-        use_apparent_size: bool,
-    ) -> Option<(u64, Option<InodeAndDevice>, FileTime)> {
+    fn get_metadata_expensive(d: &Path) -> Option<(u64, Option<(u64, u64)>)> {
        use winapi_util::file::information;

-        let h = handle_from_path_limited(path).ok()?;
+        let h = handle_from_path_limited(d).ok()?;
        let info = information(&h).ok()?;

-        if use_apparent_size {
-            use filesize::PathExt;
-            Some((
-                path.size_on_disk().ok()?,
-                Some((info.file_index(), info.volume_serial_number())),
-                (
-                    info.last_write_time().unwrap() as i64,
-                    info.last_access_time().unwrap() as i64,
-                    info.creation_time().unwrap() as i64,
-                ),
-            ))
-        } else {
-            Some((
-                info.file_size(),
-                Some((info.file_index(), info.volume_serial_number())),
-                (
-                    info.last_write_time().unwrap() as i64,
-                    info.last_access_time().unwrap() as i64,
-                    info.creation_time().unwrap() as i64,
-                ),
-            ))
-        }
+        Some((
+            info.file_size(),
+            Some((info.file_index(), info.volume_serial_number())),
+        ))
    }

    use std::os::windows::fs::MetadataExt;
-    let path = path.as_ref();
-    match path.metadata() {
+    match d.metadata() {
        Ok(ref md) => {
            const FILE_ATTRIBUTE_ARCHIVE: u32 = 0x20;
            const FILE_ATTRIBUTE_READONLY: u32 = 0x01;
@@ -150,39 +111,18 @@ pub fn get_metadata<P: AsRef<Path>>(
            const FILE_ATTRIBUTE_SYSTEM: u32 = 0x04;
            const FILE_ATTRIBUTE_NORMAL: u32 = 0x80;
            const FILE_ATTRIBUTE_DIRECTORY: u32 = 0x10;
-            const FILE_ATTRIBUTE_SPARSE_FILE: u32 = 0x00000200;
-            const FILE_ATTRIBUTE_PINNED: u32 = 0x00080000;
-            const FILE_ATTRIBUTE_UNPINNED: u32 = 0x00100000;
-            const FILE_ATTRIBUTE_RECALL_ON_OPEN: u32 = 0x00040000;
-            const FILE_ATTRIBUTE_RECALL_ON_DATA_ACCESS: u32 = 0x00400000;
-            const FILE_ATTRIBUTE_OFFLINE: u32 = 0x00001000;
-            // normally FILE_ATTRIBUTE_SPARSE_FILE would be enough, however Windows sometimes likes to mask it out. see: https://stackoverflow.com/q/54560454
-            const IS_PROBABLY_ONEDRIVE: u32 = FILE_ATTRIBUTE_SPARSE_FILE
-                | FILE_ATTRIBUTE_PINNED
-                | FILE_ATTRIBUTE_UNPINNED
-                | FILE_ATTRIBUTE_RECALL_ON_OPEN
-                | FILE_ATTRIBUTE_RECALL_ON_DATA_ACCESS
-                | FILE_ATTRIBUTE_OFFLINE;
+
            let attr_filtered = md.file_attributes()
                & !(FILE_ATTRIBUTE_HIDDEN | FILE_ATTRIBUTE_READONLY | FILE_ATTRIBUTE_SYSTEM);
-            if ((attr_filtered & FILE_ATTRIBUTE_ARCHIVE) != 0
+            if (attr_filtered & FILE_ATTRIBUTE_ARCHIVE) != 0
                || (attr_filtered & FILE_ATTRIBUTE_DIRECTORY) != 0
-                || md.file_attributes() == FILE_ATTRIBUTE_NORMAL)
-                && !((attr_filtered & IS_PROBABLY_ONEDRIVE != 0) && use_apparent_size)
+                || md.file_attributes() == FILE_ATTRIBUTE_NORMAL
            {
-                Some((
-                    md.len(),
-                    None,
-                    (
-                        md.last_write_time() as i64,
-                        md.last_access_time() as i64,
-                        md.creation_time() as i64,
-                    ),
-                ))
+                Some((md.len(), None))
            } else {
-                get_metadata_expensive(path, use_apparent_size)
+                get_metadata_expensive(d)
            }
        }
-        _ => get_metadata_expensive(path, use_apparent_size),
+        _ => get_metadata_expensive(d),
    }
 }
--- a/src/progress.rs
+++ b/src/progress.rs
@@ -70,24 +70,23 @@ impl PAtomicInfo {

 #[derive(Default)]
 pub struct RuntimeErrors {
-    pub no_permissions: HashSet<String>,
+    pub no_permissions: bool,
    pub file_not_found: HashSet<String>,
    pub unknown_error: HashSet<String>,
-    pub abort: bool,
 }

 /* -------------------------------------------------------------------------- */

-fn format_preparing_str(prog_char: char, data: &PAtomicInfo, output_display: &str) -> String {
+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), output_display);
+    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, output_display: &str) -> String {
+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), output_display);
+    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}")
 }
@@ -107,7 +106,7 @@ impl PIndicator {
        }
    }

-    pub fn spawn(&mut self, output_display: String) {
+    pub fn spawn(&mut self, is_iso: bool) {
        let data = self.data.clone();
        let (stop_handler, receiver) = mpsc::channel::<()>();

@@ -126,8 +125,8 @@ impl PIndicator {
                let prog_char = PROGRESS_CHARS[progress_char_i];

                msg = match data.state.load(ORDERING) {
-                    Operation::INDEXING => format_indexing_str(prog_char, &data, &output_display),
-                    Operation::PREPARING => format_preparing_str(prog_char, &data, &output_display),
+                    Operation::INDEXING => format_indexing_str(prog_char, &data, is_iso),
+                    Operation::PREPARING => format_preparing_str(prog_char, &data, is_iso),
                    _ => panic!("Unknown State"),
                };

--- a/src/utils.rs
+++ b/src/utils.rs
@@ -2,16 +2,13 @@ use platform::get_metadata;
 use std::collections::HashSet;
 use std::path::{Path, PathBuf};

-use crate::config::DAY_SECONDS;
-
-use crate::dir_walker::Operater;
 use crate::platform;
 use regex::Regex;

-pub fn simplify_dir_names<P: AsRef<Path>>(dirs: &[P]) -> HashSet<PathBuf> {
-    let mut top_level_names: HashSet<PathBuf> = HashSet::with_capacity(dirs.len());
+pub fn simplify_dir_names<P: AsRef<Path>>(filenames: Vec<P>) -> HashSet<PathBuf> {
+    let mut top_level_names: HashSet<PathBuf> = HashSet::with_capacity(filenames.len());

-    for t in dirs {
+    for t in filenames {
        let top_level_name = normalize_path(t);
        let mut can_add = true;
        let mut to_remove: Vec<PathBuf> = Vec::new();
@@ -34,12 +31,12 @@ pub fn simplify_dir_names<P: AsRef<Path>>(dirs: &[P]) -> HashSet<PathBuf> {
    top_level_names
 }

-pub fn get_filesystem_devices<P: AsRef<Path>>(paths: &[P]) -> HashSet<u64> {
+pub fn get_filesystem_devices<'a, P: IntoIterator<Item = &'a PathBuf>>(paths: P) -> HashSet<u64> {
    // Gets the device ids for the filesystems which are used by the argument paths
    paths
-        .iter()
+        .into_iter()
        .filter_map(|p| match get_metadata(p, false) {
-            Some((_size, Some((_id, dev)), _time)) => Some(dev),
+            Some((_size, Some((_id, dev)))) => Some(dev),
            _ => None,
        })
        .collect()
@@ -65,20 +62,6 @@ pub fn is_filtered_out_due_to_regex(filter_regex: &[Regex], dir: &Path) -> bool
    }
 }

-pub fn is_filtered_out_due_to_file_time(
-    filter_time: &Option<(Operater, i64)>,
-    actual_time: i64,
-) -> bool {
-    match filter_time {
-        None => false,
-        Some((Operater::Equal, bound_time)) => {
-            !(actual_time >= *bound_time && actual_time < *bound_time + DAY_SECONDS)
-        }
-        Some((Operater::GreaterThan, bound_time)) => actual_time < *bound_time,
-        Some((Operater::LessThan, bound_time)) => actual_time > *bound_time,
-    }
-}
-
 pub fn is_filtered_out_due_to_invert_regex(filter_regex: &[Regex], dir: &Path) -> bool {
    filter_regex
        .iter()
@@ -99,15 +82,15 @@ mod tests {
    fn test_simplify_dir() {
        let mut correct = HashSet::new();
        correct.insert(PathBuf::from("a"));
-        assert_eq!(simplify_dir_names(&["a"]), correct);
+        assert_eq!(simplify_dir_names(vec!["a"]), correct);
    }

    #[test]
    fn test_simplify_dir_rm_subdir() {
        let mut correct = HashSet::new();
        correct.insert(["a", "b"].iter().collect::<PathBuf>());
-        assert_eq!(simplify_dir_names(&["a/b/c", "a/b", "a/b/d/f"]), correct);
-        assert_eq!(simplify_dir_names(&["a/b", "a/b/c", "a/b/d/f"]), correct);
+        assert_eq!(simplify_dir_names(vec!["a/b/c", "a/b", "a/b/d/f"]), correct);
+        assert_eq!(simplify_dir_names(vec!["a/b", "a/b/c", "a/b/d/f"]), correct);
    }

    #[test]
@@ -116,7 +99,7 @@ mod tests {
        correct.insert(["a", "b"].iter().collect::<PathBuf>());
        correct.insert(PathBuf::from("c"));
        assert_eq!(
-            simplify_dir_names(&[
+            simplify_dir_names(vec![
                "a/b",
                "a/b//",
                "a/././b///",
@@ -135,14 +118,14 @@ mod tests {
        correct.insert(PathBuf::from("b"));
        correct.insert(["c", "a", "b"].iter().collect::<PathBuf>());
        correct.insert(["a", "b"].iter().collect::<PathBuf>());
-        assert_eq!(simplify_dir_names(&["a/b", "c/a/b/", "b"]), correct);
+        assert_eq!(simplify_dir_names(vec!["a/b", "c/a/b/", "b"]), correct);
    }

    #[test]
    fn test_simplify_dir_dots() {
        let mut correct = HashSet::new();
        correct.insert(PathBuf::from("src"));
-        assert_eq!(simplify_dir_names(&["src/."]), correct);
+        assert_eq!(simplify_dir_names(vec!["src/."]), correct);
    }

    #[test]
@@ -150,7 +133,7 @@ mod tests {
        let mut correct = HashSet::new();
        correct.insert(PathBuf::from("src"));
        correct.insert(PathBuf::from("src_v2"));
-        assert_eq!(simplify_dir_names(&["src/", "src_v2"]), correct);
+        assert_eq!(simplify_dir_names(vec!["src/", "src_v2"]), correct);
    }

    #[test]
--- a/tests/test_exact_output.rs
+++ b/tests/test_exact_output.rs
@@ -1,11 +1,9 @@
 use assert_cmd::Command;
 use std::ffi::OsStr;
-use std::process::Output;
+use std::str;
 use std::sync::Once;
-use std::{io, str};

 static INIT: Once = Once::new();
-static UNREADABLE_DIR_PATH: &str = "/tmp/unreadable_dir";

 /**
 * This file contains tests that verify the exact output of the command.
@@ -35,59 +33,34 @@ fn copy_test_data(dir: &str) {
        .map_err(|err| eprintln!("Error copying directory for test setup\n{:?}", err));
 }

-fn create_unreadable_directory() -> io::Result<()> {
-    #[cfg(unix)]
-    {
-        use std::fs;
-        use std::fs::Permissions;
-        use std::os::unix::fs::PermissionsExt;
-        fs::create_dir_all(UNREADABLE_DIR_PATH)?;
-        fs::set_permissions(UNREADABLE_DIR_PATH, Permissions::from_mode(0))?;
-    }
-    Ok(())
-}
-
 fn initialize() {
    INIT.call_once(|| {
        copy_test_data("tests/test_dir");
        copy_test_data("tests/test_dir2");
        copy_test_data("tests/test_dir_unicode");
-
-        if let Err(e) = create_unreadable_directory() {
-            panic!("Failed to create unreadable directory: {}", e);
-        }
    });
 }

-fn run_cmd<T: AsRef<OsStr>>(command_args: &[T]) -> Output {
+fn exact_output_test<T: AsRef<OsStr>>(valid_outputs: Vec<String>, command_args: Vec<T>) {
    initialize();
-    let mut to_run = &mut Command::cargo_bin("dust").unwrap();
+
+    let mut a = &mut Command::cargo_bin("dust").unwrap();
+
    for p in command_args {
-        to_run = to_run.arg(p);
+        a = a.arg(p);
    }
-    to_run.unwrap()
-}

-fn exact_stdout_test<T: AsRef<OsStr>>(command_args: &[T], valid_stdout: Vec<String>) {
-    let to_run = run_cmd(command_args);
+    let output = str::from_utf8(&a.unwrap().stdout).unwrap().to_owned();

-    let stdout_output = str::from_utf8(&to_run.stdout).unwrap().to_owned();
-    let will_fail = valid_stdout.iter().any(|i| stdout_output.contains(i));
+    let will_fail = valid_outputs.iter().any(|i| output.contains(i));
    if !will_fail {
        eprintln!(
-            "output(stdout):\n{}\ndoes not contain any of:\n{}",
-            stdout_output,
-            valid_stdout.join("\n\n")
+            "output:\n{}\ndoes not contain any of:\n{}",
+            output,
+            valid_outputs.join("\n\n")
        );
    }
-    assert!(will_fail);
-}
-
-fn exact_stderr_test<T: AsRef<OsStr>>(command_args: &[T], valid_stderr: String) {
-    let to_run = run_cmd(command_args);
-
-    let stderr_output = str::from_utf8(&to_run.stderr).unwrap().trim();
-    assert_eq!(stderr_output, valid_stderr);
+    assert!(will_fail)
 }

 // "windows" result data can vary by host (size seems to be variable by one byte); fix code vs test and re-enable
@@ -95,20 +68,20 @@ fn exact_stderr_test<T: AsRef<OsStr>>(command_args: &[T], valid_stderr: String)
 #[test]
 pub fn test_main_basic() {
    // -c is no color mode - This makes testing much simpler
-    exact_stdout_test(&["-c", "-B", "/tmp/test_dir/"], main_output());
+    exact_output_test(main_output(), vec!["-c", "-B", "/tmp/test_dir/"])
 }

 #[cfg_attr(target_os = "windows", ignore)]
 #[test]
 pub fn test_main_multi_arg() {
-    let command_args = [
+    let command_args = vec![
        "-c",
        "-B",
        "/tmp/test_dir/many/",
        "/tmp/test_dir",
        "/tmp/test_dir",
    ];
-    exact_stdout_test(&command_args, main_output());
+    exact_output_test(main_output(), command_args);
 }

 fn main_output() -> Vec<String> {
@@ -138,8 +111,8 @@ fn main_output() -> Vec<String> {
 #[cfg_attr(target_os = "windows", ignore)]
 #[test]
 pub fn test_main_long_paths() {
-    let command_args = ["-c", "-p", "-B", "/tmp/test_dir/"];
-    exact_stdout_test(&command_args, main_output_long_paths());
+    let command_args = vec!["-c", "-p", "-B", "/tmp/test_dir/"];
+    exact_output_test(main_output_long_paths(), command_args);
 }

 fn main_output_long_paths() -> Vec<String> {
@@ -166,8 +139,8 @@ fn main_output_long_paths() -> Vec<String> {
 #[cfg_attr(target_os = "windows", ignore)]
 #[test]
 pub fn test_substring_of_names_and_long_names() {
-    let command_args = ["-c", "-B", "/tmp/test_dir2"];
-    exact_stdout_test(&command_args, no_substring_of_names_output());
+    let command_args = vec!["-c", "-B", "/tmp/test_dir2"];
+    exact_output_test(no_substring_of_names_output(), command_args);
 }

 fn no_substring_of_names_output() -> Vec<String> {
@@ -200,8 +173,8 @@ fn no_substring_of_names_output() -> Vec<String> {
 #[cfg_attr(target_os = "windows", ignore)]
 #[test]
 pub fn test_unicode_directories() {
-    let command_args = ["-c", "-B", "/tmp/test_dir_unicode"];
-    exact_stdout_test(&command_args, unicode_dir());
+    let command_args = vec!["-c", "-B", "/tmp/test_dir_unicode"];
+    exact_output_test(unicode_dir(), command_args);
 }

 fn unicode_dir() -> Vec<String> {
@@ -227,8 +200,8 @@ fn unicode_dir() -> Vec<String> {
 #[cfg_attr(target_os = "windows", ignore)]
 #[test]
 pub fn test_apparent_size() {
-    let command_args = ["-c", "-s", "-b", "/tmp/test_dir"];
-    exact_stdout_test(&command_args, apparent_size_output());
+    let command_args = vec!["-c", "-s", "-b", "/tmp/test_dir"];
+    exact_output_test(apparent_size_output(), command_args);
 }

 fn apparent_size_output() -> Vec<String> {
@@ -249,26 +222,3 @@ fn apparent_size_output() -> Vec<String> {

    vec![one_space_before, two_space_before]
 }
-
-#[cfg_attr(target_os = "windows", ignore)]
-#[test]
-pub fn test_permission_normal() {
-    let command_args = [UNREADABLE_DIR_PATH];
-    let permission_msg =
-        r#"Did not have permissions for all directories (add --print-errors to see errors)"#
-            .trim()
-            .to_string();
-    exact_stderr_test(&command_args, permission_msg);
-}
-
-#[cfg_attr(target_os = "windows", ignore)]
-#[test]
-pub fn test_permission_flag() {
-    // add the flag to CLI
-    let command_args = ["--print-errors", UNREADABLE_DIR_PATH];
-    let permission_msg = format!(
-        "Did not have permissions for directories: {}",
-        UNREADABLE_DIR_PATH
-    );
-    exact_stderr_test(&command_args, permission_msg);
-}
--- a/tests/test_flags.rs
+++ b/tests/test_flags.rs
@@ -59,12 +59,6 @@ pub fn test_d_flag_works() {
    assert!(!output.contains("hello_file"));
 }

-#[test]
-pub fn test_threads_flag_works() {
-    let output = build_command(vec!["-T", "1", "tests/test_dir/"]);
-    assert!(output.contains("hello_file"));
-}
-
 #[test]
 pub fn test_d_flag_works_and_still_recurses_down() {
    // We had a bug where running with '-d 1' would stop at the first directory and the code
@@ -139,9 +133,9 @@ pub fn test_show_files_by_type() {
 #[cfg(target_family = "unix")]
 pub fn test_show_files_only() {
    let output = build_command(vec!["-c", "-F", "tests/test_dir"]);
-    assert!(output.contains("a_file"));
-    assert!(output.contains("hello_file"));
-    assert!(!output.contains("many"));
+    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]
@@ -238,19 +232,3 @@ pub fn test_show_files_by_invert_regex_match_multiple() {
    assert!(!output.contains("test_dir_unicode"));
    assert!(output.contains("many"));
 }
-
-#[test]
-pub fn test_no_color() {
-    let output = build_command(vec!["-c"]);
-    // Red is 31
-    assert!(!output.contains("\x1B[31m"));
-    assert!(!output.contains("\x1B[0m"));
-}
-
-#[test]
-pub fn test_force_color() {
-    let output = build_command(vec!["-C"]);
-    // Red is 31
-    assert!(output.contains("\x1B[31m"));
-    assert!(output.contains("\x1B[0m"));
-}
Author	SHA1	Message	Date
andy.boot	88797b3f66	Fix completions.	2024-02-12 23:09:23 +00:00
andy.boot	13af2ff351	cargo update	2024-02-11 20:18:09 +00:00
wickles	b5e3f4ca2f	Fix filename completions for zsh and bash (#331 ) Reapply commit accidentally reverted	2024-02-11 20:17:33 +00:00