tyler.durden
/
bottom
mirror of https://github.com/ClementTsang/bottom.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

refactor: Update tui to 0.9; refactor with new features

This commit is contained in:
ClementTsang 2020-04-18 18:05:41 -04:00
parent 57b65ce750
commit bc571588e4
16 changed files with 391 additions and 376 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
CHANGELOG.md
View File

@ -61,6 +61,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
- [#109](https://github.com/ClementTsang/bottom/issues/109): Sorting processes by name is case-insensitive. - [#109](https://github.com/ClementTsang/bottom/issues/109): Sorting processes by name is case-insensitive.
- [#117](https://github.com/ClementTsang/bottom/issues/117): Update tui to 0.9:
- Use custom legend-hiding to stop hiding legends for memory and network widgets.
### Bug Fixes ### Bug Fixes
- [#33](https://github.com/ClementTsang/bottom/issues/33): Fix bug with search and graphemes bigger than a byte crashing due to the cursor. - [#33](https://github.com/ClementTsang/bottom/issues/33): Fix bug with search and graphemes bigger than a byte crashing due to the cursor.

153
Cargo.lock generated
View File

@ -48,8 +48,8 @@ name = "atty"
version = "0.2.14" version = "0.2.14"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [ dependencies = [
"hermit-abi 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)", "hermit-abi 0.1.11 (registry+https://github.com/rust-lang/crates.io-index)",
"libc 0.2.68 (registry+https://github.com/rust-lang/crates.io-index)", "libc 0.2.69 (registry+https://github.com/rust-lang/crates.io-index)",
"winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
] ]
@ -65,7 +65,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [ dependencies = [
"backtrace-sys 0.1.35 (registry+https://github.com/rust-lang/crates.io-index)", "backtrace-sys 0.1.35 (registry+https://github.com/rust-lang/crates.io-index)",
"cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)", "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)",
"libc 0.2.68 (registry+https://github.com/rust-lang/crates.io-index)", "libc 0.2.69 (registry+https://github.com/rust-lang/crates.io-index)",
"rustc-demangle 0.1.16 (registry+https://github.com/rust-lang/crates.io-index)", "rustc-demangle 0.1.16 (registry+https://github.com/rust-lang/crates.io-index)",
] ]
@ -75,7 +75,7 @@ version = "0.1.35"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [ dependencies = [
"cc 1.0.50 (registry+https://github.com/rust-lang/crates.io-index)", "cc 1.0.50 (registry+https://github.com/rust-lang/crates.io-index)",
"libc 0.2.68 (registry+https://github.com/rust-lang/crates.io-index)", "libc 0.2.69 (registry+https://github.com/rust-lang/crates.io-index)",
] ]
[[package]] [[package]]
@ -91,7 +91,7 @@ dependencies = [
"cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)", "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)",
"core-foundation 0.6.4 (registry+https://github.com/rust-lang/crates.io-index)", "core-foundation 0.6.4 (registry+https://github.com/rust-lang/crates.io-index)",
"lazycell 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)", "lazycell 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
"libc 0.2.68 (registry+https://github.com/rust-lang/crates.io-index)", "libc 0.2.69 (registry+https://github.com/rust-lang/crates.io-index)",
"mach 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)", "mach 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)",
"nix 0.15.0 (registry+https://github.com/rust-lang/crates.io-index)", "nix 0.15.0 (registry+https://github.com/rust-lang/crates.io-index)",
"num-traits 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)", "num-traits 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)",
@ -132,11 +132,11 @@ dependencies = [
"lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
"log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",
"predicates 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)", "predicates 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)",
"regex 1.3.6 (registry+https://github.com/rust-lang/crates.io-index)", "regex 1.3.7 (registry+https://github.com/rust-lang/crates.io-index)",
"serde 1.0.106 (registry+https://github.com/rust-lang/crates.io-index)", "serde 1.0.106 (registry+https://github.com/rust-lang/crates.io-index)",
"sysinfo 0.13.1 (registry+https://github.com/rust-lang/crates.io-index)", "sysinfo 0.14.1 (registry+https://github.com/rust-lang/crates.io-index)",
"toml 0.5.6 (registry+https://github.com/rust-lang/crates.io-index)", "toml 0.5.6 (registry+https://github.com/rust-lang/crates.io-index)",
"tui 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", "tui 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)",
"typed-builder 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)", "typed-builder 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
"unicode-segmentation 1.6.0 (registry+https://github.com/rust-lang/crates.io-index)", "unicode-segmentation 1.6.0 (registry+https://github.com/rust-lang/crates.io-index)",
"unicode-width 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)", "unicode-width 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)",
@ -201,7 +201,7 @@ version = "0.6.4"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [ dependencies = [
"core-foundation-sys 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)", "core-foundation-sys 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)",
"libc 0.2.68 (registry+https://github.com/rust-lang/crates.io-index)", "libc 0.2.69 (registry+https://github.com/rust-lang/crates.io-index)",
] ]
[[package]] [[package]]
@ -210,7 +210,7 @@ version = "0.7.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [ dependencies = [
"core-foundation-sys 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", "core-foundation-sys 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
"libc 0.2.68 (registry+https://github.com/rust-lang/crates.io-index)", "libc 0.2.69 (registry+https://github.com/rust-lang/crates.io-index)",
] ]
[[package]] [[package]]
@ -266,21 +266,6 @@ dependencies = [
"lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
] ]
[[package]]
name = "crossterm"
version = "0.14.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [
"bitflags 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
"crossterm_winapi 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
"lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
"libc 0.2.68 (registry+https://github.com/rust-lang/crates.io-index)",
"mio 0.6.21 (registry+https://github.com/rust-lang/crates.io-index)",
"parking_lot 0.10.2 (registry+https://github.com/rust-lang/crates.io-index)",
"signal-hook 0.1.13 (registry+https://github.com/rust-lang/crates.io-index)",
"winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
]
[[package]] [[package]]
name = "crossterm" name = "crossterm"
version = "0.17.3" version = "0.17.3"
@ -289,21 +274,13 @@ dependencies = [
"bitflags 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)", "bitflags 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
"crossterm_winapi 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)", "crossterm_winapi 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)",
"lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
"libc 0.2.68 (registry+https://github.com/rust-lang/crates.io-index)", "libc 0.2.69 (registry+https://github.com/rust-lang/crates.io-index)",
"mio 0.6.21 (registry+https://github.com/rust-lang/crates.io-index)", "mio 0.6.21 (registry+https://github.com/rust-lang/crates.io-index)",
"parking_lot 0.10.2 (registry+https://github.com/rust-lang/crates.io-index)", "parking_lot 0.10.2 (registry+https://github.com/rust-lang/crates.io-index)",
"signal-hook 0.1.13 (registry+https://github.com/rust-lang/crates.io-index)", "signal-hook 0.1.13 (registry+https://github.com/rust-lang/crates.io-index)",
"winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
] ]
[[package]]
name = "crossterm_winapi"
version = "0.5.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [
"winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
]
[[package]] [[package]]
name = "crossterm_winapi" name = "crossterm_winapi"
version = "0.6.1" version = "0.6.1"
@ -318,7 +295,7 @@ version = "0.1.2"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [ dependencies = [
"darwin-libproc-sys 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", "darwin-libproc-sys 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
"libc 0.2.68 (registry+https://github.com/rust-lang/crates.io-index)", "libc 0.2.69 (registry+https://github.com/rust-lang/crates.io-index)",
"memchr 2.3.3 (registry+https://github.com/rust-lang/crates.io-index)", "memchr 2.3.3 (registry+https://github.com/rust-lang/crates.io-index)",
] ]
@ -327,7 +304,7 @@ name = "darwin-libproc-sys"
version = "0.1.2" version = "0.1.2"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [ dependencies = [
"libc 0.2.68 (registry+https://github.com/rust-lang/crates.io-index)", "libc 0.2.69 (registry+https://github.com/rust-lang/crates.io-index)",
] ]
[[package]] [[package]]
@ -350,7 +327,7 @@ version = "0.3.4"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [ dependencies = [
"cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)", "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)",
"libc 0.2.68 (registry+https://github.com/rust-lang/crates.io-index)", "libc 0.2.69 (registry+https://github.com/rust-lang/crates.io-index)",
"redox_users 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)", "redox_users 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)",
"winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
] ]
@ -483,7 +460,7 @@ version = "0.1.14"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [ dependencies = [
"cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)", "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)",
"libc 0.2.68 (registry+https://github.com/rust-lang/crates.io-index)", "libc 0.2.69 (registry+https://github.com/rust-lang/crates.io-index)",
"wasi 0.9.0+wasi-snapshot-preview1 (registry+https://github.com/rust-lang/crates.io-index)", "wasi 0.9.0+wasi-snapshot-preview1 (registry+https://github.com/rust-lang/crates.io-index)",
] ]
@ -514,7 +491,7 @@ dependencies = [
"futures-core 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)", "futures-core 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)",
"futures-util 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)", "futures-util 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)",
"lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
"libc 0.2.68 (registry+https://github.com/rust-lang/crates.io-index)", "libc 0.2.69 (registry+https://github.com/rust-lang/crates.io-index)",
"mach 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)", "mach 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)",
"nix 0.17.0 (registry+https://github.com/rust-lang/crates.io-index)", "nix 0.17.0 (registry+https://github.com/rust-lang/crates.io-index)",
"pin-utils 0.1.0-alpha.4 (registry+https://github.com/rust-lang/crates.io-index)", "pin-utils 0.1.0-alpha.4 (registry+https://github.com/rust-lang/crates.io-index)",
@ -531,7 +508,7 @@ dependencies = [
"heim-common 0.0.10 (registry+https://github.com/rust-lang/crates.io-index)", "heim-common 0.0.10 (registry+https://github.com/rust-lang/crates.io-index)",
"heim-runtime 0.0.6 (registry+https://github.com/rust-lang/crates.io-index)", "heim-runtime 0.0.6 (registry+https://github.com/rust-lang/crates.io-index)",
"lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
"libc 0.2.68 (registry+https://github.com/rust-lang/crates.io-index)", "libc 0.2.69 (registry+https://github.com/rust-lang/crates.io-index)",
"mach 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)", "mach 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)",
"winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
] ]
@ -546,7 +523,7 @@ dependencies = [
"core-foundation 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", "core-foundation 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
"heim-common 0.0.10 (registry+https://github.com/rust-lang/crates.io-index)", "heim-common 0.0.10 (registry+https://github.com/rust-lang/crates.io-index)",
"heim-runtime 0.0.6 (registry+https://github.com/rust-lang/crates.io-index)", "heim-runtime 0.0.6 (registry+https://github.com/rust-lang/crates.io-index)",
"libc 0.2.68 (registry+https://github.com/rust-lang/crates.io-index)", "libc 0.2.69 (registry+https://github.com/rust-lang/crates.io-index)",
"mach 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)", "mach 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)",
"widestring 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", "widestring 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
"winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
@ -561,7 +538,7 @@ dependencies = [
"heim-common 0.0.10 (registry+https://github.com/rust-lang/crates.io-index)", "heim-common 0.0.10 (registry+https://github.com/rust-lang/crates.io-index)",
"heim-runtime 0.0.6 (registry+https://github.com/rust-lang/crates.io-index)", "heim-runtime 0.0.6 (registry+https://github.com/rust-lang/crates.io-index)",
"lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
"libc 0.2.68 (registry+https://github.com/rust-lang/crates.io-index)", "libc 0.2.69 (registry+https://github.com/rust-lang/crates.io-index)",
"mach 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)", "mach 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)",
"platforms 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", "platforms 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
"winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
@ -576,7 +553,7 @@ dependencies = [
"heim-common 0.0.10 (registry+https://github.com/rust-lang/crates.io-index)", "heim-common 0.0.10 (registry+https://github.com/rust-lang/crates.io-index)",
"heim-runtime 0.0.6 (registry+https://github.com/rust-lang/crates.io-index)", "heim-runtime 0.0.6 (registry+https://github.com/rust-lang/crates.io-index)",
"lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
"libc 0.2.68 (registry+https://github.com/rust-lang/crates.io-index)", "libc 0.2.69 (registry+https://github.com/rust-lang/crates.io-index)",
"mach 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)", "mach 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)",
"winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
] ]
@ -591,7 +568,7 @@ dependencies = [
"heim-common 0.0.10 (registry+https://github.com/rust-lang/crates.io-index)", "heim-common 0.0.10 (registry+https://github.com/rust-lang/crates.io-index)",
"heim-runtime 0.0.6 (registry+https://github.com/rust-lang/crates.io-index)", "heim-runtime 0.0.6 (registry+https://github.com/rust-lang/crates.io-index)",
"hex 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", "hex 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
"libc 0.2.68 (registry+https://github.com/rust-lang/crates.io-index)", "libc 0.2.69 (registry+https://github.com/rust-lang/crates.io-index)",
"macaddr 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)", "macaddr 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)",
"nix 0.17.0 (registry+https://github.com/rust-lang/crates.io-index)", "nix 0.17.0 (registry+https://github.com/rust-lang/crates.io-index)",
] ]
@ -609,7 +586,7 @@ dependencies = [
"heim-net 0.0.10 (registry+https://github.com/rust-lang/crates.io-index)", "heim-net 0.0.10 (registry+https://github.com/rust-lang/crates.io-index)",
"heim-runtime 0.0.6 (registry+https://github.com/rust-lang/crates.io-index)", "heim-runtime 0.0.6 (registry+https://github.com/rust-lang/crates.io-index)",
"lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
"libc 0.2.68 (registry+https://github.com/rust-lang/crates.io-index)", "libc 0.2.69 (registry+https://github.com/rust-lang/crates.io-index)",
"mach 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)", "mach 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)",
"memchr 2.3.3 (registry+https://github.com/rust-lang/crates.io-index)", "memchr 2.3.3 (registry+https://github.com/rust-lang/crates.io-index)",
"ntapi 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)", "ntapi 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)",
@ -652,10 +629,10 @@ dependencies = [
[[package]] [[package]]
name = "hermit-abi" name = "hermit-abi"
version = "0.1.10" version = "0.1.11"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [ dependencies = [
"libc 0.2.68 (registry+https://github.com/rust-lang/crates.io-index)", "libc 0.2.69 (registry+https://github.com/rust-lang/crates.io-index)",
] ]
[[package]] [[package]]
@ -668,15 +645,7 @@ name = "iovec"
version = "0.1.4" version = "0.1.4"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [ dependencies = [
"libc 0.2.68 (registry+https://github.com/rust-lang/crates.io-index)", "libc 0.2.69 (registry+https://github.com/rust-lang/crates.io-index)",
]
[[package]]
name = "itertools"
version = "0.8.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [
"either 1.5.3 (registry+https://github.com/rust-lang/crates.io-index)",
] ]
[[package]] [[package]]
@ -708,7 +677,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
[[package]] [[package]]
name = "libc" name = "libc"
version = "0.2.68" version = "0.2.69"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
[[package]] [[package]]
@ -737,7 +706,7 @@ name = "mach"
version = "0.2.3" version = "0.2.3"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [ dependencies = [
"libc 0.2.68 (registry+https://github.com/rust-lang/crates.io-index)", "libc 0.2.69 (registry+https://github.com/rust-lang/crates.io-index)",
] ]
[[package]] [[package]]
@ -745,7 +714,7 @@ name = "mach"
version = "0.3.2" version = "0.3.2"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [ dependencies = [
"libc 0.2.68 (registry+https://github.com/rust-lang/crates.io-index)", "libc 0.2.69 (registry+https://github.com/rust-lang/crates.io-index)",
] ]
[[package]] [[package]]
@ -776,7 +745,7 @@ dependencies = [
"fuchsia-zircon-sys 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)", "fuchsia-zircon-sys 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)",
"iovec 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", "iovec 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)",
"kernel32-sys 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", "kernel32-sys 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
"libc 0.2.68 (registry+https://github.com/rust-lang/crates.io-index)", "libc 0.2.69 (registry+https://github.com/rust-lang/crates.io-index)",
"log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",
"miow 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", "miow 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
"net2 0.2.33 (registry+https://github.com/rust-lang/crates.io-index)", "net2 0.2.33 (registry+https://github.com/rust-lang/crates.io-index)",
@ -801,7 +770,7 @@ version = "0.2.33"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [ dependencies = [
"cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)", "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)",
"libc 0.2.68 (registry+https://github.com/rust-lang/crates.io-index)", "libc 0.2.69 (registry+https://github.com/rust-lang/crates.io-index)",
"winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
] ]
@ -813,7 +782,7 @@ dependencies = [
"bitflags 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)", "bitflags 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
"cc 1.0.50 (registry+https://github.com/rust-lang/crates.io-index)", "cc 1.0.50 (registry+https://github.com/rust-lang/crates.io-index)",
"cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)", "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)",
"libc 0.2.68 (registry+https://github.com/rust-lang/crates.io-index)", "libc 0.2.69 (registry+https://github.com/rust-lang/crates.io-index)",
"void 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)", "void 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
] ]
@ -825,7 +794,7 @@ dependencies = [
"bitflags 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)", "bitflags 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
"cc 1.0.50 (registry+https://github.com/rust-lang/crates.io-index)", "cc 1.0.50 (registry+https://github.com/rust-lang/crates.io-index)",
"cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)", "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)",
"libc 0.2.68 (registry+https://github.com/rust-lang/crates.io-index)", "libc 0.2.69 (registry+https://github.com/rust-lang/crates.io-index)",
"void 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)", "void 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
] ]
@ -871,11 +840,11 @@ dependencies = [
[[package]] [[package]]
name = "num_cpus" name = "num_cpus"
version = "1.12.0" version = "1.13.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [ dependencies = [
"hermit-abi 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)", "hermit-abi 0.1.11 (registry+https://github.com/rust-lang/crates.io-index)",
"libc 0.2.68 (registry+https://github.com/rust-lang/crates.io-index)", "libc 0.2.69 (registry+https://github.com/rust-lang/crates.io-index)",
] ]
[[package]] [[package]]
@ -907,7 +876,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [ dependencies = [
"cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)", "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)",
"cloudabi 0.0.3 (registry+https://github.com/rust-lang/crates.io-index)", "cloudabi 0.0.3 (registry+https://github.com/rust-lang/crates.io-index)",
"libc 0.2.68 (registry+https://github.com/rust-lang/crates.io-index)", "libc 0.2.69 (registry+https://github.com/rust-lang/crates.io-index)",
"redox_syscall 0.1.56 (registry+https://github.com/rust-lang/crates.io-index)", "redox_syscall 0.1.56 (registry+https://github.com/rust-lang/crates.io-index)",
"smallvec 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)", "smallvec 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
"winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
@ -932,7 +901,7 @@ dependencies = [
"float-cmp 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)", "float-cmp 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)",
"normalize-line-endings 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", "normalize-line-endings 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
"predicates-core 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", "predicates-core 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
"regex 1.3.6 (registry+https://github.com/rust-lang/crates.io-index)", "regex 1.3.7 (registry+https://github.com/rust-lang/crates.io-index)",
] ]
[[package]] [[package]]
@ -1004,7 +973,7 @@ dependencies = [
"crossbeam-queue 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", "crossbeam-queue 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
"crossbeam-utils 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)", "crossbeam-utils 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)",
"lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
"num_cpus 1.12.0 (registry+https://github.com/rust-lang/crates.io-index)", "num_cpus 1.13.0 (registry+https://github.com/rust-lang/crates.io-index)",
] ]
[[package]] [[package]]
@ -1024,7 +993,7 @@ dependencies = [
[[package]] [[package]]
name = "regex" name = "regex"
version = "1.3.6" version = "1.3.7"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [ dependencies = [
"aho-corasick 0.7.10 (registry+https://github.com/rust-lang/crates.io-index)", "aho-corasick 0.7.10 (registry+https://github.com/rust-lang/crates.io-index)",
@ -1103,7 +1072,7 @@ name = "signal-hook"
version = "0.1.13" version = "0.1.13"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [ dependencies = [
"libc 0.2.68 (registry+https://github.com/rust-lang/crates.io-index)", "libc 0.2.69 (registry+https://github.com/rust-lang/crates.io-index)",
"mio 0.6.21 (registry+https://github.com/rust-lang/crates.io-index)", "mio 0.6.21 (registry+https://github.com/rust-lang/crates.io-index)",
"signal-hook-registry 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)", "signal-hook-registry 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
] ]
@ -1114,7 +1083,7 @@ version = "1.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [ dependencies = [
"arc-swap 0.4.5 (registry+https://github.com/rust-lang/crates.io-index)", "arc-swap 0.4.5 (registry+https://github.com/rust-lang/crates.io-index)",
"libc 0.2.68 (registry+https://github.com/rust-lang/crates.io-index)", "libc 0.2.69 (registry+https://github.com/rust-lang/crates.io-index)",
] ]
[[package]] [[package]]
@ -1144,12 +1113,12 @@ dependencies = [
[[package]] [[package]]
name = "sysinfo" name = "sysinfo"
version = "0.13.1" version = "0.14.1"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [ dependencies = [
"cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)", "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)",
"doc-comment 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)", "doc-comment 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)",
"libc 0.2.68 (registry+https://github.com/rust-lang/crates.io-index)", "libc 0.2.69 (registry+https://github.com/rust-lang/crates.io-index)",
"ntapi 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)", "ntapi 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)",
"once_cell 1.3.1 (registry+https://github.com/rust-lang/crates.io-index)", "once_cell 1.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
"rayon 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)", "rayon 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
@ -1177,7 +1146,7 @@ name = "threadpool"
version = "1.7.1" version = "1.7.1"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [ dependencies = [
"num_cpus 1.12.0 (registry+https://github.com/rust-lang/crates.io-index)", "num_cpus 1.13.0 (registry+https://github.com/rust-lang/crates.io-index)",
] ]
[[package]] [[package]]
@ -1185,7 +1154,7 @@ name = "time"
version = "0.1.42" version = "0.1.42"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [ dependencies = [
"libc 0.2.68 (registry+https://github.com/rust-lang/crates.io-index)", "libc 0.2.69 (registry+https://github.com/rust-lang/crates.io-index)",
"redox_syscall 0.1.56 (registry+https://github.com/rust-lang/crates.io-index)", "redox_syscall 0.1.56 (registry+https://github.com/rust-lang/crates.io-index)",
"winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
] ]
@ -1205,15 +1174,14 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
[[package]] [[package]]
name = "tui" name = "tui"
version = "0.8.0" version = "0.9.1"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [ dependencies = [
"bitflags 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)", "bitflags 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
"cassowary 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", "cassowary 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
"crossterm 0.14.2 (registry+https://github.com/rust-lang/crates.io-index)", "crossterm 0.17.3 (registry+https://github.com/rust-lang/crates.io-index)",
"either 1.5.3 (registry+https://github.com/rust-lang/crates.io-index)", "either 1.5.3 (registry+https://github.com/rust-lang/crates.io-index)",
"itertools 0.8.2 (registry+https://github.com/rust-lang/crates.io-index)", "itertools 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)",
"log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",
"unicode-segmentation 1.6.0 (registry+https://github.com/rust-lang/crates.io-index)", "unicode-segmentation 1.6.0 (registry+https://github.com/rust-lang/crates.io-index)",
"unicode-width 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)", "unicode-width 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)",
] ]
@ -1230,7 +1198,7 @@ dependencies = [
[[package]] [[package]]
name = "typenum" name = "typenum"
version = "1.11.2" version = "1.12.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
[[package]] [[package]]
@ -1254,7 +1222,7 @@ version = "0.26.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [ dependencies = [
"num-traits 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)", "num-traits 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)",
"typenum 1.11.2 (registry+https://github.com/rust-lang/crates.io-index)", "typenum 1.12.0 (registry+https://github.com/rust-lang/crates.io-index)",
] ]
[[package]] [[package]]
@ -1264,7 +1232,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [ dependencies = [
"num-rational 0.2.4 (registry+https://github.com/rust-lang/crates.io-index)", "num-rational 0.2.4 (registry+https://github.com/rust-lang/crates.io-index)",
"num-traits 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)", "num-traits 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)",
"typenum 1.11.2 (registry+https://github.com/rust-lang/crates.io-index)", "typenum 1.12.0 (registry+https://github.com/rust-lang/crates.io-index)",
] ]
[[package]] [[package]]
@ -1282,7 +1250,7 @@ name = "wait-timeout"
version = "0.2.0" version = "0.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [ dependencies = [
"libc 0.2.68 (registry+https://github.com/rust-lang/crates.io-index)", "libc 0.2.69 (registry+https://github.com/rust-lang/crates.io-index)",
] ]
[[package]] [[package]]
@ -1363,9 +1331,7 @@ dependencies = [
"checksum crossbeam-epoch 0.8.2 (registry+https://github.com/rust-lang/crates.io-index)" = "058ed274caafc1f60c4997b5fc07bf7dc7cca454af7c6e81edffe5f33f70dace" "checksum crossbeam-epoch 0.8.2 (registry+https://github.com/rust-lang/crates.io-index)" = "058ed274caafc1f60c4997b5fc07bf7dc7cca454af7c6e81edffe5f33f70dace"
"checksum crossbeam-queue 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "c695eeca1e7173472a32221542ae469b3e9aac3a4fc81f7696bcad82029493db" "checksum crossbeam-queue 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "c695eeca1e7173472a32221542ae469b3e9aac3a4fc81f7696bcad82029493db"
"checksum crossbeam-utils 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)" = "c3c7c73a2d1e9fc0886a08b93e98eb643461230d5f1925e4036204d5f2e261a8" "checksum crossbeam-utils 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)" = "c3c7c73a2d1e9fc0886a08b93e98eb643461230d5f1925e4036204d5f2e261a8"
"checksum crossterm 0.14.2 (registry+https://github.com/rust-lang/crates.io-index)" = "5750773d74a7dc612eac2ded3f55e9cdeeaa072210cd17c0192aedb48adb3618"
"checksum crossterm 0.17.3 (registry+https://github.com/rust-lang/crates.io-index)" = "ccdd8ef63a44e821956c6a276eca0faaa889d6a067dfcdbd5bfe85dce3a1d250" "checksum crossterm 0.17.3 (registry+https://github.com/rust-lang/crates.io-index)" = "ccdd8ef63a44e821956c6a276eca0faaa889d6a067dfcdbd5bfe85dce3a1d250"
"checksum crossterm_winapi 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)" = "8777c700901e2d5b50c406f736ed6b8f9e43645c7e104ddb74f8bc42b8ae62f6"
"checksum crossterm_winapi 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)" = "057b7146d02fb50175fd7dbe5158f6097f33d02831f43b4ee8ae4ddf67b68f5c" "checksum crossterm_winapi 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)" = "057b7146d02fb50175fd7dbe5158f6097f33d02831f43b4ee8ae4ddf67b68f5c"
"checksum darwin-libproc 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "9fb90051930c9a0f09e585762152048e23ac74d20c10590ef7cf01c0343c3046" "checksum darwin-libproc 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "9fb90051930c9a0f09e585762152048e23ac74d20c10590ef7cf01c0343c3046"
"checksum darwin-libproc-sys 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "57cebb5bde66eecdd30ddc4b9cd208238b15db4982ccc72db59d699ea10867c1" "checksum darwin-libproc-sys 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "57cebb5bde66eecdd30ddc4b9cd208238b15db4982ccc72db59d699ea10867c1"
@ -1399,15 +1365,14 @@ dependencies = [
"checksum heim-runtime 0.0.6 (registry+https://github.com/rust-lang/crates.io-index)" = "00bd0a5a5e4af50d5d7d9537d3ecf02dca42c26bbbd8dd76621c5116dab14f69" "checksum heim-runtime 0.0.6 (registry+https://github.com/rust-lang/crates.io-index)" = "00bd0a5a5e4af50d5d7d9537d3ecf02dca42c26bbbd8dd76621c5116dab14f69"
"checksum heim-sensors 0.0.5 (registry+https://github.com/rust-lang/crates.io-index)" = "2f1250df4d79d4238261588e5aaf1de0e7853dbe632f5bd6868e394d1e730024" "checksum heim-sensors 0.0.5 (registry+https://github.com/rust-lang/crates.io-index)" = "2f1250df4d79d4238261588e5aaf1de0e7853dbe632f5bd6868e394d1e730024"
"checksum heim-virt 0.0.10 (registry+https://github.com/rust-lang/crates.io-index)" = "e4b6ac6721ba5856659a197934ce522250a3ddd2e8646daa5660b41f1ba96457" "checksum heim-virt 0.0.10 (registry+https://github.com/rust-lang/crates.io-index)" = "e4b6ac6721ba5856659a197934ce522250a3ddd2e8646daa5660b41f1ba96457"
"checksum hermit-abi 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)" = "725cf19794cf90aa94e65050cb4191ff5d8fa87a498383774c47b332e3af952e" "checksum hermit-abi 0.1.11 (registry+https://github.com/rust-lang/crates.io-index)" = "8a0d737e0f947a1864e93d33fdef4af8445a00d1ed8dc0c8ddb73139ea6abf15"
"checksum hex 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "023b39be39e3a2da62a94feb433e91e8bcd37676fbc8bea371daf52b7a769a3e" "checksum hex 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "023b39be39e3a2da62a94feb433e91e8bcd37676fbc8bea371daf52b7a769a3e"
"checksum iovec 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)" = "b2b3ea6ff95e175473f8ffe6a7eb7c00d054240321b84c57051175fe3c1e075e" "checksum iovec 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)" = "b2b3ea6ff95e175473f8ffe6a7eb7c00d054240321b84c57051175fe3c1e075e"
"checksum itertools 0.8.2 (registry+https://github.com/rust-lang/crates.io-index)" = "f56a2d0bc861f9165be4eb3442afd3c236d8a98afd426f65d92324ae1091a484"
"checksum itertools 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)" = "284f18f85651fe11e8a991b2adb42cb078325c996ed026d994719efcfca1d54b" "checksum itertools 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)" = "284f18f85651fe11e8a991b2adb42cb078325c996ed026d994719efcfca1d54b"
"checksum kernel32-sys 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "7507624b29483431c0ba2d82aece8ca6cdba9382bff4ddd0f7490560c056098d" "checksum kernel32-sys 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "7507624b29483431c0ba2d82aece8ca6cdba9382bff4ddd0f7490560c056098d"
"checksum lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" "checksum lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646"
"checksum lazycell 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "b294d6fa9ee409a054354afc4352b0b9ef7ca222c69b8812cbea9e7d2bf3783f" "checksum lazycell 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "b294d6fa9ee409a054354afc4352b0b9ef7ca222c69b8812cbea9e7d2bf3783f"
"checksum libc 0.2.68 (registry+https://github.com/rust-lang/crates.io-index)" = "dea0c0405123bba743ee3f91f49b1c7cfb684eef0da0a50110f758ccf24cdff0" "checksum libc 0.2.69 (registry+https://github.com/rust-lang/crates.io-index)" = "99e85c08494b21a9054e7fe1374a732aeadaff3980b6990b94bfd3a70f690005"
"checksum lock_api 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)" = "c4da24a77a3d8a6d4862d95f72e6fdb9c09a643ecdb402d754004a557f2bec75" "checksum lock_api 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)" = "c4da24a77a3d8a6d4862d95f72e6fdb9c09a643ecdb402d754004a557f2bec75"
"checksum log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)" = "14b6052be84e6b71ab17edffc2eeabf5c2c3ae1fdb464aae35ac50c67a44e1f7" "checksum log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)" = "14b6052be84e6b71ab17edffc2eeabf5c2c3ae1fdb464aae35ac50c67a44e1f7"
"checksum macaddr 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)" = "baee0bbc17ce759db233beb01648088061bf678383130602a298e6998eedb2d8" "checksum macaddr 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)" = "baee0bbc17ce759db233beb01648088061bf678383130602a298e6998eedb2d8"
@ -1426,7 +1391,7 @@ dependencies = [
"checksum num-integer 0.1.42 (registry+https://github.com/rust-lang/crates.io-index)" = "3f6ea62e9d81a77cd3ee9a2a5b9b609447857f3d358704331e4ef39eb247fcba" "checksum num-integer 0.1.42 (registry+https://github.com/rust-lang/crates.io-index)" = "3f6ea62e9d81a77cd3ee9a2a5b9b609447857f3d358704331e4ef39eb247fcba"
"checksum num-rational 0.2.4 (registry+https://github.com/rust-lang/crates.io-index)" = "5c000134b5dbf44adc5cb772486d335293351644b801551abe8f75c84cfa4aef" "checksum num-rational 0.2.4 (registry+https://github.com/rust-lang/crates.io-index)" = "5c000134b5dbf44adc5cb772486d335293351644b801551abe8f75c84cfa4aef"
"checksum num-traits 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)" = "c62be47e61d1842b9170f0fdeec8eba98e60e90e5446449a0545e5152acd7096" "checksum num-traits 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)" = "c62be47e61d1842b9170f0fdeec8eba98e60e90e5446449a0545e5152acd7096"
"checksum num_cpus 1.12.0 (registry+https://github.com/rust-lang/crates.io-index)" = "46203554f085ff89c235cd12f7075f3233af9b11ed7c9e16dfe2560d03313ce6" "checksum num_cpus 1.13.0 (registry+https://github.com/rust-lang/crates.io-index)" = "05499f3756671c15885fee9034446956fff3f243d6077b91e5767df161f766b3"
"checksum once_cell 1.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "b1c601810575c99596d4afc46f78a678c80105117c379eb3650cf99b8a21ce5b" "checksum once_cell 1.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "b1c601810575c99596d4afc46f78a678c80105117c379eb3650cf99b8a21ce5b"
"checksum ordered-float 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)" = "18869315e81473c951eb56ad5558bbc56978562d3ecfb87abb7a1e944cea4518" "checksum ordered-float 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)" = "18869315e81473c951eb56ad5558bbc56978562d3ecfb87abb7a1e944cea4518"
"checksum parking_lot 0.10.2 (registry+https://github.com/rust-lang/crates.io-index)" = "d3a704eb390aafdc107b0e392f56a82b668e3a71366993b5340f5833fd62505e" "checksum parking_lot 0.10.2 (registry+https://github.com/rust-lang/crates.io-index)" = "d3a704eb390aafdc107b0e392f56a82b668e3a71366993b5340f5833fd62505e"
@ -1445,7 +1410,7 @@ dependencies = [
"checksum rayon-core 1.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "08a89b46efaf957e52b18062fb2f4660f8b8a4dde1807ca002690868ef2c85a9" "checksum rayon-core 1.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "08a89b46efaf957e52b18062fb2f4660f8b8a4dde1807ca002690868ef2c85a9"
"checksum redox_syscall 0.1.56 (registry+https://github.com/rust-lang/crates.io-index)" = "2439c63f3f6139d1b57529d16bc3b8bb855230c8efcc5d3a896c8bea7c3b1e84" "checksum redox_syscall 0.1.56 (registry+https://github.com/rust-lang/crates.io-index)" = "2439c63f3f6139d1b57529d16bc3b8bb855230c8efcc5d3a896c8bea7c3b1e84"
"checksum redox_users 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)" = "09b23093265f8d200fa7b4c2c76297f47e681c655f6f1285a8780d6a022f7431" "checksum redox_users 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)" = "09b23093265f8d200fa7b4c2c76297f47e681c655f6f1285a8780d6a022f7431"
"checksum regex 1.3.6 (registry+https://github.com/rust-lang/crates.io-index)" = "7f6946991529684867e47d86474e3a6d0c0ab9b82d5821e314b1ede31fa3a4b3" "checksum regex 1.3.7 (registry+https://github.com/rust-lang/crates.io-index)" = "a6020f034922e3194c711b82a627453881bc4682166cabb07134a10c26ba7692"
"checksum regex-syntax 0.6.17 (registry+https://github.com/rust-lang/crates.io-index)" = "7fe5bd57d1d7414c6b5ed48563a2c855d995ff777729dcd91c369ec7fea395ae" "checksum regex-syntax 0.6.17 (registry+https://github.com/rust-lang/crates.io-index)" = "7fe5bd57d1d7414c6b5ed48563a2c855d995ff777729dcd91c369ec7fea395ae"
"checksum rust-argon2 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "2bc8af4bda8e1ff4932523b94d3dd20ee30a87232323eda55903ffd71d2fb017" "checksum rust-argon2 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "2bc8af4bda8e1ff4932523b94d3dd20ee30a87232323eda55903ffd71d2fb017"
"checksum rustc-demangle 0.1.16 (registry+https://github.com/rust-lang/crates.io-index)" = "4c691c0e608126e00913e33f0ccf3727d5fc84573623b8d65b2df340b5201783" "checksum rustc-demangle 0.1.16 (registry+https://github.com/rust-lang/crates.io-index)" = "4c691c0e608126e00913e33f0ccf3727d5fc84573623b8d65b2df340b5201783"
@ -1461,16 +1426,16 @@ dependencies = [
"checksum smallvec 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "05720e22615919e4734f6a99ceae50d00226c3c5aca406e102ebc33298214e0a" "checksum smallvec 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "05720e22615919e4734f6a99ceae50d00226c3c5aca406e102ebc33298214e0a"
"checksum strsim 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)" = "8ea5119cdb4c55b55d432abb513a0429384878c15dde60cc77b1c99de1a95a6a" "checksum strsim 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)" = "8ea5119cdb4c55b55d432abb513a0429384878c15dde60cc77b1c99de1a95a6a"
"checksum syn 1.0.17 (registry+https://github.com/rust-lang/crates.io-index)" = "0df0eb663f387145cab623dea85b09c2c5b4b0aef44e945d928e682fce71bb03" "checksum syn 1.0.17 (registry+https://github.com/rust-lang/crates.io-index)" = "0df0eb663f387145cab623dea85b09c2c5b4b0aef44e945d928e682fce71bb03"
"checksum sysinfo 0.13.1 (registry+https://github.com/rust-lang/crates.io-index)" = "8edb5068ab4f00d7f7e78cae194235a4f45671fb5a19b344731b9ab5478e0a6f" "checksum sysinfo 0.14.1 (registry+https://github.com/rust-lang/crates.io-index)" = "d070254b7172eee9eb3990bea8f72aeabfe1226c40bf71a52e4fe75777812e9a"
"checksum textwrap 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)" = "d326610f408c7a4eb6f51c37c330e496b08506c9457c9d34287ecc38809fb060" "checksum textwrap 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)" = "d326610f408c7a4eb6f51c37c330e496b08506c9457c9d34287ecc38809fb060"
"checksum thread_local 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)" = "d40c6d1b69745a6ec6fb1ca717914848da4b44ae29d9b3080cbee91d72a69b14" "checksum thread_local 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)" = "d40c6d1b69745a6ec6fb1ca717914848da4b44ae29d9b3080cbee91d72a69b14"
"checksum threadpool 1.7.1 (registry+https://github.com/rust-lang/crates.io-index)" = "e2f0c90a5f3459330ac8bc0d2f879c693bb7a2f59689c1083fc4ef83834da865" "checksum threadpool 1.7.1 (registry+https://github.com/rust-lang/crates.io-index)" = "e2f0c90a5f3459330ac8bc0d2f879c693bb7a2f59689c1083fc4ef83834da865"
"checksum time 0.1.42 (registry+https://github.com/rust-lang/crates.io-index)" = "db8dcfca086c1143c9270ac42a2bbd8a7ee477b78ac8e45b19abfb0cbede4b6f" "checksum time 0.1.42 (registry+https://github.com/rust-lang/crates.io-index)" = "db8dcfca086c1143c9270ac42a2bbd8a7ee477b78ac8e45b19abfb0cbede4b6f"
"checksum toml 0.5.6 (registry+https://github.com/rust-lang/crates.io-index)" = "ffc92d160b1eef40665be3a05630d003936a3bc7da7421277846c2613e92c71a" "checksum toml 0.5.6 (registry+https://github.com/rust-lang/crates.io-index)" = "ffc92d160b1eef40665be3a05630d003936a3bc7da7421277846c2613e92c71a"
"checksum treeline 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "a7f741b240f1a48843f9b8e0444fb55fb2a4ff67293b50a9179dfd5ea67f8d41" "checksum treeline 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "a7f741b240f1a48843f9b8e0444fb55fb2a4ff67293b50a9179dfd5ea67f8d41"
"checksum tui 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)" = "6b871b61f4c4b81e630215cd12e0ec29953d4545898e21a9e023b7520a74a9f9" "checksum tui 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)" = "b7de74b91c6cb83119a2140e7c215d95d9e54db27b58a500a2cbdeec4987b0a2"
"checksum typed-builder 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)" = "78cea224ddd4282dfc40d1edabbd0c020a12e946e3a48e2c2b8f6ff167ad29fe" "checksum typed-builder 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)" = "78cea224ddd4282dfc40d1edabbd0c020a12e946e3a48e2c2b8f6ff167ad29fe"
"checksum typenum 1.11.2 (registry+https://github.com/rust-lang/crates.io-index)" = "6d2783fe2d6b8c1101136184eb41be8b1ad379e4657050b8aaff0c79ee7575f9" "checksum typenum 1.12.0 (registry+https://github.com/rust-lang/crates.io-index)" = "373c8a200f9e67a0c95e62a4f52fbf80c23b4381c05a17845531982fa99e6b33"
"checksum unicode-segmentation 1.6.0 (registry+https://github.com/rust-lang/crates.io-index)" = "e83e153d1053cbb5a118eeff7fd5be06ed99153f00dbcd8ae310c5fb2b22edc0" "checksum unicode-segmentation 1.6.0 (registry+https://github.com/rust-lang/crates.io-index)" = "e83e153d1053cbb5a118eeff7fd5be06ed99153f00dbcd8ae310c5fb2b22edc0"
"checksum unicode-width 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)" = "caaa9d531767d1ff2150b9332433f32a24622147e5ebb1f26409d5da67afd479" "checksum unicode-width 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)" = "caaa9d531767d1ff2150b9332433f32a24622147e5ebb1f26409d5da67afd479"
"checksum unicode-xid 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "826e7639553986605ec5979c7dd957c7895e93eabed50ab2ffa7f6128a75097c" "checksum unicode-xid 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "826e7639553986605ec5979c7dd957c7895e93eabed50ab2ffa7f6128a75097c"

4
Cargo.toml
View File

@ -33,9 +33,9 @@ heim = "0.0.10"
itertools = "0.9.0" itertools = "0.9.0"
log = "0.4.8" log = "0.4.8"
regex = "1.3" regex = "1.3"
sysinfo = "0.13" sysinfo = "0.14"
toml = "0.5.6" toml = "0.5.6"
tui = {version = "0.8", features = ["crossterm"], default-features = false } tui = {version = "0.9", features = ["crossterm"], default-features = false }
typed-builder = "0.5.1" typed-builder = "0.5.1"
lazy_static = "1.4.0" lazy_static = "1.4.0"
backtrace = "0.3" backtrace = "0.3"

58
src/canvas/dialogs/dd_dialog.rs
View File

@ -4,7 +4,7 @@ use tui::{
backend::Backend, backend::Backend,
layout::{Alignment, Rect}, layout::{Alignment, Rect},
terminal::Frame, terminal::Frame,
widgets::{Block, Borders, Paragraph, Text, Widget}, widgets::{Block, Borders, Paragraph, Text},
}; };
use crate::{app::App, canvas::Painter}; use crate::{app::App, canvas::Painter};
@ -70,19 +70,21 @@ impl KillDialog for Painter {
"─".repeat(repeat_num as usize) "─".repeat(repeat_num as usize)
); );
Paragraph::new(dd_text.iter()) f.render_widget(
.block( Paragraph::new(dd_text.iter())
Block::default() .block(
.title(&dd_title) Block::default()
.title_style(self.colours.border_style) .title(&dd_title)
.style(self.colours.border_style) .title_style(self.colours.border_style)
.borders(Borders::ALL) .style(self.colours.border_style)
.border_style(self.colours.border_style), .borders(Borders::ALL)
) .border_style(self.colours.border_style),
.style(self.colours.text_style) )
.alignment(Alignment::Center) .style(self.colours.text_style)
.wrap(true) .alignment(Alignment::Center)
.render(f, draw_loc); .wrap(true),
draw_loc,
);
return true; return true;
} }
@ -106,18 +108,20 @@ impl KillDialog for Painter {
); );
let error_title = format!(" Error ─{}─ Esc to close ", "─".repeat(repeat_num as usize)); let error_title = format!(" Error ─{}─ Esc to close ", "─".repeat(repeat_num as usize));
Paragraph::new(dd_text.iter()) f.render_widget(
.block( Paragraph::new(dd_text.iter())
Block::default() .block(
.title(&error_title) Block::default()
.title_style(self.colours.border_style) .title(&error_title)
.style(self.colours.border_style) .title_style(self.colours.border_style)
.borders(Borders::ALL) .style(self.colours.border_style)
.border_style(self.colours.border_style), .borders(Borders::ALL)
) .border_style(self.colours.border_style),
.style(self.colours.text_style) )
.alignment(Alignment::Center) .style(self.colours.text_style)
.wrap(true) .alignment(Alignment::Center)
.render(f, draw_loc); .wrap(true),
draw_loc,
);
} }
} }

