diff --git a/.github/release-body.md b/.github/release-body.md
index 28640bb..f9cc715 100644
--- a/.github/release-body.md
+++ b/.github/release-body.md
@@ -1,25 +1,23 @@
-### 2023-03-13
+### 2023-03-30
### Chores
-+ Rust 1.68.0 clippy linting, [5582c45403413d3355bbcd629cfad559296f5e5b]
-+ devcontainer use sparse protocol index, [20b79e9cd5bf75bb253158c0b590284139e0291d]
-+ dependencies updated, [0c07d4b40607a0eba003b6dcd0345ec0543c6264], [601a73d2c830043a25d64922c4d4aa38f8801912], [5aaa3c1ab08b0c85df9bfce18a3e60206556fa58], [7a1563030e48499da7f41033673c70deefe3de8a], [457157755baa1f9e9cfef9315a7940c357b0953d]
++ dependencies updated, [7a9bdc9699594532e17a33e044ca0678693c8d3f], [58e03a750fe89b914b9069cb0c6c02a3d0929439], [b246e8c25af0c5136953afca7c694cda66550d9b]
+
+### Docs
++ README.md and screenshot updated, [73ab7580c61dd59c59f10872629111360afb9033]
### Features
-+ increase mpsc channel size from 16 to 32 messages, [924f14e998f79f731447a2eded038eab51f2e932]
-+ KeyEvents send modifier, so can quit on `ctrl + c`, [598f67c6f6a8713102bcc415f0409911763bb914]
-+ only send relevant mouse events to input handler, [507660d835d0beaa8cd021110401ecc58c0613c6]
++ Ability to delete a container, be warned, as this will force delete, closes #27, [937202fe34d1692693c62dd1a7ad19db37651233], [b25f8b18f4f2acd5c9af4a1d40655761d1bd720e]
++ Publish images to `ghcr.io` as well as Docker Hub, and correctly tag images with `latest` and the current sermver, [cb1271cf7f21c898020481ad85914a3dcc83ec93]
++ Replace `tui-rs` with [ratatui](https://github.com/tui-rs-revival/ratatui), [d431f850219b28af2bc45f3b6917377604596a40]
### Fixes
-+ GitHub workflow on SEMEVR tag only, [140773865165bf006e74f9d436fc744220f5eae7]
++ out of bound bug in `heading_bar()`, [b9c125da46fe0eb4aae15c354d87ac824e9cb83a]
++ `-d` arg error text updated, [e0b49be84062abdfcb636418f57043fad37d06ec]
### Refactors
-+ replace `unwrap_or(())` with `.ok()`, [8ba37a165bb89277ab957194da6464bdb35be2e6]
-+ use `unwrap_or_default()`, [79de92c3921702417bb2df1f44939a7b09cb7fa0]
-+ Result return, [d9f0bd5566e27218b8c8eaba6ece237907771c1d]
-
-### Reverts
-+ temporary devcontainer buildkit fix removed, [d1497a4451f4de54d3cc26c5a3957cd636c29118]
++ `popup()` use `saturating_x()` rather than `checked_x()`, [d628e8029942916053b3b7e72d363b1290fc5711]
++ button_item() include brackets, [7c92ffef7da20143a31706a310b5e6f2c3e0554f]
see CHANGELOG.md for more details
diff --git a/CHANGELOG.md b/CHANGELOG.md
index d9cb487..067694d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,21 +1,24 @@
+# v0.3.0
+### 2023-03-30
+
### Chores
-+ dependencies updated, [7a9bdc9699594532e17a33e044ca0678693c8d3f], [58e03a750fe89b914b9069cb0c6c02a3d0929439], [b246e8c25af0c5136953afca7c694cda66550d9b]
++ dependencies updated, [7a9bdc96](https://github.com/mrjackwills/oxker/commit/7a9bdc9699594532e17a33e044ca0678693c8d3f), [58e03a75](https://github.com/mrjackwills/oxker/commit/58e03a750fe89b914b9069cb0c6c02a3d0929439), [b246e8c2](https://github.com/mrjackwills/oxker/commit/b246e8c25af0c5136953afca7c694cda66550d9b)
### Docs
-+ README.md and screenshot updated, [73ab7580c61dd59c59f10872629111360afb9033]
++ README.md and screenshot updated, [73ab7580](https://github.com/mrjackwills/oxker/commit/73ab7580c61dd59c59f10872629111360afb9033)
### Features
-+ Ability to delete a container, be warned, as this will force delete, closes #27, [937202fe34d1692693c62dd1a7ad19db37651233], [b25f8b18f4f2acd5c9af4a1d40655761d1bd720e]
-+ Publish images to `ghcr.io` as well as Docker Hub, and correctly tag images with `latest` and the current sermver, [cb1271cf7f21c898020481ad85914a3dcc83ec93]
-+ Replace `tui-rs` with [ratatui](https://github.com/tui-rs-revival/ratatui), [d431f850219b28af2bc45f3b6917377604596a40]
++ Ability to delete a container, be warned, as this will force delete, closes [#27](https://github.com/mrjackwills/oxker/issues/27), [937202fe](https://github.com/mrjackwills/oxker/commit/937202fe34d1692693c62dd1a7ad19db37651233), [b25f8b18](https://github.com/mrjackwills/oxker/commit/b25f8b18f4f2acd5c9af4a1d40655761d1bd720e)
++ Publish images to `ghcr.io` as well as Docker Hub, and correctly tag images with `latest` and the current sermver, [cb1271cf](https://github.com/mrjackwills/oxker/commit/cb1271cf7f21c898020481ad85914a3dcc83ec93)
++ Replace `tui-rs` with [ratatui](https://github.com/tui-rs-revival/ratatui), [d431f850](https://github.com/mrjackwills/oxker/commit/d431f850219b28af2bc45f3b6917377604596a40)
### Fixes
-+ out of bound bug in `heading_bar()`, [b9c125da46fe0eb4aae15c354d87ac824e9cb83a]
-+ `-d` arg error text updated, [e0b49be84062abdfcb636418f57043fad37d06ec]
++ out of bound bug in `heading_bar()`, [b9c125da](https://github.com/mrjackwills/oxker/commit/b9c125da46fe0eb4aae15c354d87ac824e9cb83a)
++ `-d` arg error text updated, [e0b49be8](https://github.com/mrjackwills/oxker/commit/e0b49be84062abdfcb636418f57043fad37d06ec)
### Refactors
-+ `popup()` use `saturating_x()` rather than `checked_x()`, [d628e8029942916053b3b7e72d363b1290fc5711]
-+ button_item() include brackets, [7c92ffef7da20143a31706a310b5e6f2c3e0554f]
++ `popup()` use `saturating_x()` rather than `checked_x()`, [d628e802](https://github.com/mrjackwills/oxker/commit/d628e8029942916053b3b7e72d363b1290fc5711)
++ button_item() include brackets, [7c92ffef](https://github.com/mrjackwills/oxker/commit/7c92ffef7da20143a31706a310b5e6f2c3e0554f)
# v0.2.5
### 2023-03-13
diff --git a/Cargo.lock b/Cargo.lock
index 2cf3324..f10e5dc 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -729,7 +729,7 @@ checksum = "b15813163c1d831bf4a13c3610c05c0d03b39feb07f7e09fa234dac9b15aaf39"
[[package]]
name = "oxker"
-version = "0.2.5"
+version = "0.3.0"
dependencies = [
"anyhow",
"bollard",
diff --git a/Cargo.toml b/Cargo.toml
index 7ba44aa..8d339ae 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,6 +1,6 @@
[package]
name = "oxker"
-version = "0.2.5"
+version = "0.3.0"
edition = "2021"
authors = ["Jack Wills "]
description = "A simple tui to view & control docker containers"
diff --git a/src/ui/draw_blocks.rs b/src/ui/draw_blocks.rs
index 2fc236f..29e5589 100644
--- a/src/ui/draw_blocks.rs
+++ b/src/ui/draw_blocks.rs
@@ -432,7 +432,7 @@ pub fn heading_bar(
let info_text = format!("( h ) {suffix} help {MARGIN}",);
let info_width = info_text.chars().count();
- let column_width = usize::from(area.width).saturating_sub(info_width);
+ let column_width = usize::from(area.width).saturating_sub(info_width);
let column_width = if column_width > 0 { column_width } else { 1 };
let splits = if has_containers {
vec![
@@ -794,14 +794,14 @@ pub fn delete_confirm(
)
.split(area);
- // Should maybe have a differenet button_space IF the f.width() is within 2 chars of no_chars + yes_chars?
+ // Should maybe have a differenet button_space IF the f.width() is within 2 chars of no_chars + yes_chars?
let button_spacing = (max_line_width - no_chars - yes_chars) / 3;
- let button_spacing = if (button_spacing + max_line_width) > f.size().width {
- 1
- }else{
- button_spacing
- };
+ let button_spacing = if (button_spacing + max_line_width) > f.size().width {
+ 1
+ } else {
+ button_spacing
+ };
let split_buttons = Layout::default()
.direction(Direction::Horizontal)
.constraints(
@@ -904,9 +904,7 @@ pub fn info(f: &mut Frame<'_, B>, text: String) {
/// draw a box in the one of the BoxLocations, based on max line width + number of lines
fn popup(text_lines: usize, text_width: usize, r: Rect, box_location: BoxLocation) -> Rect {
// Make sure blank_space can't be an negative, as will crash
- let calc = |x: u16, y: usize| {
- usize::from(x).saturating_sub(y).saturating_div(2)
- };
+ let calc = |x: u16, y: usize| usize::from(x).saturating_sub(y).saturating_div(2);
let blank_vertical = calc(r.height, text_lines);
let blank_horizontal = calc(r.width, text_width);
diff --git a/src/ui/gui_state.rs b/src/ui/gui_state.rs
index 0732154..5a6c128 100644
--- a/src/ui/gui_state.rs
+++ b/src/ui/gui_state.rs
@@ -292,7 +292,7 @@ impl GuiState {
if id.is_some() {
self.status.insert(Status::DeleteConfirm);
} else {
- self.delete_map.clear();
+ self.delete_map.clear();
self.status.remove(&Status::DeleteConfirm);
}
self.delete_container = id;