From cf3d0dad3b773bb5591bc1c01c8139ffce67edc7 Mon Sep 17 00:00:00 2001 From: Jack Wills <32690432+mrjackwills@users.noreply.github.com> Date: Fri, 29 Apr 2022 18:01:55 +0000 Subject: [PATCH] chore: release v0.0.2 --- .github/release-body.md | 14 ++++++++++++-- CHANGELOG.md | 17 ++++++++++------- Cargo.toml | 2 +- src/app_data/mod.rs | 2 +- src/docker_data/mod.rs | 19 +++++++++---------- src/ui/mod.rs | 2 +- 6 files changed, 34 insertions(+), 22 deletions(-) diff --git a/.github/release-body.md b/.github/release-body.md index 4d77784..b689008 100644 --- a/.github/release-body.md +++ b/.github/release-body.md @@ -1,5 +1,15 @@ -### 2022-04-25 +### 2022-04-29 + +### Features ++ allow toggling of mouse caputre, to select & copy text with mouse, closes [#2], [aec184ea22b289e91942a4c3e6a415685884bc47] ++ show id column, [b10f927481c9e38a48c1d4b94e744ec48e8b6ba6] ++ draw_popup, using enum to draw in one of 9 areas, closes [#6], [1017850a6cc91328abc1127bdb117495f5e909d8] ++ use a message rx/sx for all docker commands, remove update loop, wait for update message from gui instead, [9b70fdfad7b38361ebee301bdc2545d3f0dfcf9e] + +### Fixes ++ readme.md typo, [589501f9a4a0bfabdb0654e68cc0c752c529d97a] ++ column heading mem > memory, [5e8e6b590b06f01a542fdd10bae8f14d303ab08a] ++ cargo fmt added to create_release.sh, [bb29c0ebfafd6a9a036eb317a240954d1405966e] -+ init commit see CHANGELOG.md for more details diff --git a/CHANGELOG.md b/CHANGELOG.md index 5bdf140..9e484f0 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,13 +1,16 @@ +# v0.0.2 +### 2022-04-29 + ### Features -+ allow toggling of mouse caputre, to select & copy text with mouse, closes [#2], [aec184ea22b289e91942a4c3e6a415685884bc47] -+ show id column, [b10f927481c9e38a48c1d4b94e744ec48e8b6ba6] -+ draw_popup, using enum to draw in one of 9 areas, closes [#6], [1017850a6cc91328abc1127bdb117495f5e909d8] -+ use a message rx/sx for all docker commands, remove update loop, wait for update message from gui instead, [9b70fdfad7b38361ebee301bdc2545d3f0dfcf9e] ++ allow toggling of mouse caputre, to select & copy text with mouse, closes [#2], [aec184ea22b289e91942a4c3e6a415685884bc47](https://github.com/mrjackwills/oxker/commit/aec184ea22b289e91942a4c3e6a415685884bc47), ++ show id column, [b10f927481c9e38a48c1d4b94e744ec48e8b6ba6](https://github.com/mrjackwills/oxker/commit/b10f927481c9e38a48c1d4b94e744ec48e8b6ba6), ++ draw_popup, using enum to draw in one of 9 areas, closes [#6], [1017850a6cc91328abc1127bdb117495f5e909d8](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, [9b70fdfad7b38361ebee301bdc2545d3f0dfcf9e](https://github.com/mrjackwills/oxker/commit/9b70fdfad7b38361ebee301bdc2545d3f0dfcf9e), ### Fixes -+ readme.md typo, [589501f9a4a0bfabdb0654e68cc0c752c529d97a] -+ column heading mem > memory, [5e8e6b590b06f01a542fdd10bae8f14d303ab08a] -+ cargo fmt added to create_release.sh, [bb29c0ebfafd6a9a036eb317a240954d1405966e] ++ readme.md typo, [589501f9a4a0bfabdb0654e68cc0c752c529d97a](https://github.com/mrjackwills/oxker/commit/589501f9a4a0bfabdb0654e68cc0c752c529d97a), ++ column heading mem > memory, [5e8e6b590b06f01a542fdd10bae8f14d303ab08a](https://github.com/mrjackwills/oxker/commit/5e8e6b590b06f01a542fdd10bae8f14d303ab08a), ++ cargo fmt added to create_release.sh, [bb29c0ebfafd6a9a036eb317a240954d1405966e](https://github.com/mrjackwills/oxker/commit/bb29c0ebfafd6a9a036eb317a240954d1405966e), # v0.0.1 ### 2022-04-25 diff --git a/Cargo.toml b/Cargo.toml index a26aed7..e69da58 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "oxker" -version = "0.0.1" +version = "0.0.2" edition = "2021" authors = ["Jack Wills "] description = "a simple tui to view & control docker containers" diff --git a/src/app_data/mod.rs b/src/app_data/mod.rs index a86042c..06dc806 100644 --- a/src/app_data/mod.rs +++ b/src/app_data/mod.rs @@ -304,7 +304,7 @@ impl AppData { if self.containers.state.selected().is_some() { self.containers.previous(); } - // docker rm -f $(docker ps -aq) will cause this to crash + // docker rm -f $(docker ps -aq) will cause this to crash self.containers.items.remove(index); } } diff --git a/src/docker_data/mod.rs b/src/docker_data/mod.rs index c674129..71375ec 100644 --- a/src/docker_data/mod.rs +++ b/src/docker_data/mod.rs @@ -212,8 +212,8 @@ impl DockerData { } /// Animate the loading icon - async fn loading_spin(&mut self ) -> JoinHandle<()> { - let gui_state = Arc::clone(&self.gui_state); + async fn loading_spin(&mut self) -> JoinHandle<()> { + let gui_state = Arc::clone(&self.gui_state); tokio::spawn(async move { loop { tokio::time::sleep(std::time::Duration::from_millis(100)).await; @@ -228,8 +228,7 @@ impl DockerData { self.gui_state.lock().reset_loading(); } - - // Initialize docker container data, before any messages are received + // Initialize docker container data, before any messages are received async fn initialise_container_data(&mut self) { let loading_spin = self.loading_spin().await; @@ -259,7 +258,7 @@ impl DockerData { let app_data = Arc::clone(&self.app_data); match message { DockerMessage::Pause(id) => { - let loading_spin =self.loading_spin().await; + let loading_spin = self.loading_spin().await; docker.pause_container(&id).await.unwrap_or_else(|_| { app_data .lock() @@ -268,7 +267,7 @@ impl DockerData { self.stop_loading_spin(loading_spin); } DockerMessage::Restart(id) => { - let loading_spin =self.loading_spin().await; + let loading_spin = self.loading_spin().await; docker .restart_container(&id, None) .await @@ -280,7 +279,7 @@ impl DockerData { self.stop_loading_spin(loading_spin); } DockerMessage::Start(id) => { - let loading_spin =self.loading_spin().await; + let loading_spin = self.loading_spin().await; docker .start_container(&id, None::>) .await @@ -292,7 +291,7 @@ impl DockerData { self.stop_loading_spin(loading_spin); } DockerMessage::Stop(id) => { - let loading_spin =self.loading_spin().await; + let loading_spin = self.loading_spin().await; docker.stop_container(&id, None).await.unwrap_or_else(|_| { app_data .lock() @@ -301,14 +300,14 @@ impl DockerData { self.stop_loading_spin(loading_spin); } DockerMessage::Unpause(id) => { - let loading_spin =self.loading_spin().await; + let loading_spin = self.loading_spin().await; docker.unpause_container(&id).await.unwrap_or_else(|_| { app_data .lock() .set_error(AppError::DockerCommand(DockerControls::Unpause)) }); self.stop_loading_spin(loading_spin); - self.update_everything().await + self.update_everything().await } DockerMessage::Update => self.update_everything().await, } diff --git a/src/ui/mod.rs b/src/ui/mod.rs index a71a244..15d04d2 100644 --- a/src/ui/mod.rs +++ b/src/ui/mod.rs @@ -67,7 +67,7 @@ pub async fn create_ui( terminal.show_cursor().unwrap(); if let Err(err) = res { - println!("{}", err); + println!("{}", err); } Ok(()) }