44
src/canvas/dialogs/help_dialog.rs
View File

@ -4,7 +4,7 @@ use tui::{
backend::Backend, backend::Backend,
layout::{Alignment, Rect}, layout::{Alignment, Rect},
terminal::Frame, terminal::Frame,
widgets::{Block, Borders, Paragraph, Widget}, widgets::{Block, Borders, Paragraph},
}; };
use crate::{ use crate::{
@ -33,25 +33,27 @@ impl HelpDialog for Painter {
"─".repeat(repeat_num as usize) "─".repeat(repeat_num as usize)
); );
Paragraph::new( f.render_widget(
match app_state.help_dialog_state.current_category { Paragraph::new(
AppHelpCategory::General => &self.styled_general_help_text, match app_state.help_dialog_state.current_category {
AppHelpCategory::Process => &self.styled_process_help_text, AppHelpCategory::General => &self.styled_general_help_text,
AppHelpCategory::Search => &self.styled_search_help_text, AppHelpCategory::Process => &self.styled_process_help_text,
} AppHelpCategory::Search => &self.styled_search_help_text,
.iter(), }
) .iter(),
.block( )
Block::default() .block(
.title(&help_title) Block::default()
.title_style(self.colours.border_style) .title(&help_title)
.style(self.colours.border_style) .title_style(self.colours.border_style)
.borders(Borders::ALL) .style(self.colours.border_style)
.border_style(self.colours.border_style), .borders(Borders::ALL)
) .border_style(self.colours.border_style),
.style(self.colours.text_style) )
.alignment(Alignment::Left) .style(self.colours.text_style)
.wrap(true) .alignment(Alignment::Left)
.render(f, draw_loc); .wrap(true),
draw_loc,
);
} }
} }

