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-11-13 16:42:03 +00:00
parent 7ba170c722 0a327341a0
commit ebb87a2d50
5 changed files with 25 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.github/release-body.md
+5 -14
View File
@@ -1,20 +1,11 @@
### 2022-10-16
### 2022-11-13
### Chores
+ Cargo update, [c3e72ae7369a25d903f39e55a4349cb005671dd4]
+ create_release.sh v0.1.0, [3c8d59c666bd4cda9ca54989b2f1b48bba17bc57]
+ uuid updated to version 1.2, [438ad770f4a5ecb5f4bbc308066ad9e808f66514]
+ update dependencies, closes #17, [8a5d0ef8376e3739dda5b0ed4c3e75e565deed45], [eadfc3d6c6896ecc8cff88c6a9e9c8b3e477c0cd]
+ aggressive linting with Rust 1.65.0, [8f3a15137155dc374e6b2822c9155c07d05d5e28]
### Fixes
+ loading icon shifting error fix, also make icon white, closes #15, [59797685dffa29752a48c98e6cf465884d6d9df6]
### Features
+ Show container name in log panel title, closes #16, [9cb0c414afc284947fc2b8494504387e4e7edd87]
+ use gui_state HashSet to keep track of application gui state, [9e9d51559a13944622abf4fcbd3bd63766d11467]
+ terminal.clear() after run_app finished, [67c49575682cb271fac0998ff377a6504cd0bc86]
### Refactors
+ CpuStats & MemStats use tuple struct, [a060d032586a0707ac91cb13d922aae0850449c5]
### Docs
+ README.md improved Download & Install section, and now available on [NixPkg](https://search.nixos.org/packages?channel=unstable&show=oxker&from=0&size=50&sort=relevance&type=packages&query=oxker), thanks [siph](https://github.com/siph), [67a9e183ca04199da758255075ff7e73061eb850]
see <a href='https://github.com/mrjackwills/oxker/blob/main/CHANGELOG.md'>CHANGELOG.md</a> for more details
CHANGELOG.md
+6 -3
View File
@@ -1,9 +1,12 @@
# <a href='https://github.com/mrjackwills/oxker/releases/tag/v0.1.7'>v0.1.7</a>
### 2022-11-13
### Chores
+ update dependencies, closes #17, [8a5d0ef8376e3739dda5b0ed4c3e75e565deed45], [eadfc3d6c6896ecc8cff88c6a9e9c8b3e477c0cd]
+ aggressive linting with Rust 1.65.0, [8f3a15137155dc374e6b2822c9155c07d05d5e28]
+ update dependencies, closes [#17](https://github.com/mrjackwills/oxker/issues/17), [8a5d0ef8](https://github.com/mrjackwills/oxker/commit/8a5d0ef8376e3739dda5b0ed4c3e75e565deed45), [eadfc3d6](https://github.com/mrjackwills/oxker/commit/eadfc3d6c6896ecc8cff88c6a9e9c8b3e477c0cd)
+ aggressive linting with Rust 1.65.0, [8f3a1513](https://github.com/mrjackwills/oxker/commit/8f3a15137155dc374e6b2822c9155c07d05d5e28)
### Docs
+ README.md improved Download & Install section, and now available on [NixPkg](https://search.nixos.org/packages?channel=unstable&show=oxker&from=0&size=50&sort=relevance&type=packages&query=oxker), thanks [siph](https://github.com/siph), [67a9e183ca04199da758255075ff7e73061eb850]
+ README.md improved Download & Install section, and now available on [NixPkg](https://search.nixos.org/packages?channel=unstable&show=oxker&from=0&size=50&sort=relevance&type=packages&query=oxker), thanks [siph](https://github.com/siph), [67a9e183](https://github.com/mrjackwills/oxker/commit/67a9e183ca04199da758255075ff7e73061eb850)
# <a href='https://github.com/mrjackwills/oxker/releases/tag/v0.1.6'>v0.1.6</a>
### 2022-10-16
Cargo.lock
Generated
+1 -1
View File
@@ -514,7 +514,7 @@ checksum = "b15813163c1d831bf4a13c3610c05c0d03b39feb07f7e09fa234dac9b15aaf39"
[[package]]
name = "oxker"
version = "0.1.6"
version = "0.1.7"
dependencies = [
"anyhow",
"bollard",
Cargo.toml
+1 -1
View File
@@ -1,6 +1,6 @@
[package]
name = "oxker"
version = "0.1.6"
version = "0.1.7"
edition = "2021"
authors = ["Jack Wills <email@mrjackwills.com>"]
description = "A simple tui to view & control docker containers"
src/app_data/container_state.rs
+12 -7
View File
@@ -93,11 +93,10 @@ impl<T> StatefulList<T> {
pub fn previous(&mut self) {
if !self.items.is_empty() {
let i = self.state.selected().map_or(0, |i| if i == 0 {
0
} else {
i - 1
});
let i = self
.state
.selected()
.map_or(0, |i| if i == 0 { 0 } else { i - 1 });
self.state.select(Some(i));
}
}
@@ -398,12 +397,18 @@ impl ContainerItem {
/// Find the max value in the cpu stats VecDeque
fn max_cpu_stats(&self) -> CpuStats {
self.cpu_stats.iter().max().map_or_else(CpuStats::default, |value| *value)
self.cpu_stats
.iter()
.max()
.map_or_else(CpuStats::default, |value| *value)
}
/// Find the max value in the mem stats VecDeque
fn max_mem_stats(&self) -> ByteStats {
self.mem_stats.iter().max().map_or_else(ByteStats::default, |value| *value)
self.mem_stats
.iter()
.max()
.map_or_else(ByteStats::default, |value| *value)
}
/// Convert cpu stats into a vec for the charts function