refactor: state refactor

CHANGELOG.md

@@ -11,7 +11,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## Changes
 
-- [#557](https://github.com/ClementTsang/bottom/pull/557): Add '/s' to network usage legend to better indicate that it's a per-second change.
+- [#557](https://github.com/ClementTsang/bottom/pull/557): Add '/s' to network usage legend to indicate "per second".
 
 ## Bug Fixes
 

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "bottom"
-version = "0.6.4"
+version = "0.7.0"
 authors = ["Clement Tsang <cjhtsang@uwaterloo.ca>"]
 edition = "2018"
 repository = "https://github.com/ClementTsang/bottom"
@@ -25,8 +25,6 @@ doc = false
 [profile.release]
 debug = 0
 lto = true
-# debug = true
-# lto = false
 opt-level = 3
 codegen-units = 1
 
@@ -36,27 +34,30 @@ default = ["fern", "log", "battery"]
 [dependencies]
 anyhow = "1.0.40"
 backtrace = "0.3.59"
-crossterm = "0.18.2"
+crossterm = "0.22.1"
 ctrlc = { version = "3.1.9", features = ["termination"] }
 clap = "2.33"
 cfg-if = "1.0"
 dirs = "3.0.2"
+enum_dispatch = "0.3.7"
+float-ord = "0.3.2"
 futures = "0.3.14"
 futures-timer = "3.0.2"
-fxhash = "0.2.1"
 indexmap = "1.6.2"
+indextree = "4.3.1"
 itertools = "0.10.0"
 once_cell = "1.5.2"
 regex = "1.5.4"
+rustc-hash = "1.1.0"
 serde = { version = "1.0.125", features = ["derive"] }
 # Sysinfo is still used in Linux for the ProcessStatus
 sysinfo = "0.18.2"
 thiserror = "1.0.24"
+textwrap = "0.14.2"
 time = { version = "0.3.3", features = ["formatting", "local-offset", "macros"] }
 toml = "0.5.8"
-tui = { version = "0.14.0", features = ["crossterm"], default-features = false }
-typed-builder = "0.9.0"
-unicode-segmentation = "1.7.1"
+tui = { version = "0.16.0", features = ["crossterm"], default-features = false }
+unicode-segmentation = "1.8.0"
 unicode-width = "0.1"
 
 # For debugging only... disable on release builds with for now?  TODO: Redo this.

clippy.toml

@@ -1,2 +1,3 @@
 cognitive-complexity-threshold = 100
-type-complexity-threshold = 500
+type-complexity-threshold = 500
+too-many-arguments-threshold = 10

docs/content/configuration/command-line-flags.md

@@ -17,8 +17,6 @@ The following flags can be provided to bottom in the command line to change the
 | `-C, --config <CONFIG PATH>`          | Sets the location of the config file.                          |
 | `-u, --current_usage`                 | Sets process CPU% to be based on current CPU%.                 |
 | `-t, --default_time_value <MS>`       | Default time value for graphs in ms.                           |
-| `--default_widget_count <INT>`        | Sets the n'th selected widget type as the default.             |
-| `--default_widget_type <WIDGET TYPE>` | Sets the default widget type, use --help for more info.        |
 | `--disable_advanced_kill`             | Hides advanced options to stop a process on Unix-like systems. |
 | `--disable_click`                     | Disables mouse clicks.                                         |
 | `-m, --dot_marker`                    | Uses a dot marker for graphs.                                  |

docs/content/usage/general-usage.md

@@ -41,8 +41,8 @@ Note that key bindings are generally case-sensitive.
 | ------------------------------------------------------------ | ------------------------------------------------------------ |
 | ++q++ , ++ctrl+c++                                           | Quit                                                         |
 | ++esc++                                                      | Close dialog windows, search, widgets, or exit expanded mode |
-| ++ctrl+r++                                                   | Reset display and any collected data                         |
-| ++f++                                                        | Freeze/unfreeze updating with new data                       |
+| ++ctrl+r++                                                   | Resets any collected data                                    |
+| ++f++                                                        | Toggles freezing, stopping new data from being shown         |
 | ++question++                                                 | Open help menu                                               |
 | ++e++                                                        | Toggle expanding the currently selected widget               |
 | ++ctrl+up++ <br/> ++shift+up++ <br/> ++K++ <br/> ++W++       | Select the widget above                                      |