9
src/canvas/widgets/basic_table_arrows.rs
View File

@ -9,7 +9,7 @@ use tui::{
backend::Backend, backend::Backend,
layout::{Constraint, Layout, Rect}, layout::{Constraint, Layout, Rect},
terminal::Frame, terminal::Frame,
widgets::{Block, Paragraph, Text, Widget}, widgets::{Block, Paragraph, Text},
}; };
pub trait BasicTableArrows { pub trait BasicTableArrows {
@ -59,8 +59,9 @@ impl BasicTableArrows for Painter {
.horizontal_margin(1) .horizontal_margin(1)
.split(draw_loc); .split(draw_loc);
Paragraph::new(arrow_text.iter()) f.render_widget(
.block(Block::default()) Paragraph::new(arrow_text.iter()).block(Block::default()),
.render(f, margined_draw_loc[0]); margined_draw_loc[0],
);
} }
} }

68
src/canvas/widgets/battery_display.rs
View File

@ -9,7 +9,7 @@ use tui::{
backend::Backend, backend::Backend,
layout::{Constraint, Rect}, layout::{Constraint, Rect},
terminal::Frame, terminal::Frame,
widgets::{Block, Borders, Paragraph, Row, Table, Tabs, Text, Widget}, widgets::{Block, Borders, Paragraph, Row, Table, Tabs, Text},
}; };
pub trait BatteryDisplayWidget { pub trait BatteryDisplayWidget {
@ -106,39 +106,45 @@ impl BatteryDisplayWidget for Painter {
}); });
// Draw // Draw
Table::new([""].iter(), battery_rows) f.render_widget(
.block(battery_block) Table::new([""].iter(), battery_rows)
.header_style(self.colours.table_header_style) .block(battery_block)
.widths([Constraint::Percentage(50), Constraint::Percentage(50)].as_ref()) .header_style(self.colours.table_header_style)
.render(f, draw_loc); .widths([Constraint::Percentage(50), Constraint::Percentage(50)].as_ref()),
draw_loc,
);
} else { } else {
Paragraph::new( f.render_widget(
[Text::Styled( Paragraph::new(
"No data found for this battery".into(), [Text::Styled(
self.colours.text_style, "No data found for this battery".into(),
)] self.colours.text_style,
.iter(), )]
) .iter(),
.block(battery_block) )
.render(f, draw_loc); .block(battery_block),
draw_loc,
);
} }
// if app_state.canvas_data.battery_data.len() > 1 { // if app_state.canvas_data.battery_data.len() > 1 {
Tabs::default() f.render_widget(
.block(battery_block) Tabs::default()
.titles( .block(battery_block)
(app_state .titles(
.canvas_data (app_state
.battery_data .canvas_data
.iter() .battery_data
.map(|battery| &battery.battery_name)) .iter()
.collect::<Vec<_>>() .map(|battery| &battery.battery_name))
.as_ref(), .collect::<Vec<_>>()
) .as_ref(),
.divider(tui::symbols::line::VERTICAL) )
.style(self.colours.text_style) .divider(tui::symbols::line::VERTICAL)
.highlight_style(self.colours.currently_selected_text_style) .style(self.colours.text_style)
.select(battery_widget_state.currently_selected_battery_index) .highlight_style(self.colours.currently_selected_text_style)
.render(f, draw_loc); .select(battery_widget_state.currently_selected_battery_index),
draw_loc,
);
// } // }
} }
} }

