niko/oxkerclone
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

chore: merge main into dev

Browse Source
This commit is contained in:
Jack Wills
2022-04-29 18:01:56 +00:00
parent 21c6bbec5f 567800e7e3
commit c8402cd4ec
6 changed files with 34 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.github/release-body.md
+12 -2
View File
@@ -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 <a href='https://github.com/mrjackwills/oxker/blob/main/CHANGELOG.md'>CHANGELOG.md</a> for more details see <a href='https://github.com/mrjackwills/oxker/blob/main/CHANGELOG.md'>CHANGELOG.md</a> for more details
CHANGELOG.md
+10 -7
View File
@@ -1,13 +1,16 @@
# <a href='https://github.com/mrjackwills/oxker/releases/tag/v0.0.2'>v0.0.2</a>
### 2022-04-29
### Features ### Features
+ allow toggling of mouse caputre, to select & copy text with mouse, closes [#2], [aec184ea22b289e91942a4c3e6a415685884bc47] + 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] + 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] + 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] + 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 ### Fixes
+ readme.md typo, [589501f9a4a0bfabdb0654e68cc0c752c529d97a] + readme.md typo, [589501f9a4a0bfabdb0654e68cc0c752c529d97a](https://github.com/mrjackwills/oxker/commit/589501f9a4a0bfabdb0654e68cc0c752c529d97a),
+ column heading mem > memory, [5e8e6b590b06f01a542fdd10bae8f14d303ab08a] + column heading mem > memory, [5e8e6b590b06f01a542fdd10bae8f14d303ab08a](https://github.com/mrjackwills/oxker/commit/5e8e6b590b06f01a542fdd10bae8f14d303ab08a),
+ cargo fmt added to create_release.sh, [bb29c0ebfafd6a9a036eb317a240954d1405966e] + cargo fmt added to create_release.sh, [bb29c0ebfafd6a9a036eb317a240954d1405966e](https://github.com/mrjackwills/oxker/commit/bb29c0ebfafd6a9a036eb317a240954d1405966e),
# <a href='https://github.com/mrjackwills/oxker/releases/tag/v0.0.1'>v0.0.1</a> # <a href='https://github.com/mrjackwills/oxker/releases/tag/v0.0.1'>v0.0.1</a>
### 2022-04-25 ### 2022-04-25
Cargo.toml
+1 -1
View File
@@ -1,6 +1,6 @@
[package] [package]
name = "oxker" name = "oxker"
version = "0.0.1" version = "0.0.2"
edition = "2021" edition = "2021"
authors = ["Jack Wills <email@mrjackwills.com>"] authors = ["Jack Wills <email@mrjackwills.com>"]
description = "a simple tui to view & control docker containers" description = "a simple tui to view & control docker containers"
src/docker_data/mod.rs
+6 -7
View File
@@ -212,7 +212,7 @@ impl DockerData {
} }
/// Animate the loading icon /// Animate the loading icon
async fn loading_spin(&mut self ) -> JoinHandle<()> { async fn loading_spin(&mut self) -> JoinHandle<()> {
let gui_state = Arc::clone(&self.gui_state); let gui_state = Arc::clone(&self.gui_state);
tokio::spawn(async move { tokio::spawn(async move {
loop { loop {
@@ -228,7 +228,6 @@ impl DockerData {
self.gui_state.lock().reset_loading(); 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) { async fn initialise_container_data(&mut self) {
let loading_spin = self.loading_spin().await; let loading_spin = self.loading_spin().await;
@@ -259,7 +258,7 @@ impl DockerData {
let app_data = Arc::clone(&self.app_data); let app_data = Arc::clone(&self.app_data);
match message { match message {
DockerMessage::Pause(id) => { 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(|_| { docker.pause_container(&id).await.unwrap_or_else(|_| {
app_data app_data
.lock() .lock()
@@ -268,7 +267,7 @@ impl DockerData {
self.stop_loading_spin(loading_spin); self.stop_loading_spin(loading_spin);
} }
DockerMessage::Restart(id) => { DockerMessage::Restart(id) => {
let loading_spin =self.loading_spin().await; let loading_spin = self.loading_spin().await;
docker docker
.restart_container(&id, None) .restart_container(&id, None)
.await .await
@@ -280,7 +279,7 @@ impl DockerData {
self.stop_loading_spin(loading_spin); self.stop_loading_spin(loading_spin);
} }
DockerMessage::Start(id) => { DockerMessage::Start(id) => {
let loading_spin =self.loading_spin().await; let loading_spin = self.loading_spin().await;
docker docker
.start_container(&id, None::<StartContainerOptions<String>>) .start_container(&id, None::<StartContainerOptions<String>>)
.await .await
@@ -292,7 +291,7 @@ impl DockerData {
self.stop_loading_spin(loading_spin); self.stop_loading_spin(loading_spin);
} }
DockerMessage::Stop(id) => { 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(|_| { docker.stop_container(&id, None).await.unwrap_or_else(|_| {
app_data app_data
.lock() .lock()
@@ -301,7 +300,7 @@ impl DockerData {
self.stop_loading_spin(loading_spin); self.stop_loading_spin(loading_spin);
} }
DockerMessage::Unpause(id) => { 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(|_| { docker.unpause_container(&id).await.unwrap_or_else(|_| {
app_data app_data
.lock() .lock()