chore: merge main into dev

.github/release-body.md

@@ -1,13 +1,19 @@
-### 2022-05-30
+### 2022-07-06
 
 ### Docs
-+ Readme one-liner to download & install latest version, [11d5ba361ee4c11d080f1c3c14d8bb677cbfd1fc]
-+ Example docker-compose.yml bump alpine version to 3.16, [98c83f2f68f59e78f0c78270c59886630d98913c]
++ readme update, [f29e29ad151ddf424ba630e6d33edf19acfd7636]
++ comments improved, [1674db8a20aafa447732deb2e44ac8b97cf0471b]
++ readme logo size, [a733efa65865e04d9ec86c7ca8785dfbae635695]
 
 ### Fixes
-+ use Some() checks to make sure that container item indexes are still valid, else can create out-of-bounds errors, closes [#8], [4cf02e3f04426ef44ec5a7421687f2104ac5102f]
-+ Remove + replace as many unwrap()'s as possible, [d8e22d7444965f1874d7367259310440a889432b]
-+ Help panel typo, [e497f3f2d9e1dca99469860c2e728c99e29353ad]
++ Remove unwraps(), [61db81ecfe5684ddb8a360715f43357a042162c0]
++ Help menu alt+tab > shift+tab typo, thanks [siph](https://github.com/siph), [04466803481b75feb7d7f275248279fdb8729862]
+
+### Refactors
++ tokio spawns, [1fd230f2f3cf4e376058359515e76f4fa6e425c2]
++ max_line_width(), [a5d7dabbd68dc15a081df33352ce3b55d9a9891c]
++ create_release dead code removed, [297979c197c2defd409053d8da724f922b0bba1b]
+
 
 
 see <a href='https://github.com/mrjackwills/oxker/blob/main/CHANGELOG.md'>CHANGELOG.md</a> for more details

CHANGELOG.md

@@ -1,16 +1,19 @@
+# <a href='https://github.com/mrjackwills/oxker/releases/tag/v0.0.6'>v0.0.6</a>
+### 2022-07-06
+
 ### Docs
-+ readme update, [f29e29ad151ddf424ba630e6d33edf19acfd7636]
-+ comments improved, [1674db8a20aafa447732deb2e44ac8b97cf0471b]
-+ readme logo size, [a733efa65865e04d9ec86c7ca8785dfbae635695]
++ readme update, [f29e29ad](https://github.com/mrjackwills/oxker/commit/f29e29ad151ddf424ba630e6d33edf19acfd7636),
++ comments improved, [1674db8a](https://github.com/mrjackwills/oxker/commit/1674db8a20aafa447732deb2e44ac8b97cf0471b),
++ readme logo size, [a733efa6](https://github.com/mrjackwills/oxker/commit/a733efa65865e04d9ec86c7ca8785dfbae635695),
 
 ### Fixes
-+ Remove unwraps(), [61db81ecfe5684ddb8a360715f43357a042162c0]
-+ Help menu alt+tab > shift+tab typo, thanks [siph](https://github.com/siph), [04466803481b75feb7d7f275248279fdb8729862]
++ Remove unwraps(), [61db81ec](https://github.com/mrjackwills/oxker/commit/61db81ecfe5684ddb8a360715f43357a042162c0),
++ Help menu alt+tab > shift+tab typo, thanks [siph](https://github.com/siph), [04466803](https://github.com/mrjackwills/oxker/commit/04466803481b75feb7d7f275248279fdb8729862),
 
 ### Refactors
-+ tokio spawns, [1fd230f2f3cf4e376058359515e76f4fa6e425c2]
-+ max_line_width(), [a5d7dabbd68dc15a081df33352ce3b55d9a9891c]
-+ create_release dead code removed, [297979c197c2defd409053d8da724f922b0bba1b]
++ tokio spawns, [1fd230f2](https://github.com/mrjackwills/oxker/commit/1fd230f2f3cf4e376058359515e76f4fa6e425c2),
++ max_line_width(), [a5d7dabb](https://github.com/mrjackwills/oxker/commit/a5d7dabbd68dc15a081df33352ce3b55d9a9891c),
++ create_release dead code removed, [297979c1](https://github.com/mrjackwills/oxker/commit/297979c197c2defd409053d8da724f922b0bba1b),
 
 
 # <a href='https://github.com/mrjackwills/oxker/releases/tag/v0.0.5'>v0.0.5</a>

Cargo.toml

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

src/main.rs

@@ -32,21 +32,19 @@ async fn main() {
     let docker_gui_state = Arc::clone(&gui_state);
 
     let (docker_sx, docker_rx) = tokio::sync::mpsc::channel(16);
-	
+
     // Create docker daemon handler, and only spawn up the docker data handler if ping returns non-error
     let docker = Arc::new(Docker::connect_with_socket_defaults().unwrap());
     match docker.ping().await {
         Ok(_) => {
             let docker = Arc::clone(&docker);
-            tokio::spawn(
-                DockerData::init(
-                    docker_args,
-                    docker_app_data,
-                    docker,
-                    docker_gui_state,
-                    docker_rx,
-                )
-            );
+            tokio::spawn(DockerData::init(
+                docker_args,
+                docker_app_data,
+                docker,
+                docker_gui_state,
+                docker_rx,
+            ));
         }
         Err(_) => app_data.lock().set_error(AppError::DockerConnect),
     }
@@ -61,15 +59,13 @@ async fn main() {
     let input_docker_sender = docker_sx.clone();
 
     // Spawn input handling into own tokio thread
-    tokio::spawn(
-        input_handler::InputHandler::init(
-            input_app_data,
-            input_rx,
-            input_docker_sender,
-            input_gui_state,
-            input_is_running,
-        )
-    );
+    tokio::spawn(input_handler::InputHandler::init(
+        input_app_data,
+        input_rx,
+        input_docker_sender,
+        input_gui_state,
+        input_is_running,
+    ));
 
     // Debug mode for testing, mostly pointless, doesn't take terminal nor draw gui
     if !args.gui {