19
src/canvas/widgets/cpu_basic.rs
View File

@ -11,7 +11,7 @@ use tui::{
backend::Backend, backend::Backend,
layout::{Constraint, Direction, Layout, Rect}, layout::{Constraint, Direction, Layout, Rect},
terminal::Frame, terminal::Frame,
widgets::{Block, Paragraph, Text, Widget}, widgets::{Block, Paragraph, Text},
}; };
pub trait CpuBasicWidget { pub trait CpuBasicWidget {
@ -37,10 +37,12 @@ impl CpuBasicWidget for Painter {
// the desired lengths. // the desired lengths.
if app_state.current_widget.widget_id == widget_id { if app_state.current_widget.widget_id == widget_id {
Block::default() f.render_widget(
.borders(*SIDE_BORDERS) Block::default()
.border_style(self.colours.highlighted_border_style) .borders(*SIDE_BORDERS)
.render(f, draw_loc); .border_style(self.colours.highlighted_border_style),
draw_loc,
);
} }
let num_cpus = cpu_data.len(); let num_cpus = cpu_data.len();
@ -125,9 +127,10 @@ impl CpuBasicWidget for Painter {
.horizontal_margin(1) .horizontal_margin(1)
.split(*chunk); .split(*chunk);
Paragraph::new(cpu_column.iter()) f.render_widget(
.block(Block::default()) Paragraph::new(cpu_column.iter()).block(Block::default()),
.render(f, margined_loc[0]); margined_loc[0],
);
} }
} }
} }

