chore: merge main into dev

.github/release-body.md

@@ -1,8 +1,17 @@
-### 2022-12-05
+### 2022-12-25
+
+### Chores
++ dependencies updated, [1525b3150293015c0fb2f2161da463b21ac2694c], [8d539ab14809136d743c49d60779687fc8eeef6d], [1774217a8a657d261397d213e5ecee667cf3b6b1]
++ Rust 1.66 linting, [bf9dcac7045c0d2314df147ec2744a3ad886564b]
+
+### Features
++ Caching on github action, [a91c9aa45ffd5c998cd1b83d8e90d0912893c31f]
 
 ### Fixes
-+ disallow commands to be sent to a dockerised oxker container, closes #19, [160b8021b1de898064756b53c127d49b8096ce4d]
++ comment typo, [7899b773569fed86343a035d3023bf34297fdabb]
-+ if no container created time, use 0, instead of system_time(), [1adb61ce3b029d4fcf51961958d483b2fae8825a]
+
+### Refactors
++ remove_ansi() to single liner, [57c3a6c186b916faba24bf7b5cdbbda31d636a7e]
 
 
 see <a href='https://github.com/mrjackwills/oxker/blob/main/CHANGELOG.md'>CHANGELOG.md</a> for more details

CHANGELOG.md

@@ -1,15 +1,18 @@
+# <a href='https://github.com/mrjackwills/oxker/releases/tag/v0.1.10'>v0.1.10</a>
+### 2022-12-25
+
 ### Chores
-+ dependencies updated, [1525b3150293015c0fb2f2161da463b21ac2694c], [8d539ab14809136d743c49d60779687fc8eeef6d], [1774217a8a657d261397d213e5ecee667cf3b6b1]
++ dependencies updated, [1525b315](https://github.com/mrjackwills/oxker/commit/1525b3150293015c0fb2f2161da463b21ac2694c), [8d539ab1](https://github.com/mrjackwills/oxker/commit/8d539ab14809136d743c49d60779687fc8eeef6d), [1774217a](https://github.com/mrjackwills/oxker/commit/1774217a8a657d261397d213e5ecee667cf3b6b1)
-+ Rust 1.66 linting, [bf9dcac7045c0d2314df147ec2744a3ad886564b]
++ Rust 1.66 linting, [bf9dcac7](https://github.com/mrjackwills/oxker/commit/bf9dcac7045c0d2314df147ec2744a3ad886564b)
 
 ### Features
-+ Caching on github action, [a91c9aa45ffd5c998cd1b83d8e90d0912893c31f]
++ Caching on github action, [a91c9aa4](https://github.com/mrjackwills/oxker/commit/a91c9aa45ffd5c998cd1b83d8e90d0912893c31f)
 
 ### Fixes
-+ comment typo, [7899b773569fed86343a035d3023bf34297fdabb]
++ comment typo, [7899b773](https://github.com/mrjackwills/oxker/commit/7899b773569fed86343a035d3023bf34297fdabb)
 
 ### Refactors
-+ remove_ansi() to single liner, [57c3a6c186b916faba24bf7b5cdbbda31d636a7e]
++ remove_ansi() to single liner, [57c3a6c1](https://github.com/mrjackwills/oxker/commit/57c3a6c186b916faba24bf7b5cdbbda31d636a7e)
 
 # <a href='https://github.com/mrjackwills/oxker/releases/tag/v0.1.9'>v0.1.9</a>
 ### 2022-12-05

Cargo.toml

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

src/app_data/container_state.rs

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

src/ui/color_match.rs

@@ -41,7 +41,10 @@ pub mod log_sanitizer {
 
     /// Remove all ansi formatting from a given string and create tui-rs spans
     pub fn remove_ansi<'a>(input: &str) -> Vec<Spans<'a>> {
-		raw(&categorise_text(input).into_iter().map(|i|i.text).collect::<String>())
+        raw(&categorise_text(input)
+            .into_iter()
+            .map(|i| i.text)
+            .collect::<String>())
     }
 
     /// create tui-rs spans that exactly match the given strings