From e71802fe21132a68e74ec581d57466b45c8cef3a Mon Sep 17 00:00:00 2001 From: Jack Wills <32690432+mrjackwills@users.noreply.github.com> Date: Mon, 5 Dec 2022 14:06:22 +0000 Subject: [PATCH] chore: release v0.1.9 --- .github/release-body.md | 11 +++-------- CHANGELOG.md | 9 ++++++--- Cargo.lock | 2 +- Cargo.toml | 2 +- src/app_data/container_state.rs | 8 ++++---- src/app_data/mod.rs | 26 +++++++++++++++----------- src/docker_data/mod.rs | 3 ++- src/input_handler/mod.rs | 8 ++++---- 8 files changed, 36 insertions(+), 33 deletions(-) diff --git a/.github/release-body.md b/.github/release-body.md index 2d3af7b..da6e282 100644 --- a/.github/release-body.md +++ b/.github/release-body.md @@ -1,13 +1,8 @@ ### 2022-12-05 -### Chores -+ dependencies updated, [e3aa4420cb510df0381e311d37e768937070387a] -+ docker-compose.yml alpine bump, [911c6596684db4ccbe7a55aadd6f595a95f89bb0] -+ github workflow use dtolnay/rust-toolchain, [57c18878690477a05d7330112a65d1d58a07901e] - -### Features -+ Clicking a header now toggles between Ascending -> Descending -> Default. Use the containers created_time as the default order - maybe add created column in future version, closes #18, [cf14ba498987db587c0f5bef8a67cf4113ffcb1e], [d1de291473d8a1028f1936429832d3820d75df54] -+ `-s` flag for showing the oxker container when executing the docker image, [c93870e5fbbc7df35c69d32e4460d2104e521e33] +### Fixes ++ disallow commands to be sent to a dockerised oxker container, closes #19, [160b8021b1de898064756b53c127d49b8096ce4d] ++ if no container created time, use 0, instead of system_time(), [1adb61ce3b029d4fcf51961958d483b2fae8825a] see CHANGELOG.md for more details diff --git a/CHANGELOG.md b/CHANGELOG.md index 757d73e..93e0776 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,9 @@ +# v0.1.9 +### 2022-12-05 + ### Fixes -+ disallow commands to be sent to a dockerised oxker container, closes #19, [160b8021b1de898064756b53c127d49b8096ce4d] -+ if no container created time, use 0, instead of system_time(), [1adb61ce3b029d4fcf51961958d483b2fae8825a] ++ disallow commands to be sent to a dockerised oxker container, closes [#19](https://github.com/mrjackwills/oxker/issues/19), [160b8021](https://github.com/mrjackwills/oxker/commit/160b8021b1de898064756b53c127d49b8096ce4d) ++ if no container created time, use 0, instead of system_time(), [1adb61ce](https://github.com/mrjackwills/oxker/commit/1adb61ce3b029d4fcf51961958d483b2fae8825a) # v0.1.8 ### 2022-12-05 @@ -11,7 +14,7 @@ + github workflow use dtolnay/rust-toolchain, [57c18878](https://github.com/mrjackwills/oxker/commit/57c18878690477a05d7330112a65d1d58a07901e) ### Features -+ Clicking a header now toggles between Ascending -> Descending -> Default. Use the containers created_time as the default order - maybe add created column in future version, closes #18, [cf14ba49](https://github.com/mrjackwills/oxker/commit/cf14ba498987db587c0f5bef8a67cf4113ffcb1e), [d1de2914](https://github.com/mrjackwills/oxker/commit/d1de291473d8a1028f1936429832d3820d75df54) ++ Clicking a header now toggles between Ascending -> Descending -> Default. Use the containers created_time as the default order - maybe add created column in future version, closes [#18](https://github.com/mrjackwills/oxker/issues/18), [cf14ba49](https://github.com/mrjackwills/oxker/commit/cf14ba498987db587c0f5bef8a67cf4113ffcb1e), [d1de2914](https://github.com/mrjackwills/oxker/commit/d1de291473d8a1028f1936429832d3820d75df54) + `-s` flag for showing the oxker container when executing the docker image, [c93870e5](https://github.com/mrjackwills/oxker/commit/c93870e5fbbc7df35c69d32e4460d2104e521e33) # v0.1.7 diff --git a/Cargo.lock b/Cargo.lock index 9402487..4a21bd8 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -567,7 +567,7 @@ checksum = "b15813163c1d831bf4a13c3610c05c0d03b39feb07f7e09fa234dac9b15aaf39" [[package]] name = "oxker" -version = "0.1.8" +version = "0.1.9" dependencies = [ "anyhow", "bollard", diff --git a/Cargo.toml b/Cargo.toml index 7e93f5b..269778d 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "oxker" -version = "0.1.8" +version = "0.1.9" edition = "2021" authors = ["Jack Wills "] description = "A simple tui to view & control docker containers" diff --git a/src/app_data/container_state.rs b/src/app_data/container_state.rs index bde1e4f..a6ff466 100644 --- a/src/app_data/container_state.rs +++ b/src/app_data/container_state.rs @@ -370,16 +370,16 @@ pub struct ContainerItem { pub state: State, pub status: String, pub tx: ByteStats, - pub is_oxker: bool + pub is_oxker: bool, } impl ContainerItem { /// Create a new container item pub fn new( - created: u64, + created: u64, id: ContainerId, image: String, - is_oxker: bool, + is_oxker: bool, name: String, state: State, status: String, @@ -394,7 +394,7 @@ impl ContainerItem { docker_controls, id, image, - is_oxker, + is_oxker, last_updated: 0, logs, mem_limit: ByteStats::default(), diff --git a/src/app_data/mod.rs b/src/app_data/mod.rs index eb14a91..0fa8092 100644 --- a/src/app_data/mod.rs +++ b/src/app_data/mod.rs @@ -171,13 +171,13 @@ impl AppData { output } - /// Check if the selected container is a dockerised version of oxker - /// So that can disallow commands to be send - /// Is a poor way of implementing this - pub fn selected_container_is_oxker(&self) -> bool { + /// Check if the selected container is a dockerised version of oxker + /// So that can disallow commands to be send + /// Is a poor way of implementing this + pub fn selected_container_is_oxker(&self) -> bool { if let Some(index) = self.containers.state.selected() { if let Some(x) = self.containers.items.get(index) { - return x.is_oxker + return x.is_oxker; } } false @@ -445,10 +445,10 @@ impl AppData { pub fn update_containers(&mut self, all_containers: &mut [ContainerSummary]) { let all_ids = self.get_all_ids(); - // Only sort it no containers currently set, as afterwards the order is fixed - if self.containers.items.is_empty() { - all_containers.sort_by(|a, b| a.created.cmp(&b.created)); - } + // Only sort it no containers currently set, as afterwards the order is fixed + if self.containers.items.is_empty() { + all_containers.sort_by(|a, b| a.created.cmp(&b.created)); + } if !all_containers.is_empty() && self.containers.state.selected().is_none() { self.containers.start(); @@ -485,7 +485,10 @@ impl AppData { }) }); - let is_oxker = i.command.as_ref().map_or(false, |i|i.starts_with(ENTRY_POINT)); + let is_oxker = i + .command + .as_ref() + .map_or(false, |i| i.starts_with(ENTRY_POINT)); let state = State::from(i.state.as_ref().map_or("dead".to_owned(), trim_owned)); let status = i.status.as_ref().map_or(String::new(), trim_owned); @@ -522,7 +525,8 @@ impl AppData { }; // else container not known, so make new ContainerItem and push into containers Vec } else { - let container = ContainerItem::new(created, id, image, is_oxker, name, state, status); + let container = + ContainerItem::new(created, id, image, is_oxker, name, state, status); self.containers.items.push(container); } } diff --git a/src/docker_data/mod.rs b/src/docker_data/mod.rs index 535b230..af53655 100644 --- a/src/docker_data/mod.rs +++ b/src/docker_data/mod.rs @@ -19,7 +19,8 @@ use crate::{ app_data::{AppData, ContainerId, DockerControls}, app_error::AppError, parse_args::CliArgs, - ui::{GuiState, Status}, ENTRY_POINT, + ui::{GuiState, Status}, + ENTRY_POINT, }; mod message; pub use message::DockerMessage; diff --git a/src/input_handler/mod.rs b/src/input_handler/mod.rs index 0c3f461..77f4204 100644 --- a/src/input_handler/mod.rs +++ b/src/input_handler/mod.rs @@ -250,10 +250,10 @@ impl InputHandler { if let Some(command) = option_command { let option_id = self.app_data.lock().get_selected_container_id(); - // Poor way of disallowing commands to be sent to a containerised okxer - if self.app_data.lock().selected_container_is_oxker() { - return - }; + // Poor way of disallowing commands to be sent to a containerised okxer + if self.app_data.lock().selected_container_is_oxker() { + return; + }; if let Some(id) = option_id { match command { DockerControls::Pause => self