87
src/canvas/widgets/cpu_graph.rs
View File

@ -15,8 +15,9 @@ use crate::{
use tui::{ use tui::{
backend::Backend, backend::Backend,
layout::{Constraint, Direction, Layout, Rect}, layout::{Constraint, Direction, Layout, Rect},
symbols::Marker,
terminal::Frame, terminal::Frame,
widgets::{Axis, Block, Borders, Chart, Dataset, Marker, Row, Table, Widget}, widgets::{Axis, Block, Borders, Chart, Dataset, Row, Table},
}; };
const CPU_SELECT_LEGEND_HEADER: [&str; 2] = ["CPU", "Show"]; const CPU_SELECT_LEGEND_HEADER: [&str; 2] = ["CPU", "Show"];
@ -187,22 +188,24 @@ impl CpuGraphWidget for Painter {
self.colours.border_style self.colours.border_style
}; };
Chart::default() f.render_widget(
.block( Chart::default()
Block::default() .block(
.title(&title) Block::default()
.title_style(if app_state.is_expanded { .title(&title)
border_style .title_style(if app_state.is_expanded {
} else { border_style
self.colours.widget_title_style } else {
}) self.colours.widget_title_style
.borders(Borders::ALL) })
.border_style(border_style), .borders(Borders::ALL)
) .border_style(border_style),
.x_axis(x_axis) )
.y_axis(y_axis) .x_axis(x_axis)
.datasets(&dataset_vector) .y_axis(y_axis)
.render(f, draw_loc); .datasets(&dataset_vector),
draw_loc,
);
} }
} }
@ -319,30 +322,32 @@ impl CpuGraphWidget for Painter {
}; };
// Draw // Draw
Table::new( f.render_widget(
if cpu_widget_state.is_showing_tray { Table::new(
CPU_SELECT_LEGEND_HEADER if cpu_widget_state.is_showing_tray {
} else { CPU_SELECT_LEGEND_HEADER
CPU_LEGEND_HEADER } else {
} CPU_LEGEND_HEADER
.iter(), }
cpu_rows, .iter(),
) cpu_rows,
.block( )
Block::default() .block(
.title(&title) Block::default()
.title_style(title_and_border_style) .title(&title)
.borders(Borders::ALL) .title_style(title_and_border_style)
.border_style(title_and_border_style), .borders(Borders::ALL)
) .border_style(title_and_border_style),
.header_style(self.colours.table_header_style) )
.widths( .header_style(self.colours.table_header_style)
&(intrinsic_widths .widths(
.iter() &(intrinsic_widths
.map(|calculated_width| Constraint::Length(*calculated_width as u16)) .iter()
.collect::<Vec<_>>()), .map(|calculated_width| Constraint::Length(*calculated_width as u16))
) .collect::<Vec<_>>()),
.render(f, draw_loc); ),
draw_loc,
);
} }
} }
} }

