chore: merge main into dev

.github/release-body.md

@@ -1,21 +1,20 @@
-### 2022-10-07
+### 2022-10-16
-
 
 ### Chores
-+ Update clap to v4, [15597dbe6942ec053541398ce0e9dedc10a4d3ea]
++ Cargo update, [c3e72ae7369a25d903f39e55a4349cb005671dd4]
++ create_release.sh v0.1.0, [3c8d59c666bd4cda9ca54989b2f1b48bba17bc57]
++ uuid updated to version 1.2, [438ad770f4a5ecb5f4bbc308066ad9e808f66514]
 
-### Docs
+### Fixes
-+ readme.md updated, [a05bf561cc6d96237f683ab0b3c782d6841974d9]
++ loading icon shifting error fix, also make icon white, closes #15, [59797685dffa29752a48c98e6cf465884d6d9df6]
 
 ### Features
-+ use newtype construct for container id, [41cbb84f2896f8be2c37eba87e390d998aff7382]
++ Show container name in log panel title, closes #16, [9cb0c414afc284947fc2b8494504387e4e7edd87]
++ use gui_state HashSet to keep track of application gui state, [9e9d51559a13944622abf4fcbd3bd63766d11467]
++ terminal.clear() after run_app finished, [67c49575682cb271fac0998ff377a6504cd0bc86]
 
 ### Refactors
-+ Impl Copy where able to, [e76878f424d72b943713ef84e95e25fada77d79e]
++ CpuStats & MemStats use tuple struct, [a060d032586a0707ac91cb13d922aae0850449c5]
-+ replace async fn with just fn, [17dc604befac75cb9dc0311a0e43f9927fe0ca30]
-+ remove pointless clone()'s & variable declarations, [6731002ee42c9460042c2c38aff5101b1bcebbe6]
-+ replace String::from("") with String::new(), [62fb22478697cc9a7ab9fb562a724965b437233a]
-+ replace map_or_else with map_or, [3e26f292c7dc5e13af4580952767ebe821aa5183], [5660b34d5149dce27706ff6daa90b854e6f84e14]
 
 
 see <a href='https://github.com/mrjackwills/oxker/blob/main/CHANGELOG.md'>CHANGELOG.md</a> for more details

CHANGELOG.md

@@ -1,18 +1,21 @@
+# <a href='https://github.com/mrjackwills/oxker/releases/tag/v0.1.6'>v0.1.6</a>
+### 2022-10-16
+
 ### Chores
