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

chore: merge release-v0.1.11 into main

Browse Source
This commit is contained in:
Jack Wills
2023-01-03 19:23:31 +00:00
parent 2eaf209359 8bd6c94b49
commit ce2cf23ef6
10 changed files with 113 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.github/release-body.md
+5 -6
View File
@@ -1,17 +1,16 @@
### 2022-12-25
### 2023-01-03
### Chores
+ dependencies updated, [1525b3150293015c0fb2f2161da463b21ac2694c], [8d539ab14809136d743c49d60779687fc8eeef6d], [1774217a8a657d261397d213e5ecee667cf3b6b1]
+ Rust 1.66 linting, [bf9dcac7045c0d2314df147ec2744a3ad886564b]
+ dependencies updated, [9b09146aadae5727a5fee4de5fe0c1d70c581c22]
### Features
+ Caching on github action, [a91c9aa45ffd5c998cd1b83d8e90d0912893c31f]
+ `install.sh` script added, for automated platform selection, download, and installation, [7a42eba6b0968314af40ff87bcc42d288f6860bc], [e0703b76a1a28cfe266f130a7f7dec92f1b5ad58]
### Fixes
+ comment typo, [7899b773569fed86343a035d3023bf34297fdabb]
+ If a sort order is set, sort containers on every `update_stats()` execution, [cfdea77594e48c8c20a4d6e6c7ea31c9181361a1]
### Refactors
+ remove_ansi() to single liner, [57c3a6c186b916faba24bf7b5cdbbda31d636a7e]
+ input sort executed in app_data struct `sort_by_header()`, [3cdc5fae02097628799209f371ae9292e513e76c]
see <a href='https://github.com/mrjackwills/oxker/blob/main/CHANGELOG.md'>CHANGELOG.md</a> for more details
CHANGELOG.md
+15
View File
@@ -1,3 +1,18 @@
# <a href='https://github.com/mrjackwills/oxker/releases/tag/v0.1.11'>v0.1.11</a>
### 2023-01-03
### Chores
+ dependencies updated, [9b09146a](https://github.com/mrjackwills/oxker/commit/9b09146aadae5727a5fee4de5fe0c1d70c581c22)
### Features
+ `install.sh` script added, for automated platform selection, download, and installation, [7a42eba6](https://github.com/mrjackwills/oxker/commit/7a42eba6b0968314af40ff87bcc42d288f6860bc), [e0703b76](https://github.com/mrjackwills/oxker/commit/e0703b76a1a28cfe266f130a7f7dec92f1b5ad58)
### Fixes
+ If a sort order is set, sort containers on every `update_stats()` execution, [cfdea775](https://github.com/mrjackwills/oxker/commit/cfdea77594e48c8c20a4d6e6c7ea31c9181361a1)
### Refactors
+ input sort executed in app_data struct `sort_by_header()`, [3cdc5fae](https://github.com/mrjackwills/oxker/commit/3cdc5fae02097628799209f371ae9292e513e76c)
# <a href='https://github.com/mrjackwills/oxker/releases/tag/v0.1.10'>v0.1.10</a>
### 2022-12-25
Cargo.lock
Generated
+9 -9
View File
@@ -540,9 +540,9 @@ dependencies = [
[[package]]
name = "once_cell"
version = "1.16.0"
version = "1.17.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "86f0b0d4bf799edbc74508c1e8bf170ff5f41238e5f8225603ca7caaae2b7860"
checksum = "6f61fba1741ea2b3d6a1e3178721804bb716a68a6aeba1149b5d52e3d464ea66"
[[package]]
name = "os_str_bytes"
@@ -558,7 +558,7 @@ checksum = "b15813163c1d831bf4a13c3610c05c0d03b39feb07f7e09fa234dac9b15aaf39"
[[package]]
name = "oxker"
version = "0.1.9"
version = "0.1.10"
dependencies = [
"anyhow",
"bollard",
@@ -724,9 +724,9 @@ dependencies = [
[[package]]
name = "rustix"
version = "0.36.5"
version = "0.36.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a3807b5d10909833d3e9acd1eb5fb988f79376ff10fce42937de71a449c4c588"
checksum = "4feacf7db682c6c329c4ede12649cd36ecab0f3be5b7d74e6a20304725db4549"
dependencies = [
"bitflags",
"errno",
@@ -750,18 +750,18 @@ checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd"
[[package]]
name = "serde"
version = "1.0.151"
version = "1.0.152"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "97fed41fc1a24994d044e6db6935e69511a1153b52c15eb42493b26fa87feba0"
checksum = "bb7d1f0d3021d347a83e556fc4683dea2ea09d87bccdf88ff5c12545d89d5efb"
dependencies = [
"serde_derive",
]
[[package]]
name = "serde_derive"
version = "1.0.151"
version = "1.0.152"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "255abe9a125a985c05190d687b320c12f9b1f0b99445e608c21ba0782c719ad8"
checksum = "af487d118eecd09402d70a5d72551860e788df87b464af30e5ea6a38c75c541e"
dependencies = [
"proc-macro2",
"quote",
Cargo.toml
+1 -1
View File
@@ -1,6 +1,6 @@
[package]
name = "oxker"
version = "0.1.10"
version = "0.1.11"
edition = "2021"
authors = ["Jack Wills <email@mrjackwills.com>"]
description = "A simple tui to view & control docker containers"
README.md
+8
View File
@@ -49,6 +49,14 @@ install -Dm 755 oxker -t "${HOME}/.local/bin" &&
rm oxker_linux_x86_64.tar.gz oxker
```
or, for automatic platform selection, download, and installation (to `$HOME/.local/bin`)
*One should verify all scripts before running in your shell*
```bash
curl https://raw.githubusercontent.com/mrjackwills/oxker/main/install.sh | bash
```
## Run
```oxker```
create_release.sh
+1 -3
View File
@@ -153,7 +153,6 @@ check_tag () {
break;;
*)
error_close "invalid option $REPLY"
break;;
esac
done
}
@@ -268,8 +267,7 @@ main() {
do
case $choice in
0)
exit
break;;
exit;;
1)
cargo_test
main
install.sh
Executable
+14
View File
@@ -0,0 +1,14 @@
#!/bin/bash
case "$(arch)" in
x86_64) SUFFIX="x86_64";;
aarch64) SUFFIX="aarch64";;
armv6l) SUFFIX="armv6";;
esac
if [ -n "$SUFFIX" ]; then
wget "https://github.com/mrjackwills/oxker/releases/latest/download/oxker_linux_${SUFFIX}.tar.gz"
tar xzvf "oxker_linux_${SUFFIX}.tar.gz" oxker
install -Dm 755 oxker -t "${HOME}/.local/bin"
rm "oxker_linux_${SUFFIX}.tar.gz" oxker
fi
src/app_data/mod.rs
+41 -16
View File
@@ -56,21 +56,6 @@ impl fmt::Display for Header {
}
impl AppData {
pub const fn get_sorted(&self) -> Option<(Header, SortedOrder)> {
self.sorted_by
}
/// Change the sorted order, also set the selected container state to match new order
pub fn set_sorted(&mut self, x: Option<(Header, SortedOrder)>) {
self.sorted_by = x;
self.sort_containers();
self.containers
.state
.select(self.containers.items.iter().position(|i| {
self.get_selected_container_id()
.map_or(false, |id| i.id == id)
}));
}
/// Generate a default app_state
pub fn default(args: CliArgs) -> Self {
Self {
@@ -82,6 +67,41 @@ impl AppData {
}
}
pub const fn get_sorted(&self) -> Option<(Header, SortedOrder)> {
self.sorted_by
}
/// Remove the sorted header & order, and sort by default - created datetime
pub fn reset_sorted(&mut self) {
self.set_sorted(None);
}
/// Sort containers based on a given header, if headings match, and already ascending, remove sorting
pub fn set_sort_by_header(&mut self, selected_header: Header) {
let mut output = Some((selected_header, SortedOrder::Asc));
if let Some((current_header, order)) = self.get_sorted() {
if current_header == selected_header {
match order {
SortedOrder::Desc => output = None,
SortedOrder::Asc => output = Some((selected_header, SortedOrder::Desc)),
}
}
}
self.set_sorted(output);
}
/// Change the sorted order, also set the selected container state to match new order
fn set_sorted(&mut self, x: Option<(Header, SortedOrder)>) {
self.sorted_by = x;
self.sort_containers();
self.containers
.state
.select(self.containers.items.iter().position(|i| {
self.get_selected_container_id()
.map_or(false, |id| i.id == id)
}));
}
/// Current time as unix timestamp
#[allow(clippy::expect_used)]
fn get_systemtime() -> u64 {
@@ -185,7 +205,7 @@ impl AppData {
/// Sort the containers vec, based on a heading, either ascending or descending,
/// If not sort set, then sort by created time
fn sort_containers(&mut self) {
pub fn sort_containers(&mut self) {
if let Some((head, ord)) = self.sorted_by {
match head {
Header::State => match ord {
@@ -411,6 +431,7 @@ impl AppData {
}
/// Update container mem, cpu, & network stats, in single function so only need to call .lock() once
/// Will also, if a sort is set, sort the containers
pub fn update_stats(
&mut self,
id: &ContainerId,
@@ -439,6 +460,10 @@ impl AppData {
container.tx.update(tx);
container.mem_limit.update(mem_limit);
}
// need to benchmark this?
if self.get_sorted().is_some() {
self.sort_containers();
}
}
/// Update, or insert, containers
src/docker_data/mod.rs
+15 -12
View File
@@ -156,18 +156,20 @@ impl DockerData {
let docker = Arc::clone(&self.docker);
let app_data = Arc::clone(&self.app_data);
let spawns = Arc::clone(&self.spawns);
let key = SpawnId::Stats((id.clone(), self.binate));
let spawn_key = key.clone();
self.spawns.lock().entry(key).or_insert_with(|| {
tokio::spawn(Self::update_container_stat(
docker,
id.clone(),
app_data,
*is_running,
spawns,
spawn_key,
))
});
let spawn_key = SpawnId::Stats((id.clone(), self.binate));
self.spawns
.lock()
.entry(spawn_key.clone())
.or_insert_with(|| {
tokio::spawn(Self::update_container_stat(
docker,
id.clone(),
app_data,
*is_running,
spawns,
spawn_key,
))
});
}
self.binate = self.binate.toggle();
}
@@ -299,6 +301,7 @@ impl DockerData {
}
};
self.update_all_container_stats(&all_ids);
self.app_data.lock().sort_containers();
}
/// Animate the loading icon
src/input_handler/mod.rs
+4 -14
View File
@@ -18,7 +18,7 @@ use tui::layout::Rect;
mod message;
use crate::{
app_data::{AppData, DockerControls, Header, SortedOrder},
app_data::{AppData, DockerControls, Header},
app_error::AppError,
docker_data::DockerMessage,
ui::{GuiState, SelectablePanel, Status},
@@ -121,19 +121,9 @@ impl InputHandler {
self.mouse_capture = !self.mouse_capture;
}
/// Sort containers based on a given header, if headings match, and already ascending, remove sorting
/// Sort the containers by a given header
fn sort(&self, selected_header: Header) {
let mut locked_data = self.app_data.lock();
let mut output = Some((selected_header, SortedOrder::Asc));
if let Some((current_header, order)) = locked_data.get_sorted() {
if current_header == selected_header {
match order {
SortedOrder::Desc => output = None,
SortedOrder::Asc => output = Some((selected_header, SortedOrder::Desc)),
}
}
}
locked_data.set_sorted(output);
self.app_data.lock().set_sort_by_header(selected_header);
}
/// Send a quit message to docker, to abort all spawns, if an error is returned, set is_running to false here instead
@@ -173,7 +163,7 @@ impl InputHandler {
}
} else {
match key_code {
KeyCode::Char('0') => self.app_data.lock().set_sorted(None),
KeyCode::Char('0') => self.app_data.lock().reset_sorted(),
KeyCode::Char('1') => self.sort(Header::State),
KeyCode::Char('2') => self.sort(Header::Status),
KeyCode::Char('3') => self.sort(Header::Cpu),