24
src/canvas/widgets/disk_table.rs
View File

@ -4,7 +4,7 @@ use tui::{
backend::Backend, backend::Backend,
layout::{Constraint, Direction, Layout, Rect}, layout::{Constraint, Direction, Layout, Rect},
terminal::Frame, terminal::Frame,
widgets::{Block, Borders, Row, Table, Widget}, widgets::{Block, Borders, Row, Table},
}; };
use crate::{ use crate::{
@ -138,16 +138,18 @@ impl DiskTableWidget for Painter {
.split(draw_loc); .split(draw_loc);
// Draw! // Draw!
Table::new(DISK_HEADERS.iter(), disk_rows) f.render_widget(
.block(disk_block) Table::new(DISK_HEADERS.iter(), disk_rows)
.header_style(self.colours.table_header_style) .block(disk_block)
.widths( .header_style(self.colours.table_header_style)
&(intrinsic_widths .widths(
.iter() &(intrinsic_widths
.map(|calculated_width| Constraint::Length(*calculated_width as u16)) .iter()
.collect::<Vec<_>>()), .map(|calculated_width| Constraint::Length(*calculated_width as u16))
) .collect::<Vec<_>>()),
.render(f, margined_draw_loc[0]); ),
margined_draw_loc[0],
);
} }
} }
} }