-+ Cargo update, [c3e72ae7369a25d903f39e55a4349cb005671dd4]
++ Cargo update, [c3e72ae7](https://github.com/mrjackwills/oxker/commit/c3e72ae7369a25d903f39e55a4349cb005671dd4),
-+ create_release.sh v0.1.0, [3c8d59c666bd4cda9ca54989b2f1b48bba17bc57]
++ create_release.sh v0.1.0, [3c8d59c6](https://github.com/mrjackwills/oxker/commit/3c8d59c666bd4cda9ca54989b2f1b48bba17bc57),
-+ uuid updated to version 1.2, [438ad770f4a5ecb5f4bbc308066ad9e808f66514]
++ uuid updated to version 1.2, [438ad770](https://github.com/mrjackwills/oxker/commit/438ad770f4a5ecb5f4bbc308066ad9e808f66514),
 
 ### Fixes
-+ loading icon shifting error fix, also make icon white, closes #15, [59797685dffa29752a48c98e6cf465884d6d9df6]
++ loading icon shifting error fix, also make icon white, closes [#15](https://github.com/mrjackwills/oxker/issues/15), [59797685](https://github.com/mrjackwills/oxker/commit/59797685dffa29752a48c98e6cf465884d6d9df6),
 
 ### Features
-+ Show container name in log panel title, closes #16, [9cb0c414afc284947fc2b8494504387e4e7edd87]
++ Show container name in log panel title, closes [#16](https://github.com/mrjackwills/oxker/issues/16), [9cb0c414](https://github.com/mrjackwills/oxker/commit/9cb0c414afc284947fc2b8494504387e4e7edd87),
-+ use gui_state HashSet to keep track of application gui state, [9e9d51559a13944622abf4fcbd3bd63766d11467]
++ use gui_state HashSet to keep track of application gui state, [9e9d5155](https://github.com/mrjackwills/oxker/commit/9e9d51559a13944622abf4fcbd3bd63766d11467),
-+ terminal.clear() after run_app finished, [67c49575682cb271fac0998ff377a6504cd0bc86]
++ terminal.clear() after run_app finished, [67c49575](https://github.com/mrjackwills/oxker/commit/67c49575682cb271fac0998ff377a6504cd0bc86),
 
 ### Refactors
-+ CpuStats & MemStats use tuple struct, [a060d032586a0707ac91cb13d922aae0850449c5]
++ CpuStats & MemStats use tuple struct, [a060d032](https://github.com/mrjackwills/oxker/commit/a060d032586a0707ac91cb13d922aae0850449c5),
 
 # <a href='https://github.com/mrjackwills/oxker/releases/tag/v0.1.5'>v0.1.5</a>
 ### 2022-10-07
@@ -153,9 +156,9 @@
 ### 2022-04-29
 
 ### Features
-+ allow toggling of mouse caputre, to select & copy text with mouse, closes #2, [aec184ea](https://github.com/mrjackwills/oxker/commit/aec184ea22b289e91942a4c3e6a415685884bc47),
++ allow toggling of mouse caputre, to select & copy text with mouse, closes [#2](https://github.com/mrjackwills/oxker/issues/2), [aec184ea](https://github.com/mrjackwills/oxker/commit/aec184ea22b289e91942a4c3e6a415685884bc47),
 + show id column, [b10f9274](https://github.com/mrjackwills/oxker/commit/b10f927481c9e38a48c1d4b94e744ec48e8b6ba6),
-+ draw_popup, using enum to draw in one of 9 areas, closes #6, [1017850a](https://github.com/mrjackwills/oxker/commit/1017850a6cc91328abc1127bdb117495f5e909d8),
++ draw_popup, using enum to draw in one of 9 areas, closes [#6](https://github.com/mrjackwills/oxker/issues/6), [1017850a](https://github.com/mrjackwills/oxker/commit/1017850a6cc91328abc1127bdb117495f5e909d8),
 + use a message rx/sx for all docker commands, remove update loop, wait for update message from gui instead, [9b70fdfa](https://github.com/mrjackwills/oxker/commit/9b70fdfad7b38361ebee301bdc2545d3f0dfcf9e),
 
 ### Fixes

Cargo.lock

@@ -514,7 +514,7 @@ checksum = "b15813163c1d831bf4a13c3610c05c0d03b39feb07f7e09fa234dac9b15aaf39"
 
 [[package]]
 name = "oxker"
-version = "0.1.5"
+version = "0.1.6"
 dependencies = [
  "anyhow",
  "bollard",

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "oxker"
-version = "0.1.5"
+version = "0.1.6"
 edition = "2021"
 authors = ["Jack Wills <email@mrjackwills.com>"]
 description = "A simple tui to view & control docker containers"

src/app_data/container_state.rs

@@ -423,7 +423,7 @@ impl ContainerItem {
         self.cpu_stats
             .iter()
             .enumerate()
-            .map(|i| (i.0 as f64, i.1.0 as f64))
+            .map(|i| (i.0 as f64, i.1 .0 as f64))
             .collect::<Vec<_>>()
     }
 
@@ -433,7 +433,7 @@ impl ContainerItem {
         self.mem_stats
             .iter()
             .enumerate()
-            .map(|i| (i.0 as f64, i.1.0 as f64))
+            .map(|i| (i.0 as f64, i.1 .0 as f64))
             .collect::<Vec<_>>()
     }