summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorsolidiquis <benjamin.van.nguyen@gmail.com>2024-05-19 11:04:09 -0700
committersolidiquis <benjamin.van.nguyen@gmail.com>2024-05-19 11:04:09 -0700
commit37bdf6b6ae6a3ece82ae035ad8cf6d14208142fa (patch)
tree9252c3c3880fc76101b7bbd0b2808dda249dfa9c
parent56fbf61019971e2dd817f73a8cfe8131e2a6e4db (diff)
progress indicatorprogress-indicator
-rw-r--r--Cargo.lock247
-rw-r--r--Cargo.toml12
-rw-r--r--src/disk/mod.rs16
-rw-r--r--src/file/mod.rs32
-rw-r--r--src/file/tree/filter.rs10
-rw-r--r--src/file/tree/mod.rs44
-rw-r--r--src/file/tree/traverse.rs6
-rw-r--r--src/main.rs21
-rw-r--r--src/perf.rs21
-rw-r--r--src/progress.rs58
-rw-r--r--src/render/mod.rs8
-rw-r--r--src/render/row/long.rs32
-rw-r--r--src/render/row/mod.rs6
-rw-r--r--src/user/config/parse.rs12
-rw-r--r--src/user/mod.rs14
15 files changed, 341 insertions, 198 deletions
diff --git a/Cargo.lock b/Cargo.lock
index a9e7e42..510e150 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -4,9 +4,9 @@ version = 3
[[package]]
name = "ahash"
-version = "0.8.6"
+version = "0.8.11"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "91429305e9f0a25f6205c5b8e0d2db09e0708a7a6df0f42212bb56c32c8ac97a"
+checksum = "e89da841a80418a9b391ebaea17f5c112ffaaa96f621d2c285b5174da76b9011"
dependencies = [
"cfg-if",
"getrandom",
@@ -17,9 +17,9 @@ dependencies = [
[[package]]
name = "aho-corasick"
-version = "0.7.20"
+version = "1.1.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cc936419f96fa211c1b9166887b38e5e40b19958e5b895be7c1f93adec7071ac"
+checksum = "8e60d3430d3a69478ad0993f19238d2df97c507009a52b3c10addcd7f6bcb916"
dependencies = [
"memchr",
]
@@ -123,9 +123,9 @@ checksum = "cf4b9d6a944f767f8e5e0db018570623c85f3d925ac718db4e06d0187adb21c1"
[[package]]
name = "bstr"
-version = "1.3.0"
+version = "1.9.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5ffdb39cb703212f3c11973452c2861b972f757b021158f3516ba10f2fa8b2c1"
+checksum = "05efc5cfd9110c8416e471df0e96702d58690178e206e61b7173706673c93706"
dependencies = [
"memchr",
"serde",
@@ -150,6 +150,12 @@ 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.24"
source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -236,6 +242,31 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e496a50fda8aacccc86d7529e2c1e0892dbd0f898a6b5645b5561b89c3210efa"
[[package]]
+name = "crossbeam-deque"
+version = "0.8.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "613f8cc01fe9cf1a3eb3d7f488fd2fa8388403e97039e2f73692932e291a770d"
+dependencies = [
+ "crossbeam-epoch",
+ "crossbeam-utils",
+]
+
+[[package]]
+name = "crossbeam-epoch"
+version = "0.9.18"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5b82ac4a3c2ca9c3460964f020e1402edd5753411d7737aa39c3714ad1b5420e"
+dependencies = [
+ "crossbeam-utils",
+]
+
+[[package]]
+name = "crossbeam-utils"
+version = "0.8.19"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "248e3bacc7dc6baa3b21e405ee045c3047101a49145e7e9eca583ab4c2ca5345"
+
+[[package]]
name = "crossterm"
version = "0.27.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -262,12 +293,12 @@ dependencies = [
[[package]]
name = "ctrlc"
-version = "3.4.0"
+version = "3.4.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2a011bbe2c35ce9c1f143b7af6f94f29a167beb4cd1d29e6740ce836f723120e"
+checksum = "672465ae37dc1bc6380a6547a8883d5dd397b0f1faaad4f265726cc7042a5345"
dependencies = [
"nix",
- "windows-sys 0.48.0",
+ "windows-sys 0.52.0",
]
[[package]]
@@ -378,12 +409,6 @@ dependencies = [
]
[[package]]
-name = "fnv"
-version = "1.0.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1"
-
-[[package]]
name = "getrandom"
version = "0.2.9"
source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -396,15 +421,15 @@ dependencies = [
[[package]]
name = "globset"
-version = "0.4.10"
+version = "0.4.14"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "029d74589adefde59de1a0c4f4732695c32805624aec7b68d91503d4dba79afc"
+checksum = "57da3b9b5b85bd66f31093f8c408b90a74431672542466497dcbdfdc02034be1"
dependencies = [
"aho-corasick",
"bstr",
- "fnv",
"log",
- "regex",
+ "regex-automata",
+ "regex-syntax",
]
[[package]]
@@ -450,17 +475,16 @@ dependencies = [
[[package]]
name = "ignore"
-version = "0.4.20"
+version = "0.4.22"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dbe7873dab538a9a44ad79ede1faf5f30d49f9a5c883ddbab48bce81b64b7492"
+checksum = "b46810df39e66e925525d6e38ce1e7f6e1d208f72dc39757880fcb66e2c58af1"
dependencies = [
+ "crossbeam-deque",
"globset",
- "lazy_static",
"log",
"memchr",
- "regex",
+ "regex-automata",
"same-file",
- "thread_local",
"walkdir",
"winapi-util",
]
@@ -530,9 +554,9 @@ checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646"
[[package]]
name = "libc"
-version = "0.2.141"
+version = "0.2.155"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3304a64d199bb964be99741b7a14d26972741915b3649639149b2479bb46f4b5"
+checksum = "97b3888a4aecf77e811145cadf6eef5901f4782c53886191b2f693f24761847c"
[[package]]
name = "linux-raw-sys"
@@ -542,9 +566,9 @@ checksum = "f051f77a7c8e6957c0696eac88f26b0117e54f52d3fc682ab19397a8812846a4"
[[package]]
name = "linux-raw-sys"
-version = "0.3.1"
+version = "0.4.14"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d59d8c75012853d2e872fb56bc8a2e53718e2cafe1a4c823143141c6d90c322f"
+checksum = "78b3ae25bc7c8c38cec158d1f2757ee79e9b3740fbc7ccf0e59e4b08d793fa89"
[[package]]
name = "lock_api"
@@ -564,9 +588,9 @@ checksum = "b5e6163cb8c49088c2c36f57875e58ccd8c87c7427f7fbd50ea6710b2f3f2e8f"
[[package]]
name = "lscolors"
-version = "0.13.0"
+version = "0.17.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c2dedc85d67baf5327114fad78ab9418f8893b1121c17d5538dd11005ad1ddf2"
+checksum = "53304fff6ab1e597661eee37e42ea8c47a146fca280af902bb76bff8a896e523"
dependencies = [
"ansi_term",
"nu-ansi-term",
@@ -574,9 +598,9 @@ dependencies = [
[[package]]
name = "memchr"
-version = "2.5.0"
+version = "2.7.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d"
+checksum = "6c8640c5d730cb13ebd907d8d04b52f55ac9a2eec55b440c8892f40d56c76c1d"
[[package]]
name = "minimal-lexical"
@@ -598,14 +622,14 @@ dependencies = [
[[package]]
name = "nix"
-version = "0.26.2"
+version = "0.28.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bfdda3d196821d6af13126e40375cdf7da646a96114af134d5f417a9a1dc8e1a"
+checksum = "ab2156c4fce2f8df6c499cc1c763e4394b7482525bf2a9701c9d79d215f519e4"
dependencies = [
- "bitflags 1.3.2",
+ "bitflags 2.5.0",
"cfg-if",
+ "cfg_aliases",
"libc",
- "static_assertions",
]
[[package]]
@@ -620,12 +644,11 @@ dependencies = [
[[package]]
name = "nu-ansi-term"
-version = "0.46.0"
+version = "0.50.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "77a8165726e8236064dbb45459242600304b42a5ea24ee2948e18e023bf7ba84"
+checksum = "dd2800e1520bdc966782168a627aa5d1ad92e33b984bf7c7615d31280c83ff14"
dependencies = [
- "overload",
- "winapi",
+ "windows-sys 0.48.0",
]
[[package]]
@@ -654,12 +677,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92"
[[package]]
-name = "overload"
-version = "0.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b15813163c1d831bf4a13c3610c05c0d03b39feb07f7e09fa234dac9b15aaf39"
-
-[[package]]
name = "parking_lot"
version = "0.12.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -728,9 +745,21 @@ dependencies = [
[[package]]
name = "regex"
-version = "1.7.3"
+version = "1.10.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8b1f693b24f6ac912f4893ef08244d70b6067480d2f1a46e950c9691e6749d1d"
+checksum = "c117dbdfde9c8308975b6a18d71f3f385c89461f7b3fb054288ecf2a2058ba4c"
+dependencies = [
+ "aho-corasick",
+ "memchr",
+ "regex-automata",
+ "regex-syntax",
+]
+
+[[package]]
+name = "regex-automata"
+version = "0.4.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "86b83b8b9847f9bf95ef68afb0b8e6cdb80f498442f5179a29fad448fcc1eaea"
dependencies = [
"aho-corasick",
"memchr",
@@ -739,9 +768,9 @@ dependencies = [
[[package]]
name = "regex-syntax"
-version = "0.6.29"
+version = "0.8.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f162c6dd7b008981e4d40210aca20b4bd0f9b60ca9271061b07f78537722f2e1"
+checksum = "adad44e29e4c806119491a7f06f03de4d1af22c3a680dd47f1e6e179439d1f56"
[[package]]
name = "rustix"
@@ -759,16 +788,15 @@ dependencies = [
[[package]]
name = "rustix"
-version = "0.37.7"
+version = "0.38.25"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2aae838e49b3d63e9274e1c01833cc8139d3fec468c3b84688c628f44b1ae11d"
+checksum = "dc99bc2d4f1fed22595588a013687477aedf3cdcfb26558c559edb67b4d9b22e"
dependencies = [
- "bitflags 1.3.2",
+ "bitflags 2.5.0",
"errno 0.3.1",
- "io-lifetimes",
"libc",
- "linux-raw-sys 0.3.1",
- "windows-sys 0.45.0",
+ "linux-raw-sys 0.4.14",
+ "windows-sys 0.48.0",
]
[[package]]
@@ -852,12 +880,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a507befe795404456341dfab10cef66ead4c041f62b8b11bbb92bffe5d0953e0"
[[package]]
-name = "static_assertions"
-version = "1.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f"
-
-[[package]]
name = "strip-ansi-escapes"
version = "0.1.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -898,11 +920,11 @@ dependencies = [
[[package]]
name = "terminal_size"
-version = "0.2.6"
+version = "0.3.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8e6bf6f19e9f8ed8d4048dc22981458ebcf406d67e94cd422e5ecd73d63b3237"
+checksum = "21bebf2b7c9e0a515f6e0f8c51dc0f8e4696391e6f1ff30379559f8365fb0df7"
dependencies = [
- "rustix 0.37.7",
+ "rustix 0.38.25",
"windows-sys 0.48.0",
]
@@ -927,16 +949,6 @@ dependencies = [
]
[[package]]
-name = "thread_local"
-version = "1.1.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3fdd6f064ccff2d6567adcb3873ca630700f00b5ad3f060c25b5dcfd9a4ce152"
-dependencies = [
- "cfg-if",
- "once_cell",
-]
-
-[[package]]
name = "toml"
version = "0.8.8"
source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -1011,9 +1023,9 @@ dependencies = [
[[package]]
name = "walkdir"
-version = "2.3.3"
+version = "2.5.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "36df944cda56c7d8d8b7496af378e6b16de9284591917d307c9b4d313c44e698"
+checksum = "29790946404f91d9c5d06f9874efddea1dc06c5efe94541a7d6863108e3a5e4b"
dependencies = [
"same-file",
"winapi-util",
@@ -1153,6 +1165,15 @@ dependencies = [
]
[[package]]
+name = "windows-sys"
+version = "0.52.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d"
+dependencies = [
+ "windows-targets 0.52.5",
+]
+
+[[package]]
name = "windows-targets"
version = "0.42.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -1183,6 +1204,22 @@ dependencies = [
]
[[package]]
+name = "windows-targets"
+version = "0.52.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6f0713a46559409d202e70e28227288446bf7841d3211583a4b53e3f6d96e7eb"
+dependencies = [
+ "windows_aarch64_gnullvm 0.52.5",
+ "windows_aarch64_msvc 0.52.5",
+ "windows_i686_gnu 0.52.5",
+ "windows_i686_gnullvm",
+ "windows_i686_msvc 0.52.5",
+ "windows_x86_64_gnu 0.52.5",
+ "windows_x86_64_gnullvm 0.52.5",
+ "windows_x86_64_msvc 0.52.5",
+]
+
+[[package]]
name = "windows_aarch64_gnullvm"
version = "0.42.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -1195,6 +1232,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "91ae572e1b79dba883e0d315474df7305d12f569b400fcf90581b06062f7e1bc"
[[package]]
+name = "windows_aarch64_gnullvm"
+version = "0.52.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7088eed71e8b8dda258ecc8bac5fb1153c5cffaf2578fc8ff5d61e23578d3263"
+
+[[package]]
name = "windows_aarch64_msvc"
version = "0.42.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -1207,6 +1250,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b2ef27e0d7bdfcfc7b868b317c1d32c641a6fe4629c171b8928c7b08d98d7cf3"
[[package]]
+name = "windows_aarch64_msvc"
+version = "0.52.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9985fd1504e250c615ca5f281c3f7a6da76213ebd5ccc9561496568a2752afb6"
+
+[[package]]
name = "windows_i686_gnu"
version = "0.42.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -1219,6 +1268,18 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "622a1962a7db830d6fd0a69683c80a18fda201879f0f447f065a3b7467daa241"
[[package]]
+name = "windows_i686_gnu"
+version = "0.52.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "88ba073cf16d5372720ec942a8ccbf61626074c6d4dd2e745299726ce8b89670"
+
+[[package]]
+name = "windows_i686_gnullvm"
+version = "0.52.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "87f4261229030a858f36b459e748ae97545d6f1ec60e5e0d6a3d32e0dc232ee9"
+
+[[package]]
name = "windows_i686_msvc"
version = "0.42.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -1231,6 +1292,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "4542c6e364ce21bf45d69fdd2a8e455fa38d316158cfd43b3ac1c5b1b19f8e00"
[[package]]
+name = "windows_i686_msvc"
+version = "0.52.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "db3c2bf3d13d5b658be73463284eaf12830ac9a26a90c717b7f771dfe97487bf"
+
+[[package]]
name = "windows_x86_64_gnu"
version = "0.42.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -1243,6 +1310,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ca2b8a661f7628cbd23440e50b05d705db3686f894fc9580820623656af974b1"
[[package]]
+name = "windows_x86_64_gnu"
+version = "0.52.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4e4246f76bdeff09eb48875a0fd3e2af6aada79d409d33011886d3e1581517d9"
+
+[[package]]
name = "windows_x86_64_gnullvm"
version = "0.42.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -1255,6 +1328,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7896dbc1f41e08872e9d5e8f8baa8fdd2677f29468c4e156210174edc7f7b953"
[[package]]
+name = "windows_x86_64_gnullvm"
+version = "0.52.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "852298e482cd67c356ddd9570386e2862b5673c85bd5f88df9ab6802b334c596"
+
+[[package]]
name = "windows_x86_64_msvc"
version = "0.42.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -1267,6 +1346,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "1a515f5799fe4961cb532f983ce2b23082366b898e52ffbce459c86f67c8378a"
[[package]]
+name = "windows_x86_64_msvc"
+version = "0.52.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bec47e5bfd1bff0eeaf6d8b485cc1074891a197ab4225d504cb7a1ab88b02bf0"
+
+[[package]]
name = "winnow"
version = "0.5.28"
source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -1277,18 +1362,18 @@ dependencies = [
[[package]]
name = "zerocopy"
-version = "0.7.25"
+version = "0.7.34"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8cd369a67c0edfef15010f980c3cbe45d7f651deac2cd67ce097cd801de16557"
+checksum = "ae87e3fcd617500e5d106f0380cf7b77f3c6092aae37191433159dda23cfb087"
dependencies = [
"zerocopy-derive",
]
[[package]]
name = "zerocopy-derive"
-version = "0.7.25"
+version = "0.7.34"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c2f140bda219a26ccc0cdb03dba58af72590c53b22642577d88a927bc5c87d6b"
+checksum = "15e934569e47891f7d9411f1a451d947a60e000ab3bd24fbb970f000387d1b3b"
dependencies = [
"proc-macro2",
"quote",
diff --git a/Cargo.toml b/Cargo.toml
index 49cf683..6e6ef1f 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -30,7 +30,7 @@ wildcard_imports = "allow"
obfuscated_if_else = "allow"
[dependencies]
-ahash = "0.8.6"
+ahash = "0.8.11"
ansi_term = "0.12.1"
anyhow = "1.0.75"
chrono = { version = "0.4.24", default-features = false, features = ["clock", "std"] }
@@ -38,16 +38,16 @@ clap = { version = "4.5.4", features = ["derive"] }
clap_complete = "4.1.1"
config = { version = "0.14.0", default-features = false, features = ["toml"] }
crossterm = "0.27.0"
-ctrlc = "3.4.0"
+ctrlc = "3.4.4"
dirs = "5.0"
errno = "0.3.1"
filesize = "0.2.0"
-ignore = "0.4.2"
+ignore = "0.4.22"
indextree = "4.6.0"
-lscolors = { version = "0.13.0", features = ["ansi_term"] }
+lscolors = { version = "0.17.0", features = ["ansi_term"] }
once_cell = "1.19.0"
-regex = "1.7.3"
-terminal_size = "0.2.6"
+regex = "1.10.4"
+terminal_size = "0.3.0"
thiserror = "1.0.40"
toml = "0.8.8"
diff --git a/src/disk/mod.rs b/src/disk/mod.rs
index 80d86e9..70bfecf 100644
--- a/src/disk/mod.rs
+++ b/src/disk/mod.rs
@@ -118,10 +118,8 @@ impl Usage {
let word_count =
std::fs::read_to_string(data.path()).map(|data| data.split_whitespace().count())?;
- let word_count = u64::try_from(word_count).map_or_else(
- |_| Self::WordCount(word_count as u64),
- Self::WordCount,
- );
+ let word_count = u64::try_from(word_count)
+ .map_or_else(|_| Self::WordCount(word_count as u64), Self::WordCount);
Ok(word_count)
}
@@ -140,10 +138,8 @@ impl Usage {
let line_count = fs::read_to_string(data.path()).map(|data| data.lines().count())?;
- let line_count = u64::try_from(line_count).map_or_else(
- |_| Self::WordCount(line_count as u64),
- Self::LineCount,
- );
+ let line_count = u64::try_from(line_count)
+ .map_or_else(|_| Self::WordCount(line_count as u64), Self::LineCount);
Ok(line_count)
}
@@ -186,7 +182,7 @@ impl Display for Usage {
let bytes = ($v as f64) / prefix.base_value();
write!(f, "{bytes:.FLOAT_PRECISION$} {prefix}B")
}
- },
+ }
BytePresentation::Si => {
let prefix = prefix::Si::from($v);
@@ -196,7 +192,7 @@ impl Display for Usage {
let bytes = ($v as f64) / prefix.base_value();
write!(f, "{bytes:.1} {prefix}B")
}
- },
+ }
}
};
}
diff --git a/src/file/mod.rs b/src/file/mod.rs
index 7565012..b3fae8d 100644
--- a/src/file/mod.rs
+++ b/src/file/mod.rs
@@ -260,9 +260,7 @@ impl Accumulator {
}
pub fn increment(&mut self, ft: Option<fs::FileType>) {
- let Some(file_type) = ft else {
- return
- };
+ let Some(file_type) = ft else { return };
if file_type.is_file() {
self.num_file += 1;
@@ -294,7 +292,7 @@ impl Display for DisplayPath<'_> {
let path = self.file.path();
path.strip_prefix(prefix)
.map_or_else(|_| path.display(), |p| p.display())
- },
+ }
None => self.file.path().display(),
};
@@ -307,3 +305,29 @@ impl Display for DisplayPath<'_> {
}
}
}
+
+impl Display for Accumulator {
+ fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+ let mut displayed_count = Vec::new();
+
+ match self.num_dir {
+ n if n > 1 => displayed_count.push(format!("{} directories", n)),
+ 1 => displayed_count.push("1 directory".to_string()),
+ _ => (),
+ }
+
+ match self.num_file {
+ n if n > 1 => displayed_count.push(format!("{} files", n)),
+ 1 => displayed_count.push("1 file".to_string()),
+ _ => (),
+ }
+
+ match self.num_link {
+ n if n > 1 => displayed_count.push(format!("{} links", n)),
+ 1 => displayed_count.push("1 link".to_string()),
+ _ => (),
+ }
+
+ writeln!(f, "{}", displayed_count.join(", "))
+ }
+}
diff --git a/src/file/tree/filter.rs b/src/file/tree/filter.rs
index 98e8ee1..09b0e2f 100644
--- a/src/file/tree/filter.rs
+++ b/src/file/tree/filter.rs
@@ -90,7 +90,7 @@ impl Tree {
match ft {
FileType::Dir if matches!(layout, Layout::Tree | Layout::InvertedTree) => {
filters.push(Box::new(|f| f.is_dir()))
- },
+ }
FileType::Dir => filters.push(Box::new(|f| f.is_dir())),
FileType::File => filters.push(Box::new(|f| f.is_file())),
FileType::Symlink => filters.push(Box::new(|f| f.is_symlink())),
@@ -152,7 +152,7 @@ impl Tree {
to_remove
.into_iter()
.for_each(|n| n.remove(&mut self.arena));
- },
+ }
_ => {
let to_remove = self
.root_id
@@ -167,7 +167,7 @@ impl Tree {
to_remove
.into_iter()
.for_each(|n| n.remove_subtree(&mut self.arena));
- },
+ }
};
Ok(())
@@ -230,7 +230,7 @@ impl Tree {
to_remove
.into_iter()
.for_each(|n| n.remove(&mut self.arena));
- },
+ }
_ => {
let to_remove = self
.root_id
@@ -251,7 +251,7 @@ impl Tree {
to_remove
.into_iter()
.for_each(|n| n.remove_subtree(&mut self.arena));
- },
+ }
}
Ok(())
diff --git a/src/file/tree/mod.rs b/src/file/tree/mod.rs
index 034adce..650fba2 100644
--- a/src/file/tree/mod.rs
+++ b/src/file/tree/mod.rs
@@ -43,12 +43,15 @@ pub enum TreeError {
impl Tree {
/// Like [`Tree::init`] but leverages parallelism for disk-reads and [`File`] initialization.
pub fn init(ctx: &Context) -> Result<(Self, super::Accumulator, column::Metadata)> {
- let (TransitionState {
- mut arena,
- mut branches,
- mut column_metadata,
- root_id,
- }, accumulator)= Self::load(ctx)?;
+ let (
+ TransitionState {
+ mut arena,
+ mut branches,
+ mut column_metadata,
+ root_id,
+ },
+ accumulator,
+ ) = Self::load(ctx)?;
let mut dir_stack = vec![root_id];
let mut inode_set = HashSet::default();
@@ -130,7 +133,7 @@ impl Tree {
all_dirents
.into_iter()
.for_each(|n| root_id.append(n, &mut arena));
- },
+ }
_ => {
for (dir_id, dirsize) in dirsize_map.into_iter() {
let dir = arena[dir_id].get_mut();
@@ -148,7 +151,7 @@ impl Tree {
}
}
}
- },
+ }
},
None => {
for (dir_id, dirsize) in dirsize_map.into_iter() {
@@ -161,7 +164,7 @@ impl Tree {
}
}
}
- },
+ }
}
column_metadata.update_size_width(arena[root_id].get(), ctx);
@@ -171,13 +174,18 @@ impl Tree {
Ok((tree, accumulator, column_metadata))
}
- pub fn init_without_disk_usage(ctx: &Context) -> Result<(Self, super::Accumulator, column::Metadata)> {
- let (TransitionState {
- mut arena,
- mut branches,
- mut column_metadata,
- root_id,
- }, accumulator)= Self::load(ctx)?;
+ pub fn init_without_disk_usage(
+ ctx: &Context,
+ ) -> Result<(Self, super::Accumulator, column::Metadata)> {
+ let (
+ TransitionState {
+ mut arena,
+ mut branches,
+ mut column_metadata,
+ root_id,
+ },
+ accumulator,
+ ) = Self::load(ctx)?;
#[cfg(unix)]
macro_rules! update_metadata {
@@ -211,7 +219,7 @@ impl Tree {
#[cfg(unix)]
update_metadata!(dirent_id);
}
- },
+ }
_ => {
let dirs = arena
.iter()
@@ -244,7 +252,7 @@ impl Tree {
}
}
});
- },
+ }
}
let tree = Self { root_id, arena };
diff --git a/src/file/tree/traverse.rs b/src/file/tree/traverse.rs
index dd725fd..4bb3e09 100644
--- a/src/file/tree/traverse.rs
+++ b/src/file/tree/traverse.rs
@@ -76,16 +76,16 @@ impl ParallelVisitor for Visitor<'_> {
Err(e) => {
let _ = self.send(TraversalState::Error(e));
return WalkState::Continue;
- },
+ }
};
match File::init(entry, self.ctx).into_report(ErrorCategory::Warning) {
Ok(file) => {
let _ = self.send(TraversalState::Ongoing(file));
- },
+ }
Err(e) => {
let _ = self.send(TraversalState::Error(e));
- },
+ }
}
WalkState::Continue
diff --git a/src/main.rs b/src/main.rs
index 42edb58..acd21a7 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -1,9 +1,6 @@
#![cfg_attr(windows, feature(windows_by_handle))]
use clap::CommandFactory;
-use std::{
- io::stdout,
- process::ExitCode,
-};
+use std::{io::stdout, process::ExitCode};
/// Concerned with disk usage calculation and presentation.
mod disk;
@@ -25,7 +22,6 @@ mod progress;
mod user;
use user::Context;
-
/// For basic performance measurements when compiling for debug.
#[cfg(debug_assertions)]
#[macro_use]
@@ -65,15 +61,8 @@ fn run() -> Result<()> {
return Ok(());
}
- // TODO: Use accumulator
- let (mut file_tree, _accumulator, column_metadata) = if ctx.no_progress {
- if ctx.suppress_size {
- file::Tree::init_without_disk_usage(&ctx)
- } else {
- file::Tree::init(&ctx)
- }
- } else {
- progress::Indicator::init().show_progress(|| {
+ let (mut file_tree, accumulator, column_metadata) = {
+ progress::init_indicator(&ctx)?.show_progress(|| {
if ctx.suppress_size {
file::Tree::init_without_disk_usage(&ctx)
} else {
@@ -88,6 +77,10 @@ fn run() -> Result<()> {
Renderer::new(&ctx, &file_tree).render()?;
+ if !ctx.no_report {
+ println!("{accumulator}");
+ }
+
#[cfg(debug_assertions)]
{
perf::finish_recording("crate::main");
diff --git a/src/perf.rs b/src/perf.rs
index 4afe22d..01a9e18 100644
--- a/src/perf.rs
+++ b/src/perf.rs
@@ -1,14 +1,13 @@
use ahash::HashMap;
use once_cell::sync::Lazy;
use std::{
- io,
- fmt,
+ fmt, io,
sync::{
mpsc::{self, Sender},
OnceLock,
},
- time::{Duration, Instant},
thread::{self, JoinHandle},
+ time::{Duration, Instant},
};
static mut GLOBAL_PERF_METRICS: OnceLock<PerfMetrics> = OnceLock::new();
@@ -76,23 +75,19 @@ pub fn finish_recording(name: &str) {
OUTPUT_NOTIFIER
.get()
.cloned()
- .and_then(|tx| {
- tx.send(Message::Recording(recording)).ok()
- });
+ .and_then(|tx| tx.send(Message::Recording(recording)).ok());
}
pub fn output<T: io::Write>(mut w: T) {
- OUTPUT_NOTIFIER.get().cloned().and_then(|tx| {
- tx.send(Message::Terminate).ok()
- });
+ OUTPUT_NOTIFIER
+ .get()
+ .cloned()
+ .and_then(|tx| tx.send(Message::Terminate).ok());
let mut recordings = unsafe {
GLOBAL_PERF_METRICS
.get_mut()
- .and_then(|PerfMetrics(join)| {
- join.take()
- .and_then(|h| h.join().ok())
- })
+ .and_then(|PerfMetrics(join)| join.take().and_then(|h| h.join().ok()))
.unwrap()
};
diff --git a/src/progress.rs b/src/progress.rs
index 1c30cee..a38541a 100644
--- a/src/progress.rs
+++ b/src/progress.rs
@@ -1,13 +1,13 @@
+use crate::error::prelude::*;
use crossterm::{
- cursor,
- execute,
- ExecutableCommand,
+ cursor, execute,
style::Print,
terminal::{self, ClearType},
+ ExecutableCommand,
};
use std::{
- io::{self, Write},
fmt,
+ io::{self, IsTerminal, Write},
sync::{
mpsc::{self, Receiver, Sender},
OnceLock,
@@ -21,12 +21,36 @@ pub const RENDER_INTERVAL_MS: u64 = 16;
/// To notify the progress indicator
static NOTIFIER: OnceLock<Sender<Message>> = OnceLock::new();
+pub fn init_indicator<F, T>(
+ ctx: &crate::user::Context,
+) -> Result<Box<dyn ProgressIndicator<F, T>>> {
+ if ctx.no_progress || !io::stdout().is_terminal() {
+ return Ok(Box::new(NoOpIndicator::new()));
+ }
+
+ ctrlc::try_set_handler(|| {
+ let _ = io::stdout().execute(cursor::Show);
+ std::process::exit(libc::SIGINT + 128);
+ })
+ .into_report(ErrorCategory::Internal)?;
+
+ Ok(Box::new(Indicator::new()))
+}
+
+pub trait ProgressIndicator<F, T> {
+ fn show_progress(&mut self, op: F) -> T
+ where
+ F: FnOnce() -> T;
+}
+
pub struct Indicator {
counter: usize,
state: IndicatorState,
mailbox: Rec