19
src/canvas/widgets/mem_basic.rs
View File

@ -10,7 +10,7 @@ use tui::{
backend::Backend, backend::Backend,
layout::{Constraint, Layout, Rect}, layout::{Constraint, Layout, Rect},
terminal::Frame, terminal::Frame,
widgets::{Block, Paragraph, Text, Widget}, widgets::{Block, Paragraph, Text},
}; };
pub trait MemBasicWidget { pub trait MemBasicWidget {
@ -32,10 +32,12 @@ impl MemBasicWidget for Painter {
.split(draw_loc); .split(draw_loc);
if app_state.current_widget.widget_id == widget_id { if app_state.current_widget.widget_id == widget_id {
Block::default() f.render_widget(
.borders(*SIDE_BORDERS) Block::default()
.border_style(self.colours.highlighted_border_style) .borders(*SIDE_BORDERS)
.render(f, draw_loc); .border_style(self.colours.highlighted_border_style),
draw_loc,
);
} }
// +9 due to 3 + 4 + 2 + 2 columns for the name & space + percentage + bar bounds + margin spacing // +9 due to 3 + 4 + 2 + 2 columns for the name & space + percentage + bar bounds + margin spacing
@ -70,8 +72,9 @@ impl MemBasicWidget for Painter {
Text::Styled(swap_label.into(), self.colours.swap_style), Text::Styled(swap_label.into(), self.colours.swap_style),
]; ];
Paragraph::new(mem_text.iter()) f.render_widget(
.block(Block::default()) Paragraph::new(mem_text.iter()).block(Block::default()),
.render(f, margined_loc[0]); margined_loc[0],
);
} }
} }

45
src/canvas/widgets/mem_graph.rs
View File

@ -5,8 +5,9 @@ use crate::{app::App, canvas::Painter, constants::*};
use tui::{ use tui::{
backend::Backend, backend::Backend,
layout::Rect, layout::Rect,
symbols::Marker,
terminal::Frame, terminal::Frame,
widgets::{Axis, Block, Borders, Chart, Dataset, Marker, Widget}, widgets::{Axis, Block, Borders, Chart, Dataset},
}; };
pub trait MemGraphWidget { pub trait MemGraphWidget {
@ -97,26 +98,28 @@ impl MemGraphWidget for Painter {
" Memory ".to_string() " Memory ".to_string()
}; };
Chart::default() f.render_widget(
.block( Chart::default()
Block::default() .block(
.title(&title) Block::default()
.title_style(if app_state.is_expanded { .title(&title)
self.colours.highlighted_border_style .title_style(if app_state.is_expanded {
} else { self.colours.highlighted_border_style
self.colours.widget_title_style } else {
}) self.colours.widget_title_style
.borders(Borders::ALL) })
.border_style(if app_state.current_widget.widget_id == widget_id { .borders(Borders::ALL)
self.colours.highlighted_border_style .border_style(if app_state.current_widget.widget_id == widget_id {
} else { self.colours.highlighted_border_style
self.colours.border_style } else {
}), self.colours.border_style
) }),
.x_axis(x_axis) )
.y_axis(y_axis) .x_axis(x_axis)
.datasets(&mem_canvas_vec) .y_axis(y_axis)
.render(f, draw_loc); .datasets(&mem_canvas_vec),
draw_loc,
);
} }
} }
} }

26
src/canvas/widgets/network_basic.rs
View File

@ -4,7 +4,7 @@ use tui::{
backend::Backend, backend::Backend,
layout::{Constraint, Direction, Layout, Rect}, layout::{Constraint, Direction, Layout, Rect},
terminal::Frame, terminal::Frame,
widgets::{Block, Paragraph, Text, Widget}, widgets::{Block, Paragraph, Text},
}; };
pub trait NetworkBasicWidget { pub trait NetworkBasicWidget {
@ -35,10 +35,12 @@ impl NetworkBasicWidget for Painter {
.split(divided_loc[1]); .split(divided_loc[1]);
if app_state.current_widget.widget_id == widget_id { if app_state.current_widget.widget_id == widget_id {
Block::default() f.render_widget(
.borders(*SIDE_BORDERS) Block::default()
.border_style(self.colours.highlighted_border_style) .borders(*SIDE_BORDERS)
.render(f, draw_loc); .border_style(self.colours.highlighted_border_style),
draw_loc,
);
} }
let rx_label = format!("RX: {}\n", &app_state.canvas_data.rx_display); let rx_label = format!("RX: {}\n", &app_state.canvas_data.rx_display);
@ -56,12 +58,14 @@ impl NetworkBasicWidget for Painter {
Text::Styled(total_tx_label.into(), self.colours.total_tx_style), Text::Styled(total_tx_label.into(), self.colours.total_tx_style),
]; ];
Paragraph::new(net_text.iter()) f.render_widget(
.block(Block::default()) Paragraph::new(net_text.iter()).block(Block::default()),
.render(f, net_loc[0]); net_loc[0],
);
Paragraph::new(total_net_text.iter()) f.render_widget(
.block(Block::default()) Paragraph::new(total_net_text.iter()).block(Block::default()),
.render(f, total_loc[0]); total_loc[0],
);
} }
} }

143
src/canvas/widgets/network_graph.rs
View File

@ -10,8 +10,9 @@ use crate::{
use tui::{ use tui::{
backend::Backend, backend::Backend,
layout::{Constraint, Direction, Layout, Rect}, layout::{Constraint, Direction, Layout, Rect},
symbols::Marker,
terminal::Frame, terminal::Frame,
widgets::{Axis, Block, Borders, Chart, Dataset, Marker, Row, Table, Widget}, widgets::{Axis, Block, Borders, Chart, Dataset, Row, Table},
}; };
const NETWORK_HEADERS: [&str; 4] = ["RX", "TX", "Total RX", "Total TX"]; const NETWORK_HEADERS: [&str; 4] = ["RX", "TX", "Total RX", "Total TX"];
@ -118,57 +119,59 @@ impl NetworkGraphWidget for Painter {
" Network ".to_string() " Network ".to_string()
}; };
Chart::default() f.render_widget(
.block( Chart::default()
Block::default() .block(
.title(&title) Block::default()
.title_style(if app_state.is_expanded { .title(&title)
self.colours.highlighted_border_style .title_style(if app_state.is_expanded {
} else { self.colours.highlighted_border_style
self.colours.widget_title_style } else {
}) self.colours.widget_title_style
.borders(Borders::ALL) })
.border_style(if app_state.current_widget.widget_id == widget_id { .borders(Borders::ALL)
self.colours.highlighted_border_style .border_style(if app_state.current_widget.widget_id == widget_id {
} else { self.colours.highlighted_border_style
self.colours.border_style } else {
}), self.colours.border_style
) }),
.x_axis(x_axis) )
.y_axis(y_axis) .x_axis(x_axis)
.datasets(&[ .y_axis(y_axis)
Dataset::default() .datasets(&[
.name(&format!("RX: {:7}", app_state.canvas_data.rx_display)) Dataset::default()
.marker(if app_state.app_config_fields.use_dot { .name(&format!("RX: {:7}", app_state.canvas_data.rx_display))
Marker::Dot .marker(if app_state.app_config_fields.use_dot {
} else { Marker::Dot
Marker::Braille } else {
}) Marker::Braille
.style(self.colours.rx_style) })
.data(&network_data_rx), .style(self.colours.rx_style)
Dataset::default() .data(&network_data_rx),
.name(&format!("TX: {:7}", app_state.canvas_data.tx_display)) Dataset::default()
.marker(if app_state.app_config_fields.use_dot { .name(&format!("TX: {:7}", app_state.canvas_data.tx_display))
Marker::Dot .marker(if app_state.app_config_fields.use_dot {
} else { Marker::Dot
Marker::Braille } else {
}) Marker::Braille
.style(self.colours.tx_style) })
.data(&network_data_tx), .style(self.colours.tx_style)
Dataset::default() .data(&network_data_tx),
.name(&format!( Dataset::default()
"Total RX: {:7}", .name(&format!(
app_state.canvas_data.total_rx_display "Total RX: {:7}",
)) app_state.canvas_data.total_rx_display
.style(self.colours.total_rx_style), ))
Dataset::default() .style(self.colours.total_rx_style),
.name(&format!( Dataset::default()
"Total TX: {:7}", .name(&format!(
app_state.canvas_data.total_tx_display "Total TX: {:7}",
)) app_state.canvas_data.total_tx_display
.style(self.colours.total_tx_style), ))
]) .style(self.colours.total_tx_style),
.render(f, draw_loc); ]),
draw_loc,
);
} }
} }
@ -201,22 +204,24 @@ impl NetworkGraphWidget for Painter {
let intrinsic_widths = &(variable_intrinsic_results.0)[0..variable_intrinsic_results.1]; let intrinsic_widths = &(variable_intrinsic_results.0)[0..variable_intrinsic_results.1];
// Draw // Draw
Table::new(NETWORK_HEADERS.iter(), mapped_network) f.render_widget(
.block(Block::default().borders(Borders::ALL).border_style( Table::new(NETWORK_HEADERS.iter(), mapped_network)
if app_state.current_widget.widget_id == widget_id { .block(Block::default().borders(Borders::ALL).border_style(
self.colours.highlighted_border_style if app_state.current_widget.widget_id == widget_id {
} else { self.colours.highlighted_border_style
self.colours.border_style } else {
}, self.colours.border_style
)) },
.header_style(self.colours.table_header_style) ))
.style(self.colours.text_style) .header_style(self.colours.table_header_style)
.widths( .style(self.colours.text_style)
&(intrinsic_widths .widths(
.iter() &(intrinsic_widths
.map(|calculated_width| Constraint::Length(*calculated_width as u16)) .iter()
.collect::<Vec<_>>()), .map(|calculated_width| Constraint::Length(*calculated_width as u16))
) .collect::<Vec<_>>()),
.render(f, draw_loc); ),
draw_loc,
);
} }
} }

40
src/canvas/widgets/process_table.rs
View File

@ -15,7 +15,7 @@ use tui::{
backend::Backend, backend::Backend,
layout::{Alignment, Constraint, Direction, Layout, Rect}, layout::{Alignment, Constraint, Direction, Layout, Rect},
terminal::Frame, terminal::Frame,
widgets::{Block, Borders, Paragraph, Row, Table, Text, Widget}, widgets::{Block, Borders, Paragraph, Row, Table, Text},
}; };
use unicode_segmentation::{GraphemeIndices, UnicodeSegmentation}; use unicode_segmentation::{GraphemeIndices, UnicodeSegmentation};
@ -253,16 +253,20 @@ impl ProcessTableWidget for Painter {
.direction(Direction::Horizontal) .direction(Direction::Horizontal)
.split(draw_loc); .split(draw_loc);
Table::new(process_headers.iter(), process_rows) f.render_widget(
.block(process_block) Table::new(process_headers.iter(), process_rows)
.header_style(self.colours.table_header_style) .block(process_block)
.widths( .header_style(self.colours.table_header_style)
&(intrinsic_widths .widths(
.iter() &(intrinsic_widths
.map(|calculated_width| Constraint::Length(*calculated_width as u16)) .iter()
.collect::<Vec<_>>()), .map(|calculated_width| {
) Constraint::Length(*calculated_width as u16)
.render(f, margined_draw_loc[0]); })
.collect::<Vec<_>>()),
),
margined_draw_loc[0],
);
} }
} }
} }
@ -490,12 +494,14 @@ impl ProcessTableWidget for Painter {
.direction(Direction::Horizontal) .direction(Direction::Horizontal)
.split(draw_loc); .split(draw_loc);
Paragraph::new(search_text.iter()) f.render_widget(
.block(process_search_block) Paragraph::new(search_text.iter())
.style(self.colours.text_style) .block(process_search_block)
.alignment(Alignment::Left) .style(self.colours.text_style)
.wrap(false) .alignment(Alignment::Left)
.render(f, margined_draw_loc[0]); .wrap(false),
margined_draw_loc[0],
);
} }
} }
} }

24
src/canvas/widgets/temp_table.rs
View File

@ -5,7 +5,7 @@ use tui::{
backend::Backend, backend::Backend,
layout::{Constraint, Direction, Layout, Rect}, layout::{Constraint, Direction, Layout, Rect},
terminal::Frame, terminal::Frame,
widgets::{Block, Borders, Row, Table, Widget}, widgets::{Block, Borders, Row, Table},
}; };
use crate::{ use crate::{
@ -139,16 +139,18 @@ impl TempTableWidget for Painter {
.split(draw_loc); .split(draw_loc);
// Draw // Draw
Table::new(TEMP_HEADERS.iter(), temperature_rows) f.render_widget(
.block(temp_block) Table::new(TEMP_HEADERS.iter(), temperature_rows)
.header_style(self.colours.table_header_style) .block(temp_block)
.widths( .header_style(self.colours.table_header_style)
&(intrinsic_widths .widths(
.iter() &(intrinsic_widths
.map(|calculated_width| Constraint::Length(*calculated_width as u16)) .iter()
.collect::<Vec<_>>()), .map(|calculated_width| Constraint::Length(*calculated_width as u16))
) .collect::<Vec<_>>()),
.render(f, margined_draw_loc[0]); ),
margined_draw_loc[0],
);
} }
} }
} }