"]
description = "A simple tui to view & control docker containers"
repository = "https://github.com/mrjackwills/oxker"
homepage = "https://github.com/mrjackwills/oxker"
license = "MIT"
+rust-version = "1.90.0"
readme = "README.md"
keywords = ["docker", "tui", "tokio", "terminal", "podman"]
categories = ["command-line-utilities"]
@@ -15,8 +16,6 @@ categories = ["command-line-utilities"]
unsafe_code = "forbid"
[lints.clippy]
-nursery = { level = "warn", priority = -1 }
-pedantic = { level = "warn", priority = -1 }
expect_used = "warn"
todo = "warn"
unused_async = "warn"
@@ -27,7 +26,7 @@ similar_names = "allow"
[dependencies]
anyhow = "1.0"
-bollard = "0.19"
+bollard = "0.20"
cansi = "2.2"
clap = { version = "4.5", features = ["color", "derive", "unicode"] }
crossterm = "0.29"
@@ -35,16 +34,20 @@ directories = "6.0"
futures-util = "0.3"
jiff = { version = "0.2", features = ["tzdb-bundle-always"] }
parking_lot = { version = "0.12" }
-ratatui = "0.29"
+ratatui = "0.30"
serde = { version = "1.0", features = ["derive"] }
-serde_json = "1.0"
+serde_json = { version = "1.0"}
serde_jsonc = "1.0"
-tokio = { version = "1.47", features = ["full"] }
+tokio = { version = "1.49", features = ["full"] }
tokio-util = "0.7"
-toml = { version = "0.9", default-features = false, features = ["parse", "serde"] }
+toml = { version = "1.0", default-features = false, features = ["parse", "serde"] }
tracing = "0.1"
tracing-subscriber = "0.3"
-uuid = { version = "1.18", features = ["fast-rng", "v4"] }
+uuid = { version = "1.21", features = ["fast-rng", "v4"] }
+
+[dev-dependencies]
+insta = "1.46"
+serde_json = { version = "1.0", features = ["preserve_order"]}
[profile.release]
lto = true
@@ -53,5 +56,4 @@ panic = 'abort'
strip = true
debug = false
-[dev-dependencies]
-insta = "1.42.2"
+
diff --git a/README.md b/README.md
index 7aaaa01..394121f 100644
--- a/README.md
+++ b/README.md
@@ -10,10 +10,12 @@
+
+
link to alternative screenshot
@@ -111,7 +113,7 @@ In application controls, these, amongst many other settings, can be customized w
|--|--|
| ```( tab )``` or ```( shift+tab )``` | Change panel, clicking on a panel also changes the selected panel.|
| ```( โ โ )``` or ```( j k )``` or ```( Home End )```| Scroll line in selected panel - mouse wheel will also scroll.|
-| ```( โ โ )``` | When logs panel selected, scroll horizontally across the text of the logs.|
+| ```( โ โ )``` | Scroll horizontally across text.|
| ```( ctrl )``` | Increase scroll speed, used in conjunction with scroll keys.|
| ```( enter )```| Run selected docker command.|
| ```( 1-9 )``` | Sort containers by heading, clicking on headings also sorts the selected column. |
@@ -121,6 +123,7 @@ In application controls, these, amongst many other settings, can be customized w
| ```( - ) ``` or ```(=)``` | Reduce or increase the height of the logs panel.|
| ```( \ )``` | Toggle the visibility of the logs panel.|
| ```( e )``` | Exec into the selected container - not available on Windows.|
+| ```( i )``` | Enter container inspect mode. |
| ```( f )``` | Force clear the screen & redraw the gui.|
| ```( h )``` | Toggle help menu.|
| ```( m )``` | Toggle mouse capture - if disabled, text on screen can be selected.|
diff --git a/containerised/DOCKERHUB_README.md b/containerised/DOCKERHUB_README.md
index d073b02..4a0b238 100644
--- a/containerised/DOCKERHUB_README.md
+++ b/containerised/DOCKERHUB_README.md
@@ -8,9 +8,15 @@
-
- 
+
+ 
+
+
+
+ link to alternative screenshot
+
+
## Run
diff --git a/containerised/Dockerfile b/containerised/Dockerfile
index e05760a..0f93266 100644
--- a/containerised/Dockerfile
+++ b/containerised/Dockerfile
@@ -6,7 +6,7 @@ FROM --platform=$BUILDPLATFORM rust:slim AS builder
ARG TARGETARCH
-# These are build platform depandant, but will be ignored if not needed
+# These are build platform dependant, but will be ignored if not needed
ENV CARGO_TARGET_AARCH64_UNKNOWN_LINUX_MUSL_LINKER="aarch64-linux-gnu-gcc"
ENV CARGO_TARGET_AARCH64_UNKNOWN_LINUX_MUSL_RUSTFLAGS="-C target-feature=+crt-static -C link-arg=-lgcc"
ENV CARGO_TARGET_ARM_UNKNOWN_LINUX_MUSLEABIHF_LINKER="arm-linux-gnueabihf-ld"
diff --git a/create_release.sh b/create_release.sh
index 8b50e64..393ccbf 100755
--- a/create_release.sh
+++ b/create_release.sh
@@ -232,8 +232,12 @@ cross_build_x86_windows() {
# Build, using zig-build, for Apple silicon
zig_build_aarch64_apple() {
# mkdir /workspace/oxker/target
- echo -e "${YELLOW}docker run --rm -v $(pwd):/io -w /io ghcr.io/rust-cross/cargo-zigbuild cargo zigbuild --release --target aarch64-apple-darwin${RESET}"
- docker run --rm -v "$(pwd):/io" -w /io ghcr.io/rust-cross/cargo-zigbuild cargo zigbuild --release --target aarch64-apple-darwin
+ echo -e "${YELLOW}docker run --rm -v $(pwd):/io -w /io ghcr.io/rust-cross/cargo-zigbuild bash -e -c 'rustup update stable && rustup default stable && rustup target add aarch64-apple-darwin && cargo zigbuild --release --target aarch64-apple-darwin${RESET}"
+
+ docker run --rm -v "$(pwd):/io" -w /io \
+ ghcr.io/rust-cross/cargo-zigbuild \
+ bash -ec 'rustup update stable && rustup default stable && rustup target add aarch64-apple-darwin && cargo zigbuild --release --target aarch64-apple-darwin'
+
if ask_yn "sudo chown $(pwd)/target"; then
echo -e "${YELLOW}sudo chown -R vscode:vscode $(pwd)/target${RESET}"
sudo chown -R vscode:vscode "$(pwd)/target"
diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml
index 7c58aac..2ef1418 100644
--- a/docker/docker-compose.yml
+++ b/docker/docker-compose.yml
@@ -4,7 +4,7 @@ networks:
name: oxker-examaple-net
services:
postgres:
- image: postgres:17-alpine
+ image: postgres:18-alpine
container_name: postgres
environment:
- POSTGRES_PASSWORD=never_use_this_password_in_production
diff --git a/example_config/example.config.jsonc b/example_config/example.config.jsonc
index 3b1f8fd..db1251f 100644
--- a/example_config/example.config.jsonc
+++ b/example_config/example.config.jsonc
@@ -18,8 +18,8 @@
"show_timestamp": true,
// Don't draw gui - for debugging - mostly pointless
"gui": true,
- // Docker host location
- "host": "/var/run/docker.sock",
+ // Docker host location. Will take priority over a DOCKER_HOST env.
+ // "host": "/var/run/docker.sock",
// Display the timestamp in a custom format, if given option is invalid, it will default to %Y-%m-%dT%H:%M:%S.%8f -> 2025-02-18T12:34:56.01234567
// *Should* accept any valid strftime string up to 32 chars, see https://strftime.org/
"timestamp_format": "%Y-%m-%dT%H:%M:%S.%8f",
@@ -104,10 +104,10 @@
"k"
],
// Horizontal scroll of the logs
- "log_scroll_forward": [
+ "scroll_forward": [
"right"
],
- "log_scroll_back": [
+ "scroll_back": [
"left"
],
// Select next panel
@@ -170,6 +170,10 @@
"log_section_toggle": [
"\\"
],
+ // Toggle to inspect container screen
+ "inspect": [
+ "i"
+ ],
// Force a complete clear & redraw of the screen
"force_redraw": [
"f"
@@ -280,6 +284,27 @@
// Ports & IP listing text
"text": "white"
},
+ // The bandwidth chart
+ "chart_bandwidth": {
+ //Background color of panel
+ "background": "reset",
+ // Border color
+ "border": "white",
+ // Maximum RX value - again paused & stopped colors not yet customizable
+ "max_rx": "#FFE9C1",
+ // # Maximum TX value - again paused & stopped colors not yet customizable
+ "max_tx": "#CD8C8C",
+ // RX points on the chart - again paused & stopped colors not yet customizable
+ "points_rx": "#FFE9C1",
+ // TX points on the chart - again paused & stopped colors not yet customizable
+ "points_tx": "#CD8C8C",
+ // RX title color
+ "title_rx": "#FFE9C1",
+ // TX title color
+ "title_tx": "#CD8C8C",
+ // The charts y-axis
+ "y_axis": "white"
+ },
// The filter panel
"filter": {
// Background color of panel
diff --git a/example_config/example.config.toml b/example_config/example.config.toml
index 8d5f1db..1b1a0c1 100644
--- a/example_config/example.config.toml
+++ b/example_config/example.config.toml
@@ -24,8 +24,8 @@ show_timestamp = true
# Don't draw gui - for debugging - mostly pointless
gui = true
-# Docker host location
-host = "/var/run/docker.sock"
+# Docker host location. Will take priority over a DOCKER_HOST env.
+# host = "/var/run/docker.sock"
# Display the container logs timestamp with a given timezone, if timezone is unknown, defaults to UTC
timezone = "Etc/UTC"
@@ -95,8 +95,8 @@ scroll_start = ["home"]
# scroll up a list by one item
scroll_up = ["up", "k"]
# Horizontal scroll of the logs
-log_scroll_forward = ["right"]
-log_scroll_back = ["left"]
+scroll_forward = ["right"]
+scroll_back = ["left"]
# Select next panel
select_next_panel = ["tab"]
# Select previous panel
@@ -122,6 +122,8 @@ log_section_height_decrease = ["-"]
log_section_height_increase = ["+"]
# Toggle visibility of the log section
log_section_toggle = ["\\"]
+# Toggle to inspect container screen
+inspect = ["i"]
@@ -254,6 +256,27 @@ points = "cyan"
# The charts y-axis
y_axis = "white"
+# The bandwidth chart
+[colors.chart_bandwidth]
+# Background color of panel
+background = "reset"
+# Border color
+border = "white"
+# Maximum RX value - again paused & stopped colors not yet customizable
+max_rx = "#FFE9C1"
+# Maximum TX value - again paused & stopped colors not yet customizable
+max_tx = "#CD8C8C"
+# RX points on the chart - again paused & stopped colors not yet customizable
+points_rx = "#FFE9C1"
+# TX points on the chart - again paused & stopped colors not yet customizable
+points_tx = "#CD8C8C"
+# TX title color
+title_tx = "#FFE9C1"
+# RX title color
+title_rx = "#CD8C8C"
+# The charts y-axis
+y_axis = "white"
+
# The ports chart
[colors.chart_ports]
# Background color of panel
diff --git a/src/app_data/container_state.rs b/src/app_data/container_state.rs
index 11e39b3..252d982 100644
--- a/src/app_data/container_state.rs
+++ b/src/app_data/container_state.rs
@@ -5,7 +5,7 @@ use std::{
net::IpAddr,
};
-use bollard::service::Port;
+use bollard::secret::{ContainerSummaryHealthStatusEnum, PortSummary};
use jiff::{Timestamp, tz::TimeZone};
use ratatui::{
layout::Size,
@@ -24,8 +24,12 @@ const ONE_GB: f64 = ONE_MB * 1000.0;
#[derive(Debug, Clone, Eq, Hash, PartialEq)]
pub enum ScrollDirection {
- Next,
- Previous,
+ // Next,
+ // Previous,
+ Up,
+ Down,
+ Left,
+ Right,
}
#[derive(Debug, Clone, Eq, Hash, PartialEq)]
@@ -121,8 +125,8 @@ pub struct ContainerPorts {
pub public: Option,
}
-impl From for ContainerPorts {
- fn from(value: Port) -> Self {
+impl From for ContainerPorts {
+ fn from(value: PortSummary) -> Self {
Self {
ip: value.ip.and_then(|i| i.parse::().ok()),
private: value.private_port,
@@ -185,8 +189,10 @@ impl StatefulList {
pub fn scroll(&mut self, scroll: &ScrollDirection) {
match scroll {
- ScrollDirection::Next => self.next(),
- ScrollDirection::Previous => self.previous(),
+ ScrollDirection::Down => self.next(),
+ ScrollDirection::Up => self.previous(),
+ // TODO set offset
+ _ => (),
}
}
@@ -414,7 +420,7 @@ impl fmt::Display for State {
}
/// Items for the container control list
-#[derive(Debug, Clone, Copy, PartialEq, Eq)]
+#[derive(Debug, Clone, Copy, PartialEq, Eq, PartialOrd, Ord)]
pub enum DockerCommand {
Pause,
Restart,
@@ -570,8 +576,116 @@ impl fmt::Display for ByteStats {
}
}
-pub type MemTuple = (Vec<(f64, f64)>, ByteStats, State);
-pub type CpuTuple = (Vec<(f64, f64)>, CpuStats, State);
+#[derive(Debug, Default, Clone, Copy, Eq)]
+pub struct BandwidthStat(u64);
+
+#[cfg(test)]
+impl BandwidthStat {
+ pub fn new(x: u64) -> Self {
+ Self(x)
+ }
+}
+
+impl PartialEq for BandwidthStat {
+ fn eq(&self, other: &Self) -> bool {
+ self.0 == other.0
+ }
+}
+
+impl PartialOrd for BandwidthStat {
+ fn partial_cmp(&self, other: &Self) -> Option {
+ Some(self.cmp(other))
+ }
+}
+
+impl Ord for BandwidthStat {
+ fn cmp(&self, other: &Self) -> Ordering {
+ self.0.cmp(&other.0)
+ }
+}
+
+#[allow(clippy::cast_precision_loss)]
+impl Stats for BandwidthStat {
+ fn get_value(&self) -> f64 {
+ self.0 as f64
+ }
+}
+
+/// convert from bytes to per second, using 1000 instead of 1024
+impl fmt::Display for BandwidthStat {
+ fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
+ let as_f64 = self.get_value();
+ let p = match as_f64 {
+ x if x >= ONE_GB => format!("{y:.2} GB/s", y = as_f64 / ONE_GB),
+ x if x >= ONE_MB => format!("{y:.2} Mb/s", y = as_f64 / ONE_MB),
+ _ => format!("{y:.2} kb/s", y = as_f64 / ONE_KB),
+ };
+ write!(f, "{p:>x$}", x = f.width().unwrap_or(1))
+ }
+}
+
+#[derive(Debug, Clone, PartialEq, Eq)]
+pub struct NetworkBandwidth(VecDeque);
+
+impl NetworkBandwidth {
+ pub fn new() -> Self {
+ Self(VecDeque::with_capacity(60))
+ }
+
+ pub fn is_empty(&self) -> bool {
+ self.0.is_empty()
+ }
+
+ /// Find the highest speed recorded in the vecque
+ pub fn max(&self) -> BandwidthStat {
+ self.to_vec_f64()
+ .iter()
+ .map(|(_, speed)| *speed)
+ .max_by(|a, b| a.total_cmp(b))
+ .map(|m| BandwidthStat(m as u64))
+ .unwrap_or(BandwidthStat(0))
+ }
+
+ pub fn push(&mut self, x: u64) {
+ if self.0.len() >= 60 {
+ self.0.pop_front();
+ }
+ self.0.push_back(BandwidthStat(x));
+ }
+
+ /// Get the current total amount of traffic on a given device
+ pub fn current_total(&self) -> ByteStats {
+ self.0
+ .back()
+ .map_or(ByteStats::default(), |i| ByteStats::new(i.0))
+ }
+
+ /// Convert to f64 for use in the network graph
+ pub fn to_vec_f64(&self) -> Vec<(f64, f64)> {
+ self.0
+ .iter()
+ .zip(self.0.iter().skip(1))
+ .enumerate()
+ .map(|(i, (prev, current))| (i as f64, current.0.saturating_sub(prev.0) as f64))
+ .collect()
+ }
+}
+
+#[derive(Debug, Clone, PartialEq)]
+pub struct ChartsData {
+ pub memory: ChartSeries,
+ pub cpu: ChartSeries,
+ pub rx: ChartSeries,
+ pub tx: ChartSeries,
+ pub state: State,
+}
+
+#[derive(Debug, Clone, PartialEq)]
+pub struct ChartSeries {
+ pub dataset: Vec<(f64, f64)>,
+ pub max: T,
+ pub current: T,
+}
/// Used to make sure that each log entry, for each container, is unique,
/// will only push a log entry into the logs vec if timestamp of said log entry isn't in the hashset
@@ -615,7 +729,8 @@ pub struct Logs {
tz: HashSet,
search_results: Vec,
search_term: Option,
- offset: u16,
+ offset: usize,
+ max_offset: usize,
max_log_len: usize,
adjusted_max_width: usize,
adjust_max_width_text_len: usize,
@@ -629,6 +744,7 @@ impl Default for Logs {
lines,
tz: HashSet::new(),
offset: 0,
+ max_offset: 0,
search_term: None,
search_results: vec![],
adjusted_max_width: 0,
@@ -687,23 +803,26 @@ impl Logs {
.position(|i| i == ¤t_selected)
{
if let Some(new_index) = match sd {
- ScrollDirection::Next => current_position.checked_add(1),
- ScrollDirection::Previous => current_position.checked_sub(1),
- } {
- if let Some(f) = self.search_results.get(new_index) {
- self.lines.state.select(Some(*f));
- return Some(());
- }
+ ScrollDirection::Down => current_position.checked_add(1),
+ ScrollDirection::Up => current_position.checked_sub(1),
+ // TODO set offset
+ _ => None,
+ } && let Some(f) = self.search_results.get(new_index)
+ {
+ self.lines.state.select(Some(*f));
+ return Some(());
}
} else {
let range = match sd {
- ScrollDirection::Previous => (0..=current_selected).rev().collect::>(),
- ScrollDirection::Next => (current_selected
+ ScrollDirection::Up => (0..=current_selected).rev().collect::>(),
+ ScrollDirection::Down => (current_selected
..=self
.search_results
.last()
.map_or_else(|| current_selected, |i| *i))
.collect::>(),
+ // TODO set offset
+ _ => vec![],
};
for i in range {
if self.search_results.contains(&i) {
@@ -821,7 +940,7 @@ impl Logs {
if self.horizontal_scroll_able(width) {
let text_width = self.adjust_max_width_text_len;
let arrow_left = if self.offset > 0 { " โ" } else { " " };
- let arrow_right = if usize::from(self.offset) < self.adjusted_max_width {
+ let arrow_right = if self.offset < self.adjusted_max_width {
"โ "
} else {
" "
@@ -884,10 +1003,10 @@ impl Logs {
pub fn get_visible_logs(&self, size: Size, padding: usize) -> Vec> {
let current_index = self.lines.state.selected().unwrap_or_default();
let height_padding = usize::from(size.height) + padding;
- let char_offset = if usize::from(self.offset) > self.max_log_len {
+ let char_offset = if self.offset > self.max_log_len {
self.max_log_len
} else {
- self.offset.into()
+ self.offset
};
self.lines
@@ -921,11 +1040,12 @@ impl Logs {
/// Add a padding so one char will always be visilbe?
pub fn forward(&mut self, width: u16) {
- let offset = usize::from(self.offset);
- if self.horizontal_scroll_able(width) {
- if self.adjusted_max_width > 0 && offset < self.adjusted_max_width {
- self.offset = self.offset.saturating_add(1);
- }
+ // Need to set a max_offset, instead of using a width each time
+ if self.horizontal_scroll_able(width)
+ && self.adjusted_max_width > 0
+ && self.offset < self.adjusted_max_width
+ {
+ self.offset = self.offset.saturating_add(1);
}
}
@@ -970,6 +1090,7 @@ pub struct ContainerItem {
pub cpu_stats: VecDeque,
pub created: u64,
pub docker_controls: StatefulList,
+ pub health: Option,
pub id: ContainerId,
pub image: ContainerImage,
pub is_oxker: bool,
@@ -979,10 +1100,10 @@ pub struct ContainerItem {
pub mem_stats: VecDeque,
pub name: ContainerName,
pub ports: Vec,
- pub rx: ByteStats,
+ pub rx: NetworkBandwidth,
pub state: State,
pub status: ContainerStatus,
- pub tx: ByteStats,
+ pub tx: NetworkBandwidth,
}
/// Basic display information, for when running in debug mode
@@ -1019,6 +1140,7 @@ impl ContainerItem {
cpu_stats: VecDeque::with_capacity(60),
created,
docker_controls,
+ health: None,
id,
image: image.into(),
is_oxker,
@@ -1028,10 +1150,10 @@ impl ContainerItem {
mem_stats: VecDeque::with_capacity(60),
name: name.into(),
ports,
- rx: ByteStats::default(),
+ rx: NetworkBandwidth::new(),
state,
status,
- tx: ByteStats::default(),
+ tx: NetworkBandwidth::new(),
}
}
@@ -1057,7 +1179,7 @@ impl ContainerItem {
self.cpu_stats
.iter()
.enumerate()
- .map(|i| (i.0 as f64, i.1.0))
+ .map(|(i, v)| (i as f64, v.0))
.collect::>()
}
@@ -1067,24 +1189,65 @@ impl ContainerItem {
self.mem_stats
.iter()
.enumerate()
- .map(|i| (i.0 as f64, i.1.0 as f64))
+ .map(|(i, v)| (i as f64, v.0 as f64))
.collect::>()
}
/// Get all cpu chart data
- fn get_cpu_chart_data(&self) -> CpuTuple {
- (self.get_cpu_dataset(), self.max_cpu_stats(), self.state)
+ fn get_cpu_chart_data(&self) -> ChartSeries {
+ ChartSeries {
+ dataset: self.get_cpu_dataset(),
+ max: self.max_cpu_stats(),
+ current: self
+ .cpu_stats
+ .back()
+ .map_or_else(|| CpuStats::new(0.0), |i| *i),
+ }
}
/// Get all mem chart data
- fn get_mem_chart_data(&self) -> MemTuple {
- (self.get_mem_dataset(), self.max_mem_stats(), self.state)
+ fn get_mem_chart_data(&self) -> ChartSeries {
+ ChartSeries {
+ dataset: self.get_mem_dataset(),
+ max: self.max_mem_stats(),
+ current: self
+ .mem_stats
+ .back()
+ .map_or_else(|| ByteStats::new(0), |i| *i),
+ }
+ }
+
+ /// Get all mem chart data
+ /// Don't understand what we are doing here
+ fn get_bandwidth_chart_tx_data(&self) -> ChartSeries {
+ let data = self.tx.to_vec_f64();
+ ChartSeries {
+ current: BandwidthStat(data.last().map_or(0, |i| i.1 as u64)),
+ dataset: data,
+ max: self.tx.max(),
+ }
+ }
+
+ /// Get all mem chart data
+ fn get_bandwidth_chart_rx_data(&self) -> ChartSeries {
+ let data = self.rx.to_vec_f64();
+ ChartSeries {
+ current: BandwidthStat(data.last().map_or(0, |i| i.1 as u64)),
+ dataset: data,
+ max: self.rx.max(),
+ }
}
/// Get chart info for cpu & memory in one function
/// So only need to call .lock() once
- pub fn get_chart_data(&self) -> (CpuTuple, MemTuple) {
- (self.get_cpu_chart_data(), self.get_mem_chart_data())
+ pub fn get_chart_data(&self) -> ChartsData {
+ ChartsData {
+ memory: self.get_mem_chart_data(),
+ cpu: self.get_cpu_chart_data(),
+ rx: self.get_bandwidth_chart_rx_data(),
+ tx: self.get_bandwidth_chart_tx_data(),
+ state: self.state,
+ }
}
}
diff --git a/src/app_data/mod.rs b/src/app_data/mod.rs
index 1139ad6..9e05986 100644
--- a/src/app_data/mod.rs
+++ b/src/app_data/mod.rs
@@ -1,4 +1,4 @@
-use bollard::models::ContainerSummary;
+use bollard::{models::ContainerSummary, secret::ContainerInspectResponse};
use core::fmt;
use parking_lot::Mutex;
use ratatui::{layout::Size, text::Text, widgets::ListState};
@@ -114,6 +114,45 @@ impl Filter {
}
}
+#[derive(Debug, Clone)]
+pub struct InspectData {
+ pub width: usize,
+ pub height: usize,
+ pub as_string: String,
+ pub name: String,
+ pub id: ContainerId, // pub as_lines: Vec>,
+}
+
+impl From for InspectData {
+ fn from(input: ContainerInspectResponse) -> Self {
+ let as_string = serde_json::to_string_pretty(&input)
+ .unwrap_or_default()
+ .lines()
+ .skip(1)
+ .collect::>()
+ .split_last()
+ .map(|(_, data)| data)
+ .unwrap_or_default()
+ .join("\n");
+
+ let height = as_string.lines().count();
+
+ let mut width = 0;
+ for i in as_string.lines() {
+ width = width.max(i.chars().count());
+ }
+
+ Self {
+ name: input.name.unwrap_or_default(),
+ // TODO maybe make this an Option?
+ id: ContainerId::from(input.id.unwrap_or_default().as_str()),
+ width,
+ height,
+ as_string,
+ }
+ }
+}
+
/// Global app_state, stored in an Arc
#[derive(Debug, Clone)]
#[cfg(not(test))]
@@ -122,6 +161,7 @@ pub struct AppData {
error: Option,
filter: Filter,
hidden_containers: Vec,
+ inspect_data: Option,
rerender: Arc,
sorted_by: Option<(Header, SortedOrder)>,
current_sorted_id: Vec,
@@ -136,6 +176,7 @@ pub struct AppData {
pub error: Option,
pub filter: Filter,
pub hidden_containers: Vec,
+ pub inspect_data: Option,
pub current_sorted_id: Vec,
pub rerender: Arc,
pub sorted_by: Option<(Header, SortedOrder)>,
@@ -151,6 +192,7 @@ impl AppData {
error: None,
filter: Filter::new(),
hidden_containers: vec![],
+ inspect_data: None,
rerender: Arc::clone(redraw),
sorted_by: None,
}
@@ -165,6 +207,18 @@ impl AppData {
.as_secs()
}
+ pub fn clear_inspect_data(&mut self) {
+ self.inspect_data = None;
+ }
+
+ pub fn set_inspect_data(&mut self, data: ContainerInspectResponse) {
+ self.inspect_data = Some(InspectData::from(data))
+ // self.inspect_data = Some(data)
+ }
+
+ pub fn get_inspect_data(&self) -> Option {
+ self.inspect_data.clone()
+ }
/// Filter related methods
/// Get the filterby and filter_term
pub const fn get_filter(&self) -> (FilterBy, Option<&String>) {
@@ -172,10 +226,10 @@ impl AppData {
}
pub fn log_search_scroll(&mut self, np: &ScrollDirection) {
- if let Some(i) = self.get_mut_selected_container() {
- if i.logs.search_scroll(np).is_some() {
- self.rerender.update_draw();
- }
+ if let Some(i) = self.get_mut_selected_container()
+ && i.logs.search_scroll(np).is_some()
+ {
+ self.rerender.update_draw();
}
}
@@ -329,6 +383,7 @@ impl AppData {
.iter()
.position(|i| self.get_selected_container_id().as_ref() == Some(&i.id)),
);
+ self.rerender.update_draw();
}
/// Remove the sorted header & order, and sort by default - created datetime
@@ -340,12 +395,12 @@ impl AppData {
/// 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)),
- }
+ if let Some((current_header, order)) = self.get_sorted()
+ && current_header == selected_header
+ {
+ match order {
+ SortedOrder::Desc => output = None,
+ SortedOrder::Asc => output = Some((selected_header, SortedOrder::Desc)),
}
}
self.set_sorted(output);
@@ -412,12 +467,14 @@ impl AppData {
Header::Rx => item_ord
.0
.rx
- .cmp(&item_ord.1.rx)
+ .current_total()
+ .cmp(&item_ord.1.rx.current_total())
.then_with(|| item_ord.0.name.get().cmp(item_ord.1.name.get())),
Header::Tx => item_ord
.0
.tx
- .cmp(&item_ord.1.tx)
+ .current_total()
+ .cmp(&item_ord.1.tx.current_total())
.then_with(|| item_ord.0.name.get().cmp(item_ord.1.name.get())),
Header::Name => item_ord
.0
@@ -459,7 +516,6 @@ impl AppData {
/// Get all the ContainerItems
/// Thnk this allow block can be removed with the 1.87 release of Clippy
- #[allow(clippy::missing_const_for_fn)]
pub fn get_container_items(&self) -> &[ContainerItem] {
&self.containers.items
}
@@ -556,10 +612,17 @@ impl AppData {
}
/// Get a mutable container by given id
+ #[cfg(not(test))]
fn get_container_by_id(&mut self, id: &ContainerId) -> Option<&mut ContainerItem> {
self.containers.items.iter_mut().find(|i| &i.id == id)
}
+ /// As above, but make it public to testing
+ #[cfg(test)]
+ pub fn get_container_by_id(&mut self, id: &ContainerId) -> Option<&mut ContainerItem> {
+ self.containers.items.iter_mut().find(|i| &i.id == id)
+ }
+
/// Get a mutable container by given id in the tmp_container vec
fn get_hidden_container_by_id(&mut self, id: &ContainerId) -> Option<&mut ContainerItem> {
self.hidden_containers.iter_mut().find(|i| &i.id == id)
@@ -637,7 +700,7 @@ impl AppData {
.map(|i| &mut i.docker_controls.state)
}
- /// Get mutable Option of the currently selected container DockerConmand items
+ /// Get mutable Option of the currently selected container DockerCommand items
pub fn get_control_items(&mut self) -> Option<&mut Vec> {
self.get_mut_selected_container()
.map(|i| &mut i.docker_controls.items)
@@ -668,19 +731,22 @@ impl AppData {
}
pub fn logs_horizontal_scroll(&mut self, sd: &ScrollDirection, width: u16) {
+ // Change this to set a max_offset, instead of taking in width each time, then can be combined with the log_scroll beneath
match sd {
- ScrollDirection::Next => {
+ ScrollDirection::Down => {
if let Some(i) = self.get_mut_selected_container() {
i.logs.forward(width);
self.rerender.update_draw();
}
}
- ScrollDirection::Previous => {
+ ScrollDirection::Up => {
if let Some(i) = self.get_mut_selected_container() {
i.logs.back();
self.rerender.update_draw();
}
}
+ // TODO set offset
+ _ => (),
}
}
@@ -688,8 +754,10 @@ impl AppData {
pub fn log_scroll(&mut self, scroll: &ScrollDirection) {
if let Some(i) = self.get_mut_selected_container() {
match scroll {
- ScrollDirection::Next => i.logs.next(),
- ScrollDirection::Previous => i.logs.previous(),
+ ScrollDirection::Down => i.logs.next(),
+ ScrollDirection::Up => i.logs.previous(),
+ // TODO set offset
+ _ => (),
}
self.rerender.update_draw();
}
@@ -731,7 +799,7 @@ impl AppData {
/// Chart data related methods
/// Get mutable Option of the currently selected container chart data
- pub fn get_chart_data(&self) -> Option<(CpuTuple, MemTuple)> {
+ pub fn get_chart_data(&self) -> Option {
self.containers
.state
.selected()
@@ -780,6 +848,7 @@ impl AppData {
for container in [&self.containers.items, &self.hidden_containers] {
for container in container {
+ // TODO refactor these
let cpu_count = container.cpu_stats.back().map_or_else(
|| count(&CpuStats::default().to_string()),
|i| count(&i.to_string()),
@@ -789,14 +858,19 @@ impl AppData {
|| count(&ByteStats::default().to_string()),
|i| count(&i.to_string()),
);
-
columns.cpu.1 = columns.cpu.1.max(cpu_count);
columns.image.1 = columns.image.1.max(count(&container.image.to_string()));
columns.mem.1 = columns.mem.1.max(mem_current_count);
columns.mem.2 = columns.mem.2.max(count(&container.mem_limit.to_string()));
columns.name.1 = columns.name.1.max(count(&container.name.to_string()));
- columns.net_rx.1 = columns.net_rx.1.max(count(&container.rx.to_string()));
- columns.net_tx.1 = columns.net_tx.1.max(count(&container.tx.to_string()));
+ columns.net_rx.1 = columns
+ .net_rx
+ .1
+ .max(count(&container.rx.current_total().to_string()));
+ columns.net_tx.1 = columns
+ .net_tx
+ .1
+ .max(count(&container.tx.current_total().to_string()));
columns.state.1 = columns.state.1.max(count(&container.state.to_string()));
columns.status.1 = columns.status.1.max(count(container.status.get()));
}
@@ -840,8 +914,12 @@ impl AppData {
container.mem_stats.push_back(ByteStats::new(mem));
}
- container.rx.update(rx);
- container.tx.update(tx);
+ // Only insert if alive, or if is empty, need two to create an entry in the bandwidth chart, so instead this fills in the RX/TX total columns
+ if container.rx.is_empty() || container.state.is_alive() {
+ container.rx.push(rx);
+ container.tx.push(tx);
+ }
+
container.mem_limit.update(mem_limit);
}
if self.is_selected_container(id) {
@@ -877,7 +955,7 @@ impl AppData {
// If removed container is currently selected, then change selected to previous
// This will default to 0 in any edge cases
if self.containers.state.selected().is_some() {
- self.containers.scroll(&ScrollDirection::Previous);
+ self.containers.scroll(&ScrollDirection::Up);
}
// Check is some, else can cause out of bounds error, if containers get removed before a docker update
if self.containers.items.get(index).is_some() {
@@ -896,7 +974,7 @@ impl AppData {
if f.starts_with('/') {
f.remove(0);
}
- (*f).to_string()
+ (*f).clone()
})
});
@@ -1277,13 +1355,16 @@ mod tests {
assert_eq!(result, &containers);
if let Some(i) = app_data.get_container_by_id(&ContainerId::from("1")) {
- i.rx = ByteStats::new(40);
+ i.rx = NetworkBandwidth::new();
+ i.rx.push(40);
}
if let Some(i) = app_data.get_container_by_id(&ContainerId::from("2")) {
- i.rx = ByteStats::new(80);
+ i.rx = NetworkBandwidth::new();
+ i.rx.push(80);
}
if let Some(i) = app_data.get_container_by_id(&ContainerId::from("3")) {
- i.rx = ByteStats::new(2);
+ i.rx = NetworkBandwidth::new();
+ i.rx.push(2);
}
// descending
@@ -1314,13 +1395,16 @@ mod tests {
assert_eq!(result, &containers);
if let Some(i) = app_data.get_container_by_id(&ContainerId::from("1")) {
- i.rx = ByteStats::new(400);
+ i.rx = NetworkBandwidth::new();
+ i.rx.push(400);
}
if let Some(i) = app_data.get_container_by_id(&ContainerId::from("2")) {
- i.rx = ByteStats::new(80);
+ i.rx = NetworkBandwidth::new();
+ i.rx.push(80);
}
if let Some(i) = app_data.get_container_by_id(&ContainerId::from("3")) {
- i.rx = ByteStats::new(83);
+ i.rx = NetworkBandwidth::new();
+ i.rx.push(83);
}
// descending
@@ -1378,13 +1462,16 @@ mod tests {
assert_eq!(result, &containers);
if let Some(i) = app_data.get_container_by_id(&ContainerId::from("1")) {
- i.rx = ByteStats::new(400);
+ i.rx = NetworkBandwidth::new();
+ i.rx.push(400);
}
if let Some(i) = app_data.get_container_by_id(&ContainerId::from("2")) {
- i.rx = ByteStats::new(80);
+ i.rx = NetworkBandwidth::new();
+ i.rx.push(80);
}
if let Some(i) = app_data.get_container_by_id(&ContainerId::from("3")) {
- i.rx = ByteStats::new(83);
+ i.rx = NetworkBandwidth::new();
+ i.rx.push(83);
}
app_data.set_sorted(Some((Header::Rx, SortedOrder::Asc)));
@@ -1444,7 +1531,7 @@ mod tests {
);
// Calling previous when at start has no effect
- app_data.containers_scroll(&ScrollDirection::Previous);
+ app_data.containers_scroll(&ScrollDirection::Up);
let result = app_data.get_selected_container_id();
assert_eq!(result, Some(ContainerId::from("1")));
let result = app_data.get_selected_container_id_state_name();
@@ -1467,7 +1554,7 @@ mod tests {
// Advance list state by 1
app_data.containers_start();
- app_data.containers.scroll(&ScrollDirection::Next);
+ app_data.containers.scroll(&ScrollDirection::Down);
let result = app_data.get_container_state();
assert_eq!(result.selected(), Some(1));
@@ -1511,7 +1598,7 @@ mod tests {
);
// Calling previous when at end has no effect
- app_data.containers.scroll(&ScrollDirection::Next);
+ app_data.containers.scroll(&ScrollDirection::Down);
let result = app_data.get_selected_container_id();
assert_eq!(result, Some(ContainerId::from("3")));
let result = app_data.get_selected_container_id_state_name();
@@ -1532,7 +1619,7 @@ mod tests {
let mut app_data = gen_appdata(&containers);
app_data.containers_end();
- app_data.containers.scroll(&ScrollDirection::Previous);
+ app_data.containers.scroll(&ScrollDirection::Up);
let result = app_data.get_container_state();
assert_eq!(result.selected(), Some(1));
assert_eq!(result.offset(), 0);
@@ -1548,7 +1635,7 @@ mod tests {
assert_eq!(result, None);
app_data.containers.start();
- app_data.containers.scroll(&ScrollDirection::Next);
+ app_data.containers.scroll(&ScrollDirection::Down);
let result = app_data.get_selected_container();
assert_eq!(result, Some(&containers[1]));
@@ -1635,7 +1722,7 @@ mod tests {
let mut app_data = gen_appdata(&containers);
app_data.containers_start();
app_data.docker_controls_start();
- app_data.docker_controls_scroll(&ScrollDirection::Next);
+ app_data.docker_controls_scroll(&ScrollDirection::Down);
let result = app_data.selected_docker_controls();
assert_eq!(result, Some(DockerCommand::Restart));
@@ -1653,7 +1740,7 @@ mod tests {
assert_eq!(result, Some(DockerCommand::Delete));
// Next has no effect when at end
- app_data.docker_controls_scroll(&ScrollDirection::Next);
+ app_data.docker_controls_scroll(&ScrollDirection::Down);
let result = app_data.selected_docker_controls();
assert_eq!(result, Some(DockerCommand::Delete));
}
@@ -1665,14 +1752,14 @@ mod tests {
let mut app_data = gen_appdata(&containers);
app_data.containers_start();
app_data.docker_controls_end();
- app_data.docker_controls_scroll(&ScrollDirection::Previous);
+ app_data.docker_controls_scroll(&ScrollDirection::Up);
let result = app_data.selected_docker_controls();
assert_eq!(result, Some(DockerCommand::Stop));
// previous has no effect when at start
app_data.docker_controls_start();
- app_data.docker_controls_scroll(&ScrollDirection::Previous);
+ app_data.docker_controls_scroll(&ScrollDirection::Up);
let result = app_data.selected_docker_controls();
assert_eq!(result, Some(DockerCommand::Pause));
}
@@ -1936,7 +2023,7 @@ mod tests {
assert_eq!(result, " 3/3 - container_1 - image_1");
// Change log state to no longer be at the end
- app_data.log_scroll(&ScrollDirection::Previous);
+ app_data.log_scroll(&ScrollDirection::Up);
let result = app_data.get_log_title();
assert_eq!(result, " 2/3 - container_1 - image_1");
}
@@ -1957,7 +2044,7 @@ mod tests {
assert_eq!(result, " - container_1 - image_1");
// change container
- app_data.containers_scroll(&ScrollDirection::Next);
+ app_data.containers_scroll(&ScrollDirection::Down);
let result = app_data.get_log_title();
assert_eq!(result, " - container_2 - image_2");
@@ -1968,7 +2055,7 @@ mod tests {
assert_eq!(result, " 3/3 - container_2 - image_2");
// Change log state to no longer be at the end
- app_data.log_scroll(&ScrollDirection::Previous);
+ app_data.log_scroll(&ScrollDirection::Up);
let result = app_data.get_log_title();
assert_eq!(result, " 2/3 - container_2 - image_2");
}
@@ -2075,7 +2162,7 @@ mod tests {
let result = app_data.get_log_title();
assert_eq!(result, " 1/3 - container_1 - image_1");
- app_data.log_scroll(&ScrollDirection::Next);
+ app_data.log_scroll(&ScrollDirection::Down);
let result = app_data.get_log_state();
assert!(result.is_some());
assert_eq!(result.as_ref().unwrap().selected(), Some(1));
@@ -2084,7 +2171,7 @@ mod tests {
let result = app_data.get_log_title();
assert_eq!(result, " 2/3 - container_1 - image_1");
- app_data.log_scroll(&ScrollDirection::Next);
+ app_data.log_scroll(&ScrollDirection::Down);
let result = app_data.get_log_state();
assert!(result.is_some());
assert_eq!(result.as_ref().unwrap().selected(), Some(2));
@@ -2092,7 +2179,7 @@ mod tests {
let result = app_data.get_log_title();
assert_eq!(result, " 3/3 - container_1 - image_1");
- app_data.log_scroll(&ScrollDirection::Next);
+ app_data.log_scroll(&ScrollDirection::Down);
let result = app_data.get_log_state();
assert!(result.is_some());
@@ -2123,7 +2210,7 @@ mod tests {
let result = app_data.get_log_title();
assert_eq!(result, " 3/3 - container_1 - image_1");
- app_data.log_scroll(&ScrollDirection::Previous);
+ app_data.log_scroll(&ScrollDirection::Up);
let result = app_data.get_log_state();
assert!(result.is_some());
@@ -2132,7 +2219,7 @@ mod tests {
let result = app_data.get_log_title();
assert_eq!(result, " 2/3 - container_1 - image_1");
- app_data.log_scroll(&ScrollDirection::Previous);
+ app_data.log_scroll(&ScrollDirection::Up);
let result = app_data.get_log_state();
assert!(result.is_some());
assert_eq!(result.as_ref().unwrap().selected(), Some(0));
@@ -2140,7 +2227,7 @@ mod tests {
let result = app_data.get_log_title();
assert_eq!(result, " 1/3 - container_1 - image_1");
- app_data.log_scroll(&ScrollDirection::Previous);
+ app_data.log_scroll(&ScrollDirection::Up);
let result = app_data.get_log_state();
assert!(result.is_some());
assert_eq!(result.as_ref().unwrap().selected(), Some(0));
@@ -2164,26 +2251,49 @@ mod tests {
app_data.containers_start();
+ let mut rx = NetworkBandwidth::new();
+ rx.push(200);
+ rx.push(100);
+ rx.push(200);
+
+ let mut tx = NetworkBandwidth::new();
+ tx.push(300);
+ tx.push(600);
+ tx.push(900);
+
if let Some(item) = app_data.get_container_by_id(&ContainerId::from("1")) {
- item.cpu_stats = VecDeque::from([CpuStats::new(1.1), CpuStats::new(1.2)]);
+ item.cpu_stats = VecDeque::from([CpuStats::new(1.2), CpuStats::new(1.2)]);
item.mem_stats = VecDeque::from([ByteStats::new(1), ByteStats::new(2)]);
+ item.rx = rx;
+ item.tx = tx;
}
let result = app_data.get_chart_data();
assert_eq!(
result,
- Some((
- (
- vec![(0.0, 1.1), (1.0, 1.2)],
- CpuStats::new(1.2),
- State::Running(RunningState::Healthy),
- ),
- (
- vec![(0.0, 1.0), (1.0, 2.0)],
- ByteStats::new(2),
- State::Running(RunningState::Healthy),
- )
- ))
+ Some(ChartsData {
+ memory: ChartSeries {
+ dataset: vec![(0.0, 1.0), (1.0, 2.0)],
+ max: ByteStats::new(2),
+ current: ByteStats::new(2)
+ },
+ cpu: ChartSeries {
+ dataset: vec![(0.0, 1.2), (1.0, 1.2)],
+ max: CpuStats::new(1.2),
+ current: CpuStats::new(1.2)
+ },
+ rx: ChartSeries {
+ dataset: vec![(0.0, 0.0), (1.0, 100.0)],
+ max: BandwidthStat::new(100),
+ current: BandwidthStat::new(100)
+ },
+ tx: ChartSeries {
+ dataset: vec![(0.0, 300.0), (1.0, 300.0)],
+ max: BandwidthStat::new(300),
+ current: BandwidthStat::new(300)
+ },
+ state: State::Running(RunningState::Healthy)
+ })
);
}
@@ -2333,8 +2443,15 @@ mod tests {
assert_eq!(result[0].cpu_stats, VecDeque::from([CpuStats::new(10.0)]));
assert_eq!(result[0].mem_stats, VecDeque::from([ByteStats::new(10)]));
assert_eq!(result[0].mem_limit, ByteStats::new(10));
- assert_eq!(result[0].rx, ByteStats::new(10));
- assert_eq!(result[0].tx, ByteStats::new(10));
+
+ let mut rx = NetworkBandwidth::new();
+ rx.push(10);
+ let mut tx = NetworkBandwidth::new();
+ tx.push(10);
+ assert_eq!(result[0].rx, rx);
+ // VecDeque::from([ByteStats::new(10)]));
+ assert_eq!(result[0].tx, tx);
+ // VecDeque::from([ByteStats::new(10)]));
}
#[test]
@@ -2434,7 +2551,7 @@ mod tests {
}
for _ in 0..=500 {
- app_data.log_scroll(&ScrollDirection::Next);
+ app_data.log_scroll(&ScrollDirection::Down);
}
let result = app_data.get_logs(
Size {
diff --git a/src/app_error.rs b/src/app_error.rs
index 74d7d3c..ce4b5f6 100644
--- a/src/app_error.rs
+++ b/src/app_error.rs
@@ -2,7 +2,7 @@ use crate::app_data::DockerCommand;
use std::fmt;
/// app errors to set in global state
-#[derive(Debug, Clone)]
+#[derive(Debug, Clone, PartialEq, Eq, PartialOrd, Ord)]
pub enum AppError {
DockerCommand(DockerCommand),
DockerExec,
diff --git a/src/config/color_parser.rs b/src/config/color_parser.rs
index 87dacd7..8afded3 100644
--- a/src/config/color_parser.rs
+++ b/src/config/color_parser.rs
@@ -1,5 +1,8 @@
use ratatui::style::Color;
+static COLOR_RX: Color = Color::Rgb(255, 233, 193);
+static COLOR_TX: Color = Color::Rgb(205, 140, 140);
+
/// The macro accepts a list of struct names with key names
/// Returns a struct where every key name is an Option, with the correct derived attributes
macro_rules! optional_config_struct {
@@ -58,7 +61,7 @@ impl From> for AppColors {
);
}
- // Seletable panel borders
+ // Selectable panel borders
if let Some(b) = config_colors.borders {
Self::map_color(b.selected.as_deref(), &mut app_colors.borders.selected);
Self::map_color(b.unselected.as_deref(), &mut app_colors.borders.unselected);
@@ -249,6 +252,8 @@ optional_config_struct!(
ConfigBackgroundText, background, text;
ConfigBackgroundTextHighlight, background, text, text_highlight;
ConfigBorders, selected, unselected;
+ ConfigChartBandwidth, background, border, max_rx, max_tx, title_tx, title_rx, points_rx, points_tx, y_axis;
+
ConfigChartCpu, background, border, order, title, max, points,y_axis;
ConfigChartMemory, background, border, title, max, points, y_axis;
ConfigChartPorts, background, border, title, headings, text;
@@ -265,6 +270,8 @@ config_struct!(
Borders, selected, unselected;
ChartCpu, background, border, title, max, points, y_axis;
ChartMemory, background, border, title, max, points, y_axis;
+ ChartBandwidth, background, border, max_rx, max_tx, title_rx, title_tx, points_rx, points_tx, y_axis;
+
ChartPorts, background, border, title, headings, text;
Commands, background, pause, restart, stop, delete, resume, start;
Containers, background, icon, text, text_rx, text_tx;
@@ -284,6 +291,7 @@ pub struct ConfigColors {
borders: Option,
chart_cpu: Option,
chart_memory: Option,
+ chart_bandwidth: Option,
chart_ports: Option,
commands: Option,
container_state: Option,
@@ -335,7 +343,24 @@ impl Commands {
}
}
-/// Default colours for the help popup
+/// Default colours for the Bandwidth chart
+impl ChartBandwidth {
+ const fn new() -> Self {
+ Self {
+ background: Color::Reset,
+ border: Color::White,
+ max_rx: COLOR_RX,
+ title_rx: COLOR_RX,
+ title_tx: COLOR_TX,
+ max_tx: COLOR_TX,
+ points_rx: COLOR_RX,
+ points_tx: COLOR_TX,
+ y_axis: Color::White,
+ }
+ }
+}
+
+/// Default colours for the CPU chart
impl ChartCpu {
const fn new() -> Self {
Self {
@@ -383,8 +408,8 @@ impl Containers {
background: Color::Reset,
icon: Color::White,
text: Color::Blue,
- text_rx: Color::Rgb(255, 233, 193),
- text_tx: Color::Rgb(205, 140, 140),
+ text_rx: COLOR_RX,
+ text_tx: COLOR_TX,
}
}
}
@@ -487,6 +512,7 @@ pub struct AppColors {
pub borders: Borders,
pub chart_cpu: ChartCpu,
pub chart_memory: ChartMemory,
+ pub chart_bandwidth: ChartBandwidth,
pub chart_ports: ChartPorts,
pub commands: Commands,
pub container_state: ContainerState,
@@ -507,6 +533,7 @@ impl AppColors {
borders: Borders::new(),
chart_cpu: ChartCpu::new(),
chart_memory: ChartMemory::new(),
+ chart_bandwidth: ChartBandwidth::new(),
chart_ports: ChartPorts::new(),
commands: Commands::new(),
container_state: ContainerState::new(),
diff --git a/src/config/config.toml b/src/config/config.toml
index 8d5f1db..f70c116 100644
--- a/src/config/config.toml
+++ b/src/config/config.toml
@@ -24,8 +24,8 @@ show_timestamp = true
# Don't draw gui - for debugging - mostly pointless
gui = true
-# Docker host location
-host = "/var/run/docker.sock"
+# Docker host location. Will take priority over a DOCKER_HOST env.
+# host = "/var/run/docker.sock"
# Display the container logs timestamp with a given timezone, if timezone is unknown, defaults to UTC
timezone = "Etc/UTC"
@@ -95,8 +95,8 @@ scroll_start = ["home"]
# scroll up a list by one item
scroll_up = ["up", "k"]
# Horizontal scroll of the logs
-log_scroll_forward = ["right"]
-log_scroll_back = ["left"]
+scroll_forward = ["right"]
+scroll_back = ["left"]
# Select next panel
select_next_panel = ["tab"]
# Select previous panel
@@ -122,8 +122,8 @@ log_section_height_decrease = ["-"]
log_section_height_increase = ["+"]
# Toggle visibility of the log section
log_section_toggle = ["\\"]
-
-
+# Toggle to inspect container screen
+inspect = ["i"]
# Force a complete clear & redraw of the screen
force_redraw = ["f"]
@@ -254,6 +254,27 @@ points = "cyan"
# The charts y-axis
y_axis = "white"
+# The bandwidth chart
+[colors.chart_bandwidth]
+# Background color of panel
+background = "reset"
+# Border color
+border = "white"
+# Maximum RX value - again paused & stopped colors not yet customizable
+max_rx = "#FFE9C1"
+# Maximum TX value - again paused & stopped colors not yet customizable
+max_tx = "#CD8C8C"
+# RX points on the chart - again paused & stopped colors not yet customizable
+points_rx = "#FFE9C1"
+# TX points on the chart - again paused & stopped colors not yet customizable
+points_tx = "#CD8C8C"
+# TX title color
+title_rx = "#FFE9C1"
+# RX title color
+title_tx = "#CD8C8C"
+# The charts y-axis
+y_axis = "white"
+
# The ports chart
[colors.chart_ports]
# Background color of panel
diff --git a/src/config/keymap_parser.rs b/src/config/keymap_parser.rs
index f75ff16..34fde03 100644
--- a/src/config/keymap_parser.rs
+++ b/src/config/keymap_parser.rs
@@ -42,8 +42,9 @@ optional_config_struct!(
exec,
filter_mode,
force_redraw,
- log_scroll_back,
- log_scroll_forward,
+ inspect,
+ scroll_back,
+ scroll_forward,
log_search_mode,
log_section_height_decrease,
log_section_height_increase,
@@ -77,9 +78,10 @@ config_struct!(
delete_deny,
exec,
filter_mode,
+ inspect,
force_redraw,
- log_scroll_back,
- log_scroll_forward,
+ scroll_back,
+ scroll_forward,
log_search_mode,
log_section_height_decrease,
log_section_height_increase,
@@ -113,10 +115,11 @@ impl Keymap {
delete_confirm: (KeyCode::Char('y'), None),
delete_deny: (KeyCode::Char('n'), None),
exec: (KeyCode::Char('e'), None),
+ inspect: (KeyCode::Char('i'), None),
filter_mode: (KeyCode::Char('/'), Some(KeyCode::F(1))),
force_redraw: (KeyCode::Char('f'), None),
- log_scroll_back: (KeyCode::Left, None),
- log_scroll_forward: (KeyCode::Right, None),
+ scroll_back: (KeyCode::Left, None),
+ scroll_forward: (KeyCode::Right, None),
log_search_mode: (KeyCode::Char('#'), None),
log_section_height_decrease: (KeyCode::Char('-'), None),
log_section_height_increase: (KeyCode::Char('='), None),
@@ -158,20 +161,20 @@ impl From> for Keymap {
|vec_str: Option>,
keymap_field: &mut (KeyCode, Option),
keymap_clash: &mut HashSet| {
- if let Some(vec_str) = vec_str {
- if let Some(vec_keycode) = Self::try_parse_keycode(&vec_str) {
- if let Some(first) = vec_keycode.first() {
- keymap_clash.insert(*first);
- counter += 1;
- keymap_field.0 = *first;
- }
- if let Some(second) = vec_keycode.get(1) {
- keymap_clash.insert(*second);
- counter += 1;
- keymap_field.1 = Some(*second);
- } else {
- keymap_field.1 = None;
- }
+ if let Some(vec_str) = vec_str
+ && let Some(vec_keycode) = Self::try_parse_keycode(&vec_str)
+ {
+ if let Some(first) = vec_keycode.first() {
+ keymap_clash.insert(*first);
+ counter += 1;
+ keymap_field.0 = *first;
+ }
+ if let Some(second) = vec_keycode.get(1) {
+ keymap_clash.insert(*second);
+ counter += 1;
+ keymap_field.1 = Some(*second);
+ } else {
+ keymap_field.1 = None;
}
}
};
@@ -206,12 +209,8 @@ impl From> for Keymap {
update_keymap(ck.scroll_start, &mut keymap.scroll_start, &mut clash);
update_keymap(ck.scroll_up, &mut keymap.scroll_up, &mut clash);
update_keymap(ck.log_search_mode, &mut keymap.log_search_mode, &mut clash);
- update_keymap(
- ck.log_scroll_forward,
- &mut keymap.log_scroll_forward,
- &mut clash,
- );
- update_keymap(ck.log_scroll_back, &mut keymap.log_scroll_back, &mut clash);
+ update_keymap(ck.scroll_forward, &mut keymap.scroll_forward, &mut clash);
+ update_keymap(ck.scroll_back, &mut keymap.scroll_back, &mut clash);
update_keymap(
ck.select_next_panel,
&mut keymap.select_next_panel,
@@ -276,16 +275,16 @@ impl Keymap {
for key in input.iter().take(2) {
if key.chars().count() == 1 {
- if let Some(first_char) = key.chars().next() {
- if let Some(first_char) = match first_char {
+ if let Some(first_char) = key.chars().next()
+ && let Some(first_char) = match first_char {
x if x.is_ascii_alphabetic() || x.is_ascii_digit() => Some(first_char),
'/' | '\\' | ',' | '.' | '#' | '\'' | '[' | ']' | ';' | '=' | '-' => {
Some(first_char)
}
_ => None,
- } {
- output.push(KeyCode::Char(first_char));
}
+ {
+ output.push(KeyCode::Char(first_char));
}
} else {
let keycode = match key.to_lowercase().as_str() {
@@ -327,7 +326,7 @@ impl Keymap {
if output.is_empty() {
None
} else {
- // Remove any duplicates for a single deinition
+ // Remove any duplicates for a single definition
if output.first() == output.get(1) {
output.pop();
}
@@ -395,9 +394,10 @@ mod tests {
exec: None,
filter_mode: None,
force_redraw: None,
- log_scroll_back: None,
+ inspect: None,
+ scroll_back: None,
log_search_mode: None,
- log_scroll_forward: None,
+ scroll_forward: None,
log_section_height_decrease: None,
log_section_height_increase: None,
log_section_toggle: None,
@@ -441,8 +441,9 @@ mod tests {
exec: gen_v(("g", "h")),
filter_mode: gen_v(("i", "j")),
force_redraw: gen_v(("k", "l")),
- log_scroll_back: gen_v(("s", "t")),
- log_scroll_forward: gen_v(("q", "r")),
+ inspect: gen_v(("m", "n")),
+ scroll_back: gen_v(("s", "t")),
+ scroll_forward: gen_v(("q", "r")),
log_search_mode: gen_v(("1", "2")),
log_section_height_decrease: gen_v(("m", "n")),
log_section_height_increase: gen_v(("o", "p")),
@@ -479,8 +480,9 @@ mod tests {
exec: (KeyCode::Char('g'), Some(KeyCode::Char('h'))),
filter_mode: (KeyCode::Char('i'), Some(KeyCode::Char('j'))),
force_redraw: (KeyCode::Char('k'), Some(KeyCode::Char('l'))),
- log_scroll_back: (KeyCode::Char('s'), Some(KeyCode::Char('t'))),
- log_scroll_forward: (KeyCode::Char('q'), Some(KeyCode::Char('r'))),
+ inspect: (KeyCode::Char('i'), None),
+ scroll_back: (KeyCode::Char('s'), Some(KeyCode::Char('t'))),
+ scroll_forward: (KeyCode::Char('q'), Some(KeyCode::Char('r'))),
log_search_mode: (KeyCode::Char('1'), Some(KeyCode::Char('2'))),
log_section_height_decrease: (KeyCode::Char('m'), Some(KeyCode::Char('n'))),
log_section_height_increase: (KeyCode::Char('o'), Some(KeyCode::Char('p'))),
diff --git a/src/config/mod.rs b/src/config/mod.rs
index 699768e..db79281 100644
--- a/src/config/mod.rs
+++ b/src/config/mod.rs
@@ -13,9 +13,6 @@ pub use {color_parser::AppColors, keymap_parser::Keymap};
mod parse_args;
mod parse_config_file;
-// TODO use a global pub static oncelock for the config
-// static CELL: OnceLock = OnceLock::new();
-
#[derive(Debug, Clone)]
#[allow(clippy::struct_excessive_bools)]
pub struct Config {
@@ -28,7 +25,8 @@ pub struct Config {
pub keymap: Keymap,
pub log_search_case_sensitive: bool,
pub raw_logs: bool,
- pub save_dir: Option,
+ pub dir_config: Option,
+ pub dir_save: Option,
pub show_logs: bool,
pub show_self: bool,
pub show_std_err: bool,
@@ -50,7 +48,8 @@ impl From<&Args> for Config {
keymap: Keymap::new(),
log_search_case_sensitive: true,
raw_logs: args.raw,
- save_dir: Self::try_get_logs_dir(args.save_dir.as_ref()),
+ dir_save: Self::try_get_logs_dir(args.save_dir.as_ref()),
+ dir_config: args.config_file.as_ref().map(|i| PathBuf::from(&i)),
show_logs: true,
show_self: !args.show_self,
show_std_err: !args.no_std_err,
@@ -62,19 +61,20 @@ impl From<&Args> for Config {
}
}
-impl From for Config {
- fn from(config_file: ConfigFile) -> Self {
+impl From<(ConfigFile, Option)> for Config {
+ fn from((config_file, dir): (ConfigFile, Option)) -> Self {
Self {
app_colors: AppColors::from(config_file.colors),
color_logs: config_file.color_logs.unwrap_or(false),
docker_interval_ms: config_file.docker_interval.unwrap_or(1000),
+ dir_config: dir,
gui: config_file.gui.unwrap_or(true),
host: config_file.host,
in_container: Self::check_if_in_container(),
keymap: Keymap::from(config_file.keymap),
log_search_case_sensitive: config_file.log_search_case_sensitive.unwrap_or(true),
raw_logs: config_file.raw_logs.unwrap_or(false),
- save_dir: Self::try_get_logs_dir(config_file.save_dir.as_ref()),
+ dir_save: Self::try_get_logs_dir(config_file.save_dir.as_ref()),
show_logs: config_file.show_logs.unwrap_or(true),
show_self: config_file.show_self.unwrap_or(false),
show_std_err: config_file.show_std_err.unwrap_or(true),
@@ -185,8 +185,8 @@ impl Config {
self.host = Some(host);
}
- if let Some(x) = config_from_cli.save_dir {
- self.save_dir = Some(x);
+ if let Some(x) = config_from_cli.dir_save {
+ self.dir_save = Some(x);
}
if let Some(tz) = config_from_cli.timezone {
@@ -211,16 +211,16 @@ impl Config {
let args = Args::parse();
let config_from_cli = Self::from(&args);
- if let Some(config_file) = &args.config_file {
- if let Some(config_file) =
- parse_config_file::ConfigFile::try_parse_from_file(config_file)
- {
- return Self::from(config_file).merge_args(config_from_cli);
- }
+ if let Some(dir_config_file) = &args.config_file
+ && let Some(config_file) =
+ parse_config_file::ConfigFile::try_parse_from_file(dir_config_file)
+ {
+ return Self::from((config_file, Some(PathBuf::from(dir_config_file))))
+ .merge_args(config_from_cli);
}
- if let Some(config_file) = parse_config_file::ConfigFile::try_parse(in_container) {
- return Self::from(config_file).merge_args(config_from_cli);
+ if let Some((config_file, dir)) = parse_config_file::ConfigFile::try_parse(in_container) {
+ return Self::from((config_file, Some(dir))).merge_args(config_from_cli);
}
config_from_cli
}
diff --git a/src/config/parse_config_file.rs b/src/config/parse_config_file.rs
index d61991a..e685d57 100644
--- a/src/config/parse_config_file.rs
+++ b/src/config/parse_config_file.rs
@@ -81,7 +81,7 @@ pub struct ConfigFile {
impl ConfigFile {
/// Attempt to create a config.toml file, will attempt to recursively create the directories as well
- fn crate_config_file(in_container: bool) -> Result<(), AppError> {
+ fn create_config_file(in_container: bool) -> Result<(), AppError> {
if in_container {
return Ok(());
}
@@ -146,28 +146,26 @@ impl ConfigFile {
/// Parse a config file using default config_file location
/// This is executed first, then the CLI args are read, and if they contain a "--config-file" entry, then Self::try_parse_from_file() is executed
- pub fn try_parse(in_container: bool) -> Option {
- let mut config = None;
+ pub fn try_parse(in_container: bool) -> Option<(Self, PathBuf)> {
+ let mut output = None;
for file_format in [
ConfigFileFormat::Toml,
ConfigFileFormat::Jsonc,
ConfigFileFormat::JsoncAsJson,
ConfigFileFormat::Json,
] {
- if let Ok(config_file) = Self::parse_config_file(
- file_format,
- &file_format.get_default_path_name(in_container),
- ) {
- config = Some(config_file);
+ let path = file_format.get_default_path_name(in_container);
+ if let Ok(config_file) = Self::parse_config_file(file_format, &path) {
+ output = Some((config_file, path));
break;
}
}
- if config.is_none() {
- Self::crate_config_file(in_container).ok();
+ if output.is_none() {
+ Self::create_config_file(in_container).ok();
}
- config
+ output
}
}
diff --git a/src/docker_data/message.rs b/src/docker_data/message.rs
index b0af01a..6030e29 100644
--- a/src/docker_data/message.rs
+++ b/src/docker_data/message.rs
@@ -9,5 +9,6 @@ pub enum DockerMessage {
ConfirmDelete(ContainerId),
Control((DockerCommand, ContainerId)),
Exec(Sender>),
+ Inspect(ContainerId),
Update,
}
diff --git a/src/docker_data/mod.rs b/src/docker_data/mod.rs
index 52ecc24..038dc6b 100644
--- a/src/docker_data/mod.rs
+++ b/src/docker_data/mod.rs
@@ -1,8 +1,8 @@
use bollard::{
Docker,
query_parameters::{
- ListContainersOptions, LogsOptions, RemoveContainerOptions, RestartContainerOptions,
- StartContainerOptions, StatsOptions, StopContainerOptions,
+ InspectContainerOptions, ListContainersOptions, LogsOptions, RemoveContainerOptions,
+ RestartContainerOptions, StartContainerOptions, StatsOptions, StopContainerOptions,
},
secret::ContainerStatsResponse,
service::ContainerSummary,
@@ -10,13 +10,10 @@ use bollard::{
use futures_util::StreamExt;
use parking_lot::Mutex;
use std::{
- collections::HashMap,
+ collections::HashSet,
sync::{Arc, atomic::AtomicUsize},
};
-use tokio::{
- sync::mpsc::{Receiver, Sender},
- task::JoinHandle,
-};
+use tokio::sync::mpsc::{Receiver, Sender};
use uuid::Uuid;
use crate::{
@@ -70,7 +67,7 @@ pub struct DockerData {
docker: Arc,
gui_state: Arc>,
receiver: Receiver,
- spawns: Arc>>>,
+ spawns: Arc>>,
}
impl DockerData {
@@ -132,7 +129,7 @@ impl DockerData {
docker: Arc,
state: State,
spawn_id: SpawnId,
- spawns: Arc>>>,
+ spawns: Arc>>,
) {
let id = spawn_id.get_id();
let mut stream = docker
@@ -200,16 +197,13 @@ impl DockerData {
for (state, id) in all_ids {
let spawn_id = SpawnId::Stats((id, self.binate));
- if let std::collections::hash_map::Entry::Vacant(spawns) =
- self.spawns.lock().entry(spawn_id.clone())
- {
- spawns.insert(tokio::spawn(Self::update_container_stat(
- Arc::clone(&self.app_data),
- Arc::clone(&self.docker),
- state,
- spawn_id,
- Arc::clone(&self.spawns),
- )));
+ if !self.spawns.lock().contains(&spawn_id) {
+ let app_data = Arc::clone(&self.app_data);
+ let docker = Arc::clone(&self.docker);
+ let spawns = Arc::clone(&self.spawns);
+ tokio::spawn(Self::update_container_stat(
+ app_data, docker, state, spawn_id, spawns,
+ ));
}
}
self.binate = self.binate.toggle();
@@ -256,7 +250,7 @@ impl DockerData {
docker: Arc,
id: ContainerId,
since: u64,
- spawns: Arc>>>,
+ spawns: Arc>>,
stderr: bool,
) {
let options = Some(LogsOptions {
@@ -290,13 +284,13 @@ impl DockerData {
let spawns = Arc::clone(&self.spawns);
let std_err = self.config.show_std_err;
let init = Arc::clone(&init);
- self.spawns.lock().insert(
- SpawnId::Log(id.clone()),
- tokio::spawn(async move {
- Self::update_log(app_data, docker, id, 0, spawns, std_err).await;
- init.fetch_add(1, std::sync::atomic::Ordering::SeqCst);
- }),
- );
+
+ self.spawns.lock().insert(SpawnId::Log(id.clone()));
+
+ tokio::spawn(async move {
+ Self::update_log(app_data, docker, id, 0, spawns, std_err).await;
+ init.fetch_add(1, std::sync::atomic::Ordering::SeqCst);
+ });
}
init
}
@@ -327,17 +321,16 @@ impl DockerData {
let last_updated = container.last_updated;
let spawn_id = SpawnId::Log(container.id.clone());
// Only spawn if not already spawned with a given id/binate pair
- if let std::collections::hash_map::Entry::Vacant(spawns) =
- self.spawns.lock().entry(spawn_id)
- {
- spawns.insert(tokio::spawn(Self::update_log(
+ if !self.spawns.lock().contains(&spawn_id) {
+ self.spawns.lock().insert(spawn_id.clone());
+ tokio::spawn(Self::update_log(
Arc::clone(&self.app_data),
Arc::clone(&self.docker),
container.id.clone(),
last_updated,
Arc::clone(&self.spawns),
self.config.show_std_err,
- )));
+ ));
}
}
self.update_all_container_stats();
@@ -420,6 +413,18 @@ impl DockerData {
docker_tx.send(Arc::clone(&self.docker)).ok();
}
DockerMessage::Update => self.update_everything().await,
+ DockerMessage::Inspect(id) => {
+ let t = self
+ .docker
+ .inspect_container(id.get(), Some(InspectContainerOptions { size: true }))
+ .await;
+ if let Ok(t) = t {
+ self.app_data.lock().set_inspect_data(t);
+ self.gui_state.lock().status_push(Status::Inspect);
+ } else {
+ // Set error here, can't inspect container
+ }
+ }
}
}
}
@@ -457,7 +462,7 @@ impl DockerData {
docker: Arc::new(docker),
gui_state,
receiver: docker_rx,
- spawns: Arc::new(Mutex::new(HashMap::new())),
+ spawns: Arc::new(Mutex::new(HashSet::new())),
};
inner.initialise_container_data().await;
Self::heartbeat(&inner.config, docker_tx);
@@ -478,6 +483,7 @@ mod tests {
fn gen_stats() -> ContainerStatsResponse {
ContainerStatsResponse {
read: None,
+ os_type: None,
preread: None,
num_procs: Some(1),
pids_stats: None,
diff --git a/src/exec.rs b/src/exec.rs
index a1604b4..bc4444e 100644
--- a/src/exec.rs
+++ b/src/exec.rs
@@ -1,5 +1,5 @@
use std::{
- io::{Read, Stdout, Write},
+ io::{Read, Write},
sync::{Arc, atomic::AtomicBool, mpsc::Sender},
};
@@ -10,7 +10,7 @@ use bollard::{
use crossterm::terminal::enable_raw_mode;
use futures_util::StreamExt;
use parking_lot::Mutex;
-use ratatui::{Terminal, backend::CrosstermBackend};
+use ratatui::layout::Size;
use tokio::{
fs::File,
io::{AsyncReadExt, AsyncWriteExt},
@@ -123,23 +123,29 @@ impl AsyncTTY {
}
}
-/// This is used to set the terminal size when exec via the Internal method
-#[derive(Debug, Clone)]
-pub struct TerminalSize {
- width: u16,
- height: u16,
-}
+// impl TryFrom<&Terminal>> for HWU16 {
+// type Error = None;
+// fn try_from(terminal: &Terminal>) -> Option {
+// terminal.size().map_or(None, |i| {
+// Some(Self {
+// width: i.width,
+// height: i.height,
+// })
+// })
+// }
-impl TerminalSize {
- pub fn new(terminal: &Terminal>) -> Option {
- terminal.size().map_or(None, |i| {
- Some(Self {
- width: i.width,
- height: i.height,
- })
- })
- }
-}
+// }
+
+// impl TerminalSize {
+// pub fn new(terminal: &Terminal>) -> Option {
+// terminal.size().map_or(None, |i| {
+// Some(Self {
+// width: i.width,
+// height: i.height,
+// })
+// })
+// }
+// }
#[derive(Debug, Clone)]
pub enum ExecMode {
@@ -161,51 +167,41 @@ impl ExecMode {
let use_cli = app_data.lock().config.use_cli;
let container = app_data.lock().get_selected_container_id_state_name();
- if let Some((id, state, _)) = container {
- if [
+ if let Some((id, state, _)) = container
+ && [
State::Running(RunningState::Healthy),
State::Running(RunningState::Unhealthy),
]
.contains(&state)
+ {
+ if tty_readable()
+ && !use_cli
+ && let Ok(exec) = docker
+ .create_exec(
+ id.get(),
+ CreateExecOptions {
+ attach_stdout: Some(true),
+ attach_stderr: Some(true),
+ cmd: Some(vec![command::PWD]),
+ ..Default::default()
+ },
+ )
+ .await
+ && let Ok(StartExecResults::Attached { mut output, .. }) =
+ docker.start_exec(&exec.id, None).await
+ && let Some(Ok(msg)) = output.next().await
+ && !msg.to_string().starts_with(OCI_ERROR)
{
- if tty_readable() && !use_cli {
- if let Ok(exec) = docker
- .create_exec(
- id.get(),
- CreateExecOptions {
- attach_stdout: Some(true),
- attach_stderr: Some(true),
- cmd: Some(vec![command::PWD]),
- ..Default::default()
- },
- )
- .await
- {
- if let Ok(StartExecResults::Attached { mut output, .. }) =
- docker.start_exec(&exec.id, None).await
- {
- if let Some(Ok(msg)) = output.next().await {
- if !msg.to_string().starts_with(OCI_ERROR) {
- return Some(Self::Internal((
- Arc::new(id),
- Arc::clone(docker),
- )));
- }
- }
- }
- }
- }
+ return Some(Self::Internal((Arc::new(id), Arc::clone(docker))));
+ }
- if let Ok(output) = std::process::Command::new(command::DOCKER)
- .args([command::EXEC, id.get(), command::PWD])
- .output()
- {
- if let Ok(output) = String::from_utf8(output.stdout) {
- if !output.starts_with(OCI_ERROR) {
- return Some(Self::External(Arc::new(id)));
- }
- }
- }
+ if let Ok(output) = std::process::Command::new(command::DOCKER)
+ .args([command::EXEC, id.get(), command::PWD])
+ .output()
+ && let Ok(output) = String::from_utf8(output.stdout)
+ && !output.starts_with(OCI_ERROR)
+ {
+ return Some(Self::External(Arc::new(id)));
}
}
None
@@ -235,7 +231,7 @@ impl ExecMode {
&self,
id: &ContainerId,
docker: &Arc,
- terminal_size: Option,
+ terminal_size: Option,
) -> Result<(), AppError> {
let cancel_token = CancellationToken::new();
@@ -351,7 +347,7 @@ impl ExecMode {
}
}
- pub async fn run(&self, tty_size: Option) -> Result<(), AppError> {
+ pub async fn run(&self, tty_size: Option) -> Result<(), AppError> {
match self {
Self::External(id) => {
Self::exec_external(id);
diff --git a/src/input_handler/mod.rs b/src/input_handler/mod.rs
index 000577b..4dd5ae3 100644
--- a/src/input_handler/mod.rs
+++ b/src/input_handler/mod.rs
@@ -119,6 +119,14 @@ impl InputHandler {
self.gui_state.lock().set_delete_container(None);
}
+ async fn inspect_key(&self) {
+ self.app_data.lock().clear_inspect_data();
+ let selected = self.app_data.lock().get_selected_container().cloned();
+ if let Some(g) = selected {
+ self.docker_tx.send(DockerMessage::Inspect(g.id)).await.ok();
+ }
+ }
+
/// Validate that one can exec into a Docker container
async fn exec_key(&self) {
let is_oxker = self.app_data.lock().is_oxker();
@@ -178,58 +186,58 @@ impl InputHandler {
async fn save_logs(&self) -> Result<(), Box> {
let args = self.app_data.lock().config.clone();
let container = self.app_data.lock().get_selected_container_id_state_name();
- if let Some((id, _, name)) = container {
- if let Some(log_path) = args.save_dir {
- let (sx, rx) = tokio::sync::oneshot::channel();
- self.docker_tx.send(DockerMessage::Exec(sx)).await?;
+ if let Some((id, _, name)) = container
+ && let Some(log_path) = args.dir_save
+ {
+ let (sx, rx) = tokio::sync::oneshot::channel();
+ self.docker_tx.send(DockerMessage::Exec(sx)).await?;
- let now = SystemTime::now()
- .duration_since(SystemTime::UNIX_EPOCH)
- .map_or(0, |i| i.as_secs());
+ let now = SystemTime::now()
+ .duration_since(SystemTime::UNIX_EPOCH)
+ .map_or(0, |i| i.as_secs());
- let path = log_path.join(format!("{name}_{now}.log"));
+ let path = log_path.join(format!("{name}_{now}.log"));
- let options = Some(LogsOptions {
- stderr: true,
- stdout: true,
- timestamps: args.show_timestamp,
- since: 0,
- ..Default::default()
- });
- let mut logs = rx.await?.logs(id.get(), options);
- let mut output = vec![];
+ let options = Some(LogsOptions {
+ stderr: true,
+ stdout: true,
+ timestamps: args.show_timestamp,
+ since: 0,
+ ..Default::default()
+ });
+ let mut logs = rx.await?.logs(id.get(), options);
+ let mut output = vec![];
- while let Some(Ok(value)) = logs.next().await {
- let data = value.to_string();
- if !data.trim().is_empty() {
- output.push(
- categorise_text(&data)
- .into_iter()
- .map(|i| i.text)
- .collect::(),
- );
- }
- }
- if !output.is_empty() {
- let mut stream = BufWriter::new(
- OpenOptions::new()
- .read(true)
- .write(true)
- .create(true)
- .truncate(true)
- .open(&path)?,
+ while let Some(Ok(value)) = logs.next().await {
+ let data = value.to_string();
+ if !data.trim().is_empty() {
+ output.push(
+ categorise_text(&data)
+ .into_iter()
+ .map(|i| i.text)
+ .collect::(),
);
-
- for line in &output {
- stream.write_all(line.as_bytes())?;
- }
- stream.flush()?;
-
- self.gui_state
- .lock()
- .set_info_box(&format!("saved to {}", path.display()));
}
}
+ if !output.is_empty() {
+ let mut stream = BufWriter::new(
+ OpenOptions::new()
+ .read(true)
+ .write(true)
+ .create(true)
+ .truncate(true)
+ .open(&path)?,
+ );
+
+ for line in &output {
+ stream.write_all(line.as_bytes())?;
+ }
+ stream.flush()?;
+
+ self.gui_state
+ .lock()
+ .set_info_box(&format!("saved to {}", path.display()));
+ }
}
Ok(())
}
@@ -296,6 +304,18 @@ impl InputHandler {
}
}
+ fn inspect_scroll(&self, modifier: KeyModifiers, sd: &ScrollDirection) {
+ for _ in 0..self.get_modifier_total(modifier) {
+ self.gui_state.lock().set_inspect_offset(sd);
+ }
+ }
+
+ // fn inspect_scroll(&self, modifier: KeyModifiers, sd: &ScrollDirection) {
+ // for _ in 0..self.get_modifier_total(modifier) {
+ // self.gui_state.lock().set_inspect_offset(sd);
+ // }
+ // }
+
fn logs_horizontal_scroll(&self, modifier: KeyModifiers, sd: &ScrollDirection) {
let panel = self.gui_state.lock().get_selected_panel();
if panel == SelectablePanel::Logs {
@@ -393,22 +413,22 @@ impl InputHandler {
self.gui_state.lock().status_del(Status::SearchLogs);
}
- _ if self.keymap.log_scroll_back.0 == key_code
- || self.keymap.log_scroll_back.1 == Some(key_code) =>
+ _ if self.keymap.scroll_back.0 == key_code
+ || self.keymap.scroll_back.1 == Some(key_code) =>
{
- self.logs_horizontal_scroll(modifier, &ScrollDirection::Previous);
+ self.logs_horizontal_scroll(modifier, &ScrollDirection::Up);
}
- _ if self.keymap.log_scroll_forward.0 == key_code
- || self.keymap.log_scroll_forward.1 == Some(key_code) =>
+ _ if self.keymap.scroll_forward.0 == key_code
+ || self.keymap.scroll_forward.1 == Some(key_code) =>
{
- self.logs_horizontal_scroll(modifier, &ScrollDirection::Next);
+ self.logs_horizontal_scroll(modifier, &ScrollDirection::Down);
}
_ if self.keymap.scroll_down.0 == key_code => {
self.app_data
.lock()
- .log_search_scroll(&ScrollDirection::Next);
+ .log_search_scroll(&ScrollDirection::Down);
// TODO should only do this is log_search_scroll returns some
// Need to wait til app_data and gui_data is combined
self.gui_state
@@ -418,9 +438,7 @@ impl InputHandler {
}
_ if self.keymap.scroll_up.0 == key_code => {
- self.app_data
- .lock()
- .log_search_scroll(&ScrollDirection::Previous);
+ self.app_data.lock().log_search_scroll(&ScrollDirection::Up);
// TODO should only do this is log_search_scroll returns some
// Need to wait til app_data and gui_data is combined
self.gui_state
@@ -439,6 +457,62 @@ impl InputHandler {
}
}
+ /// Actions to take when Filter status active
+ fn handle_inspect(&mut self, key_code: KeyCode, modifier: KeyModifiers) {
+ match key_code {
+ _ if self.keymap.inspect.0 == key_code
+ || self.keymap.inspect.1 == Some(key_code)
+ || self.keymap.clear.0 == key_code
+ || self.keymap.clear.1 == Some(key_code) =>
+ {
+ self.app_data.lock().clear_inspect_data();
+ self.gui_state.lock().clear_inspect_offset();
+ self.gui_state.lock().status_del(Status::Inspect);
+ }
+
+ _ if self.keymap.scroll_down.0 == key_code
+ || self.keymap.scroll_down.1 == Some(key_code) =>
+ {
+ self.inspect_scroll(modifier, &ScrollDirection::Down);
+ }
+
+ _ if self.keymap.scroll_up.0 == key_code
+ || self.keymap.scroll_up.1 == Some(key_code) =>
+ {
+ self.inspect_scroll(modifier, &ScrollDirection::Up);
+ }
+
+ _ if self.keymap.scroll_forward.0 == key_code
+ || self.keymap.scroll_forward.1 == Some(key_code) =>
+ {
+ self.inspect_scroll(modifier, &ScrollDirection::Right);
+ }
+
+ _ if self.keymap.scroll_back.0 == key_code
+ || self.keymap.scroll_back.1 == Some(key_code) =>
+ {
+ self.inspect_scroll(modifier, &ScrollDirection::Left);
+ }
+
+ _ if self.keymap.toggle_mouse_capture.0 == key_code
+ || self.keymap.toggle_mouse_capture.1 == Some(key_code) =>
+ {
+ self.mouse_capture_key();
+ }
+ _ if self.keymap.scroll_start.0 == key_code
+ || self.keymap.scroll_start.1 == Some(key_code) =>
+ {
+ self.gui_state.lock().clear_inspect_offset();
+ }
+ _ if self.keymap.scroll_end.0 == key_code
+ || self.keymap.scroll_end.1 == Some(key_code) =>
+ {
+ self.gui_state.lock().set_inspect_offset_y_to_max();
+ }
+ _ => (),
+ }
+ }
+
/// Actions to take when Filter status active
fn handle_filter(&self, key_code: KeyCode) {
match key_code {
@@ -596,6 +670,10 @@ impl InputHandler {
self.save_key().await;
}
+ _ if self.keymap.inspect.0 == key_code || self.keymap.inspect.1 == Some(key_code) => {
+ self.inspect_key().await;
+ }
+
_ if self.keymap.select_next_panel.0 == key_code
|| self.keymap.select_next_panel.1 == Some(key_code) =>
{
@@ -623,13 +701,13 @@ impl InputHandler {
_ if self.keymap.scroll_up.0 == key_code
|| self.keymap.scroll_up.1 == Some(key_code) =>
{
- self.scroll(modifier, &ScrollDirection::Previous);
+ self.scroll(modifier, &ScrollDirection::Up);
}
_ if self.keymap.scroll_down.0 == key_code
|| self.keymap.scroll_down.1 == Some(key_code) =>
{
- self.scroll(modifier, &ScrollDirection::Next);
+ self.scroll(modifier, &ScrollDirection::Down);
}
_ if self.keymap.filter_mode.0 == key_code
@@ -648,18 +726,17 @@ impl InputHandler {
self.gui_state.lock().status_push(Status::SearchLogs);
}
- _ if self.keymap.log_scroll_back.0 == key_code
- || self.keymap.log_scroll_back.1 == Some(key_code) =>
+ _ if self.keymap.scroll_back.0 == key_code
+ || self.keymap.scroll_back.1 == Some(key_code) =>
{
- self.logs_horizontal_scroll(modifier, &ScrollDirection::Previous);
+ self.logs_horizontal_scroll(modifier, &ScrollDirection::Up);
// self.logs_back(modifier);
}
- _ if self.keymap.log_scroll_forward.0 == key_code
- || self.keymap.log_scroll_forward.1 == Some(key_code) =>
+ _ if self.keymap.scroll_forward.0 == key_code
+ || self.keymap.scroll_forward.1 == Some(key_code) =>
{
- self.logs_horizontal_scroll(modifier, &ScrollDirection::Next);
- // self.logs_forward(modifier);
+ self.logs_horizontal_scroll(modifier, &ScrollDirection::Down);
}
KeyCode::Enter => self.enter_key().await,
@@ -678,6 +755,7 @@ impl InputHandler {
let contains_filter = contains(Status::Filter);
let contains_delete = contains(Status::DeleteConfirm);
let contains_search_logs = contains(Status::SearchLogs);
+ let contains_inspect = contains(Status::Inspect);
if !contains_exec {
let is_q = || key_code == self.keymap.quit.0 || Some(key_code) == self.keymap.quit.1;
@@ -698,6 +776,8 @@ impl InputHandler {
self.handle_search_logs(key_code, key_modifier);
} else if contains_delete {
self.handle_delete(key_code).await;
+ } else if contains_inspect {
+ self.handle_inspect(key_code, key_modifier);
} else {
self.handle_others(key_code, key_modifier).await;
}
@@ -726,7 +806,18 @@ impl InputHandler {
/// Handle mouse button events
fn mouse_press(&self, mouse_event: MouseEvent, modifier: KeyModifiers) {
let status = self.gui_state.lock().get_status();
- if status.contains(&Status::Help) {
+
+ if status.contains(&Status::Inspect) {
+ match mouse_event.kind {
+ MouseEventKind::ScrollDown => self.inspect_scroll(modifier, &ScrollDirection::Down),
+ MouseEventKind::ScrollUp => self.inspect_scroll(modifier, &ScrollDirection::Up),
+ MouseEventKind::ScrollRight => {
+ self.inspect_scroll(modifier, &ScrollDirection::Right)
+ }
+ MouseEventKind::ScrollLeft => self.inspect_scroll(modifier, &ScrollDirection::Left),
+ _ => (),
+ }
+ } else if status.contains(&Status::Help) {
let mouse_point = Rect::new(mouse_event.column, mouse_event.row, 1, 1);
let help_intersect = self.gui_state.lock().get_intersect_help(mouse_point);
if help_intersect {
@@ -734,8 +825,9 @@ impl InputHandler {
}
} else {
match mouse_event.kind {
- MouseEventKind::ScrollUp => self.scroll(modifier, &ScrollDirection::Previous),
- MouseEventKind::ScrollDown => self.scroll(modifier, &ScrollDirection::Next),
+ MouseEventKind::ScrollUp => self.scroll(modifier, &ScrollDirection::Up),
+ MouseEventKind::ScrollDown => self.scroll(modifier, &ScrollDirection::Down),
+ // TODO left and right for log offsets
MouseEventKind::Down(MouseButton::Left) => {
let mouse_point = Rect::new(mouse_event.column, mouse_event.row, 1, 1);
let header = self.gui_state.lock().get_intersect_header(mouse_point);
diff --git a/src/main.rs b/src/main.rs
index 30ea787..8ad73f5 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -1,4 +1,3 @@
-#![allow(clippy::collapsible_if)]
// #![allow(unused)]
// Zigbuild is stuck on 1.87.0, which means Mac builds won't work when using collapsible ifs
@@ -43,12 +42,18 @@ fn setup_tracing() {
tracing_subscriber::fmt().with_max_level(Level::INFO).init();
}
-/// Read the optional docker_host path, the cli args take priority over the DOCKER_HOST env
+/// Read the optional docker_host path
+/// Bollard will use DOCKER_HOST env, so might be pointless here, although it will fix it's priority over any config setting
fn read_docker_host(config: &Config) -> Option {
- config
- .host
- .as_ref()
- .map_or_else(|| std::env::var(DOCKER_HOST).ok(), |x| Some(x.to_string()))
+ if let Some(x) = &config.host {
+ Some(x.to_string())
+ } else if let Ok(env) = std::env::var(DOCKER_HOST)
+ && !env.trim().is_empty()
+ {
+ Some(env)
+ } else {
+ None
+ }
}
/// Create docker daemon handler, and only spawn up the docker data handler if a ping returns non-error
@@ -60,25 +65,27 @@ async fn docker_init(
) {
let host = read_docker_host(&app_data.lock().config);
- let connection = host.map_or_else(Docker::connect_with_socket_defaults, |host| {
- Docker::connect_with_socket(&host, 120, API_DEFAULT_VERSION)
- });
-
- if let Ok(docker) = connection {
- if docker.ping().await.is_ok() {
- tokio::spawn(DockerData::start(
- Arc::clone(app_data),
- docker,
- docker_rx,
- docker_tx,
- Arc::clone(gui_state),
- ));
- return;
- }
+ if let Ok(docker) = host
+ .as_ref()
+ .map_or_else(Docker::connect_with_defaults, |host| {
+ Docker::connect_with_socket(host, 120, API_DEFAULT_VERSION)
+ })
+ && docker.ping().await.is_ok()
+ {
+ tokio::spawn(DockerData::start(
+ Arc::clone(app_data),
+ docker,
+ docker_rx,
+ docker_tx,
+ Arc::clone(gui_state),
+ ));
+ } else {
+ app_data.lock().set_error(
+ AppError::DockerConnect,
+ gui_state,
+ Status::DockerConnect(host),
+ );
}
- app_data
- .lock()
- .set_error(AppError::DockerConnect, gui_state, Status::DockerConnect);
}
/// Create data for, and then spawn a tokio thread, for the input handler
@@ -155,7 +162,7 @@ mod tests {
use std::{str::FromStr, sync::Arc};
- use bollard::service::{ContainerSummary, Port};
+ use bollard::service::{ContainerSummary, PortSummary};
use crate::{
app_data::{
@@ -169,23 +176,24 @@ mod tests {
/// Default test config, has timestamps turned off
pub fn gen_config() -> Config {
Config {
+ app_colors: AppColors::new(),
color_logs: false,
+ dir_save: None,
+ dir_config: None,
docker_interval_ms: 1000,
gui: true,
host: None,
- show_std_err: false,
in_container: false,
- save_dir: None,
+ keymap: Keymap::new(),
log_search_case_sensitive: true,
raw_logs: false,
- show_self: false,
- app_colors: AppColors::new(),
- keymap: Keymap::new(),
- timestamp_format: "HH:MM:SS.NNNNN dd-mm-yyyy".to_owned(),
- show_timestamp: false,
- use_cli: false,
show_logs: true,
+ show_self: false,
+ show_std_err: false,
+ show_timestamp: false,
+ timestamp_format: "HH:MM:SS.NNNNN dd-mm-yyyy".to_owned(),
timezone: None,
+ use_cli: false,
}
}
@@ -211,6 +219,7 @@ mod tests {
containers: StatefulList::new(containers.to_vec()),
hidden_containers: vec![],
current_sorted_id: vec![],
+ inspect_data: None,
error: None,
sorted_by: None,
rerender: Arc::new(Rerender::new()),
@@ -234,13 +243,14 @@ mod tests {
pub fn gen_container_summary(index: usize, state: &str) -> ContainerSummary {
ContainerSummary {
image_manifest_descriptor: None,
+ health: None,
id: Some(format!("{index}")),
names: Some(vec![format!("container_{}", index)]),
image: Some(format!("image_{index}")),
image_id: Some(format!("{index}")),
command: None,
created: Some(i64::try_from(index).unwrap()),
- ports: Some(vec![Port {
+ ports: Some(vec![PortSummary {
ip: None,
private_port: u16::try_from(index).unwrap_or(1) + 8000,
public_port: None,
diff --git a/src/ui/draw_blocks/chart_bandwidth.rs b/src/ui/draw_blocks/chart_bandwidth.rs
new file mode 100644
index 0000000..79ffd48
--- /dev/null
+++ b/src/ui/draw_blocks/chart_bandwidth.rs
@@ -0,0 +1,700 @@
+use std::fmt::Display;
+
+use ratatui::{
+ Frame,
+ layout::{Alignment, Rect},
+ style::{Color, Modifier, Style, Stylize},
+ symbols::{self, Marker},
+ text::{Line, Span},
+ widgets::{Axis, Block, BorderType, Borders, Chart, Dataset, GraphType},
+};
+
+use super::FrameData;
+use crate::{
+ app_data::{State, Stats},
+ config::AppColors,
+};
+
+fn make_chart<'a, T: Stats + Display>(
+ state: State,
+ colors: AppColors,
+ dataset: Vec>,
+ current_rx: &'a T,
+ max_rx: &'a T,
+ current_tx: &'a T,
+ max_tx: &'a T,
+) -> Chart<'a> {
+ let gen_color = |state: &State, default: Color| {
+ if state.is_healthy() {
+ default
+ } else {
+ state.get_color(colors)
+ }
+ };
+
+ let mut labels = [
+ Span::raw(""),
+ Span::styled(
+ format!("{max_rx}"),
+ Style::default()
+ .add_modifier(Modifier::BOLD)
+ .fg(gen_color(&state, colors.chart_bandwidth.max_rx)),
+ ),
+ Span::styled(
+ format!("{max_tx}"),
+ Style::default()
+ .add_modifier(Modifier::BOLD)
+ .fg(gen_color(&state, colors.chart_bandwidth.max_tx)),
+ ),
+ Span::raw(""),
+ ];
+
+ // Set the order of rx/tx on the y axis, based on which is the highest value
+ if max_rx.get_value() > max_tx.get_value() {
+ labels.reverse();
+ }
+
+ Chart::new(dataset)
+ .bg(colors.chart_bandwidth.background)
+ .block(
+ Block::default()
+ .title_alignment(Alignment::Center)
+ .title(Line::from(vec![
+ Span::styled(
+ format!(" rx: {current_rx}"),
+ Style::default()
+ .add_modifier(Modifier::BOLD)
+ .fg(gen_color(&state, colors.chart_bandwidth.title_rx)),
+ ),
+ Span::styled(
+ format!(" tx: {current_tx} "),
+ Style::default()
+ .add_modifier(Modifier::BOLD)
+ .fg(gen_color(&state, colors.chart_bandwidth.title_tx)),
+ ),
+ ]))
+ .borders(Borders::ALL)
+ .border_type(BorderType::Rounded)
+ .border_style(Style::default().fg(colors.chart_bandwidth.border)),
+ )
+ .x_axis(Axis::default().bounds([0.0, 60.0]))
+ .y_axis(
+ Axis::default()
+ .labels(labels)
+ .style(Style::default().fg(colors.chart_bandwidth.y_axis))
+ .bounds([0.0, (max_rx.get_value()).max(max_tx.get_value()) + 0.01]),
+ )
+}
+
+/// Draw bandwidth chart
+pub fn draw(area: Rect, colors: AppColors, f: &mut Frame, fd: &FrameData) {
+ if let Some(x) = fd.chart_data.as_ref() {
+ let mut dataset = vec![
+ Dataset::default()
+ .marker(symbols::Marker::Dot)
+ .style(Style::default().fg(colors.chart_bandwidth.points_tx))
+ .graph_type(GraphType::Line)
+ .marker(Marker::Dot)
+ .style(Style::default().fg(colors.chart_bandwidth.points_tx))
+ .data(&x.tx.dataset),
+ ];
+ dataset.extend(vec![
+ Dataset::default()
+ .marker(symbols::Marker::Dot)
+ .style(Style::default().fg(colors.chart_bandwidth.points_rx))
+ .marker(Marker::Dot)
+ .style(Style::default().fg(colors.chart_bandwidth.points_rx))
+ .graph_type(GraphType::Line)
+ .data(&x.rx.dataset),
+ ]);
+
+ let chart = make_chart(
+ x.state,
+ colors,
+ dataset,
+ &x.rx.current,
+ &x.rx.max,
+ &x.tx.current,
+ &x.tx.max,
+ );
+
+ f.render_widget(chart, area);
+ }
+}
+
+#[cfg(test)]
+#[allow(clippy::unwrap_used)]
+mod tests {
+ use insta::assert_snapshot;
+ use ratatui::style::Color;
+
+ use crate::{
+ app_data::{ContainerId, NetworkBandwidth, State},
+ config::AppColors,
+ ui::{
+ FrameData,
+ draw_blocks::tests::{COLOR_RX, COLOR_TX, get_result, test_setup},
+ },
+ };
+
+ const TX_DOTS: [(usize, usize); 14] = [
+ (1, 21),
+ (2, 19),
+ (2, 20),
+ (3, 18),
+ (3, 19),
+ (4, 10),
+ (4, 11),
+ (4, 17),
+ (4, 18),
+ (5, 16),
+ (6, 14),
+ (6, 15),
+ (7, 13),
+ (7, 14),
+ ];
+
+ const RX_DOTS: [(usize, usize); 15] = [
+ (1, 21),
+ (2, 19),
+ (2, 20),
+ (3, 18),
+ (3, 19),
+ (4, 10),
+ (4, 11),
+ (4, 17),
+ (4, 18),
+ (5, 16),
+ (6, 16),
+ (6, 15),
+ (7, 13),
+ (7, 14),
+ (8, 13),
+ ];
+
+ const COMBINED_DOTS_RX: [(usize, usize); 15] = [
+ (1, 21),
+ (2, 19),
+ (2, 20),
+ (3, 18),
+ (3, 19),
+ (4, 10),
+ (4, 11),
+ (4, 17),
+ (4, 18),
+ (5, 16),
+ (6, 15),
+ (6, 16),
+ (7, 13),
+ (7, 14),
+ (8, 13),
+ ];
+
+ const COMBINED_DOTS_TX: [(usize, usize); 8] = [
+ (7, 19),
+ (7, 20),
+ (7, 21),
+ (8, 14),
+ (8, 15),
+ (8, 16),
+ (8, 17),
+ (8, 18),
+ ];
+
+ #[test]
+ /// When status is Running, but not data, charts drawn without dots etc, colours correct
+ fn test_draw_blocks_charts_running_none() {
+ let mut setup = test_setup(40, 10, true, true);
+
+ let fd = FrameData::from((&setup.app_data, &setup.gui_state));
+ setup
+ .terminal
+ .draw(|f| {
+ super::draw(setup.area, setup.app_data.lock().config.app_colors, f, &fd);
+ })
+ .unwrap();
+ assert_snapshot!(setup.terminal.backend());
+ for (row_index, result_row) in get_result(&setup) {
+ for (result_cell_index, result_cell) in result_row.iter().enumerate() {
+ match (row_index, result_cell_index) {
+ // border
+ (9, _) | (1..=9, 0 | 39) => {
+ assert_eq!(result_cell.bg, Color::Reset);
+ assert_eq!(result_cell.fg, Color::White);
+ }
+ // Border first row only
+ (0, 0..=4 | 34..=39) => {
+ assert_eq!(result_cell.bg, Color::Reset);
+ assert_eq!(result_cell.fg, Color::White);
+ }
+ // Title RX
+ (0, 5..=18) => {
+ assert_eq!(result_cell.bg, Color::Reset);
+ assert_eq!(result_cell.fg, COLOR_RX);
+ }
+ // Title TX
+ (0, 19..=33) => {
+ assert_eq!(result_cell.bg, Color::Reset);
+ assert_eq!(result_cell.fg, COLOR_TX);
+ }
+ // Y axis
+ (1..=8, 10) => {
+ assert_eq!(result_cell.bg, Color::Reset);
+ assert_eq!(result_cell.fg, Color::White);
+ }
+ // TX max
+ (4, 1..=9) => {
+ assert_eq!(result_cell.bg, Color::Reset);
+ assert_eq!(result_cell.fg, COLOR_TX);
+ }
+ // RX max
+ (6, 1..=9) => {
+ assert_eq!(result_cell.bg, Color::Reset);
+ assert_eq!(result_cell.fg, COLOR_RX);
+ }
+ _ => {
+ assert_eq!(result_cell.fg, Color::Reset);
+ assert_eq!(result_cell.bg, Color::Reset);
+ }
+ }
+ }
+ }
+ }
+
+ #[test]
+ /// Test with TX data
+ fn test_draw_blocks_charts_running_with_data_tx() {
+ let mut setup = test_setup(40, 10, true, true);
+ let mut tx = NetworkBandwidth::new();
+
+ for i in 0..=20 {
+ tx.push(1000 * i * (10 + 5 * i));
+ }
+
+ if let Some(item) = setup
+ .app_data
+ .lock()
+ .get_container_by_id(&ContainerId::from("1"))
+ {
+ item.tx = tx;
+ }
+
+ let fd = FrameData::from((&setup.app_data, &setup.gui_state));
+
+ setup
+ .terminal
+ .draw(|f| {
+ super::draw(setup.area, setup.app_data.lock().config.app_colors, f, &fd);
+ })
+ .unwrap();
+ assert_snapshot!(setup.terminal.backend());
+ for (row_index, result_row) in get_result(&setup) {
+ for (result_cell_index, result_cell) in result_row.iter().enumerate() {
+ match (row_index, result_cell_index) {
+ // border
+ (9, _) | (1..=9, 0 | 39) => {
+ assert_eq!(result_cell.bg, Color::Reset);
+ assert_eq!(result_cell.fg, Color::White);
+ }
+ // Border first row only
+ (0, 0..=3 | 35..=39) => {
+ assert_eq!(result_cell.bg, Color::Reset);
+ assert_eq!(result_cell.fg, Color::White);
+ }
+ // Title RX
+ (0, 4..=17) => {
+ assert_eq!(result_cell.bg, Color::Reset);
+ assert_eq!(result_cell.fg, COLOR_RX);
+ }
+ // Title TX
+ (0, 18..=34) => {
+ assert_eq!(result_cell.bg, Color::Reset);
+ assert_eq!(result_cell.fg, COLOR_TX);
+ }
+ // Y axis
+ (1..=8, 12) => {
+ assert_eq!(result_cell.bg, Color::Reset);
+ assert_eq!(result_cell.fg, Color::White);
+ }
+ // TX max
+ (4, 1..=9) => {
+ assert_eq!(result_cell.bg, Color::Reset);
+ assert_eq!(result_cell.fg, COLOR_TX);
+ }
+ // RX max
+ (6, 1..=9) => {
+ assert_eq!(result_cell.bg, Color::Reset);
+ assert_eq!(result_cell.fg, COLOR_RX);
+ }
+ // TX dots
+ x if TX_DOTS.contains(&(row_index, result_cell_index)) => {
+ assert_eq!(result_cell.bg, Color::Reset);
+ assert_eq!(result_cell.fg, COLOR_TX);
+ }
+ _ => {
+ assert_eq!(result_cell.fg, Color::Reset);
+ assert_eq!(result_cell.bg, Color::Reset);
+ }
+ }
+ }
+ }
+ }
+
+ #[test]
+ /// Test with RX data
+ fn test_draw_blocks_charts_running_with_data_rx() {
+ let mut setup = test_setup(40, 10, true, true);
+ let mut rx = NetworkBandwidth::new();
+
+ for i in 0..=20 {
+ rx.push(2000 * i * (10 + 7 * i));
+ }
+
+ if let Some(item) = setup
+ .app_data
+ .lock()
+ .get_container_by_id(&ContainerId::from("1"))
+ {
+ item.rx = rx;
+ }
+
+ let fd = FrameData::from((&setup.app_data, &setup.gui_state));
+
+ setup
+ .terminal
+ .draw(|f| {
+ super::draw(setup.area, setup.app_data.lock().config.app_colors, f, &fd);
+ })
+ .unwrap();
+ assert_snapshot!(setup.terminal.backend());
+ for (row_index, result_row) in get_result(&setup) {
+ for (result_cell_index, result_cell) in result_row.iter().enumerate() {
+ match (row_index, result_cell_index) {
+ // border
+ (9, _) | (1..=9, 0 | 39) => {
+ assert_eq!(result_cell.bg, Color::Reset);
+ assert_eq!(result_cell.fg, Color::White);
+ }
+ // Border first row only
+ (0, 0..=3 | 35..=39) => {
+ assert_eq!(result_cell.bg, Color::Reset);
+ assert_eq!(result_cell.fg, Color::White);
+ }
+ // Title RX
+ (0, 4..=19) => {
+ assert_eq!(result_cell.bg, Color::Reset);
+ assert_eq!(result_cell.fg, COLOR_RX);
+ }
+ // Title TX
+ (0, 20..=34) => {
+ assert_eq!(result_cell.bg, Color::Reset);
+ assert_eq!(result_cell.fg, COLOR_TX);
+ }
+ // Y axis
+ (1..=8, 12) => {
+ assert_eq!(result_cell.bg, Color::Reset);
+ assert_eq!(result_cell.fg, Color::White);
+ }
+ // RX max
+ (4, 1..=9) => {
+ assert_eq!(result_cell.bg, Color::Reset);
+ assert_eq!(result_cell.fg, COLOR_RX);
+ }
+ // TX max
+ (6, 1..=9) => {
+ assert_eq!(result_cell.bg, Color::Reset);
+ assert_eq!(result_cell.fg, COLOR_TX);
+ }
+ // RX dots
+ x if RX_DOTS.contains(&(row_index, result_cell_index)) => {
+ assert_eq!(result_cell.bg, Color::Reset);
+ assert_eq!(result_cell.fg, COLOR_RX);
+ }
+ _ => {
+ assert_eq!(result_cell.fg, Color::Reset);
+ assert_eq!(result_cell.bg, Color::Reset);
+ }
+ }
+ }
+ }
+ }
+
+ #[test]
+ /// Test with RX & TX data
+ fn test_draw_blocks_charts_running_with_data_tx_and_rx() {
+ let mut setup = test_setup(40, 10, true, true);
+ let mut rx = NetworkBandwidth::new();
+ let mut tx = NetworkBandwidth::new();
+ for i in 0..=20 {
+ rx.push(2000 * i * (10 + 7 * i));
+ tx.push(200 * i * (10 + 7 * i));
+ }
+
+ if let Some(item) = setup
+ .app_data
+ .lock()
+ .get_container_by_id(&ContainerId::from("1"))
+ {
+ item.rx = rx;
+ item.tx = tx;
+ }
+
+ let fd = FrameData::from((&setup.app_data, &setup.gui_state));
+
+ setup
+ .terminal
+ .draw(|f| {
+ super::draw(setup.area, setup.app_data.lock().config.app_colors, f, &fd);
+ })
+ .unwrap();
+ assert_snapshot!(setup.terminal.backend());
+ for (row_index, result_row) in get_result(&setup) {
+ for (result_cell_index, result_cell) in result_row.iter().enumerate() {
+ match (row_index, result_cell_index) {
+ // border
+ (9, _) | (1..=9, 0 | 39) => {
+ assert_eq!(result_cell.bg, Color::Reset);
+ assert_eq!(result_cell.fg, Color::White);
+ }
+ // Border first row only
+ (0, 0..=3 | 36..=39) => {
+ assert_eq!(result_cell.bg, Color::Reset);
+ assert_eq!(result_cell.fg, Color::White);
+ }
+ // Title RX
+ (0, 4..=19) => {
+ assert_eq!(result_cell.bg, Color::Reset);
+ assert_eq!(result_cell.fg, COLOR_RX);
+ }
+ // Title TX
+ (0, 20..=35) => {
+ assert_eq!(result_cell.bg, Color::Reset);
+ assert_eq!(result_cell.fg, COLOR_TX);
+ }
+ // Y axis
+ (1..=8, 12) => {
+ assert_eq!(result_cell.bg, Color::Reset);
+ assert_eq!(result_cell.fg, Color::White);
+ }
+ // RX max
+ (4, 1..=9) => {
+ assert_eq!(result_cell.bg, Color::Reset);
+ assert_eq!(result_cell.fg, COLOR_RX);
+ }
+ // TX max
+ (6, 1..=10) => {
+ assert_eq!(result_cell.bg, Color::Reset);
+ assert_eq!(result_cell.fg, COLOR_TX);
+ }
+ // TX dots
+ x if COMBINED_DOTS_TX.contains(&(row_index, result_cell_index)) => {
+ assert_eq!(result_cell.bg, Color::Reset);
+ assert_eq!(result_cell.fg, COLOR_TX);
+ }
+ // RX dots
+ x if COMBINED_DOTS_RX.contains(&(row_index, result_cell_index)) => {
+ assert_eq!(result_cell.bg, Color::Reset);
+ assert_eq!(result_cell.fg, COLOR_RX);
+ }
+ _ => {
+ assert_eq!(result_cell.fg, Color::Reset);
+ assert_eq!(result_cell.bg, Color::Reset);
+ }
+ }
+ }
+ }
+ }
+
+ #[test]
+ /// Whens status paused, some text is now Yellow
+ fn test_draw_blocks_charts_paused() {
+ let mut setup = test_setup(40, 10, true, true);
+ setup.app_data.lock().containers.items[0].state = State::Paused;
+
+ let fd = FrameData::from((&setup.app_data, &setup.gui_state));
+ setup
+ .terminal
+ .draw(|f| {
+ super::draw(setup.area, setup.app_data.lock().config.app_colors, f, &fd);
+ })
+ .unwrap();
+ assert_snapshot!(setup.terminal.backend());
+ for (row_index, result_row) in get_result(&setup) {
+ for (result_cell_index, result_cell) in result_row.iter().enumerate() {
+ match (row_index, result_cell_index) {
+ // border
+ (9, _) | (1..=9, 0 | 39) => {
+ assert_eq!(result_cell.bg, Color::Reset);
+ assert_eq!(result_cell.fg, Color::White);
+ }
+ // Border first row only
+ (0, 0..=4 | 34..=39) => {
+ assert_eq!(result_cell.bg, Color::Reset);
+ assert_eq!(result_cell.fg, Color::White);
+ }
+ // Title & y-axis max
+ (0, 5..=33) | (4 | 6, 1..=9) => {
+ assert_eq!(result_cell.bg, Color::Reset);
+ assert_eq!(result_cell.fg, Color::Yellow);
+ }
+ // Y axis
+ (1..=8, 10) => {
+ assert_eq!(result_cell.bg, Color::Reset);
+ assert_eq!(result_cell.fg, Color::White);
+ }
+ _ => {
+ assert_eq!(result_cell.fg, Color::Reset);
+ assert_eq!(result_cell.bg, Color::Reset);
+ }
+ }
+ }
+ }
+ }
+
+ #[test]
+ /// Whens status dead, some text is now red
+ fn test_draw_blocks_charts_dead() {
+ let mut setup = test_setup(40, 10, true, true);
+ setup.app_data.lock().containers.items[0].state = State::Dead;
+
+ let fd = FrameData::from((&setup.app_data, &setup.gui_state));
+ setup
+ .terminal
+ .draw(|f| {
+ super::draw(setup.area, setup.app_data.lock().config.app_colors, f, &fd);
+ })
+ .unwrap();
+ assert_snapshot!(setup.terminal.backend());
+ for (row_index, result_row) in get_result(&setup) {
+ for (result_cell_index, result_cell) in result_row.iter().enumerate() {
+ match (row_index, result_cell_index) {
+ // border
+ (9, _) | (1..=9, 0 | 39) => {
+ assert_eq!(result_cell.bg, Color::Reset);
+ assert_eq!(result_cell.fg, Color::White);
+ }
+ // Border first row only
+ (0, 0..=4 | 34..=39) => {
+ assert_eq!(result_cell.bg, Color::Reset);
+ assert_eq!(result_cell.fg, Color::White);
+ }
+ // Title & y-axis max
+ (0, 5..=33) | (4 | 6, 1..=9) => {
+ assert_eq!(result_cell.bg, Color::Reset);
+ assert_eq!(result_cell.fg, Color::Red);
+ }
+ // Y axis
+ (1..=8, 10) => {
+ assert_eq!(result_cell.bg, Color::Reset);
+ assert_eq!(result_cell.fg, Color::White);
+ }
+ _ => {
+ assert_eq!(result_cell.fg, Color::Reset);
+ assert_eq!(result_cell.bg, Color::Reset);
+ }
+ }
+ }
+ }
+ }
+
+ #[test]
+ /// Custom colours correctly applied to each part of the charts
+ fn test_draw_blocks_charts_custom_colors() {
+ let mut colors = AppColors::new();
+
+ colors.chart_bandwidth.background = Color::White;
+ colors.chart_bandwidth.border = Color::Red;
+ colors.chart_bandwidth.max_rx = Color::Green;
+ colors.chart_bandwidth.max_tx = Color::Magenta;
+ colors.chart_bandwidth.title_rx = Color::LightGreen;
+ colors.chart_bandwidth.title_tx = Color::LightRed;
+ colors.chart_bandwidth.points_rx = Color::Black;
+ colors.chart_bandwidth.points_tx = Color::Blue;
+ colors.chart_bandwidth.y_axis = Color::Yellow;
+
+ let mut setup = test_setup(40, 10, true, true);
+
+ let mut rx = NetworkBandwidth::new();
+ let mut tx = NetworkBandwidth::new();
+ for i in 0..=20 {
+ rx.push(2000 * i * (10 + 7 * i));
+ tx.push(200 * i * (10 + 7 * i));
+ }
+
+ if let Some(item) = setup
+ .app_data
+ .lock()
+ .get_container_by_id(&ContainerId::from("1"))
+ {
+ item.rx = rx;
+ item.tx = tx;
+ }
+
+ let fd = FrameData::from((&setup.app_data, &setup.gui_state));
+
+ setup
+ .terminal
+ .draw(|f| {
+ super::draw(setup.area, colors, f, &fd);
+ })
+ .unwrap();
+
+ assert_snapshot!(setup.terminal.backend());
+
+ for (row_index, result_row) in get_result(&setup) {
+ for (result_cell_index, result_cell) in result_row.iter().enumerate() {
+ match (row_index, result_cell_index) {
+ // border
+ (9, _) | (1..=9, 0 | 39) => {
+ assert_eq!(result_cell.bg, Color::White);
+ assert_eq!(result_cell.fg, Color::Red);
+ }
+ // Border first row only
+ (0, 0..=3 | 36..=39) => {
+ assert_eq!(result_cell.bg, Color::White);
+ assert_eq!(result_cell.fg, Color::Red);
+ }
+ // Title RX
+ (0, 4..=19) => {
+ assert_eq!(result_cell.bg, Color::White);
+ assert_eq!(result_cell.fg, Color::LightGreen);
+ }
+ // Title TX
+ (0, 20..=35) => {
+ assert_eq!(result_cell.bg, Color::White);
+ assert_eq!(result_cell.fg, Color::LightRed);
+ }
+ // Y axis
+ (1..=8, 12) => {
+ assert_eq!(result_cell.bg, Color::White);
+ assert_eq!(result_cell.fg, Color::Yellow);
+ }
+ // RX max
+ (4, 1..=11) => {
+ assert_eq!(result_cell.bg, Color::White);
+ assert_eq!(result_cell.fg, Color::Green);
+ }
+ // TX max
+ (6, 1..=10) => {
+ assert_eq!(result_cell.bg, Color::White);
+ assert_eq!(result_cell.fg, Color::Magenta);
+ }
+ // TX dots
+ x if COMBINED_DOTS_TX.contains(&(row_index, result_cell_index)) => {
+ assert_eq!(result_cell.bg, Color::White);
+ assert_eq!(result_cell.fg, Color::Blue);
+ }
+ // RX dots
+ x if COMBINED_DOTS_RX.contains(&(row_index, result_cell_index)) => {
+ assert_eq!(result_cell.bg, Color::White);
+ assert_eq!(result_cell.fg, Color::Black);
+ }
+ _ => {
+ assert_eq!(result_cell.bg, Color::White);
+ assert_eq!(result_cell.fg, Color::Reset);
+ }
+ }
+ }
+ }
+ }
+}
diff --git a/src/ui/draw_blocks/charts.rs b/src/ui/draw_blocks/chart_cpu_mem.rs
similarity index 93%
rename from src/ui/draw_blocks/charts.rs
rename to src/ui/draw_blocks/chart_cpu_mem.rs
index 6926213..1cd9952 100644
--- a/src/ui/draw_blocks/charts.rs
+++ b/src/ui/draw_blocks/chart_cpu_mem.rs
@@ -11,7 +11,7 @@ use ratatui::{
use super::{CONSTRAINT_50_50, FrameData};
use crate::{
- app_data::{ByteStats, CpuStats, State, Stats},
+ app_data::{State, Stats},
config::AppColors,
};
@@ -118,7 +118,7 @@ fn make_chart<'a, T: Stats + Display>(
/// Draw the cpu + mem charts
pub fn draw(area: Rect, colors: AppColors, f: &mut Frame, fd: &FrameData) {
- if let Some((cpu, mem)) = fd.chart_data.as_ref() {
+ if let Some(x) = fd.chart_data.as_ref() {
let area = Layout::default()
.direction(Direction::Horizontal)
.constraints(CONSTRAINT_50_50)
@@ -129,34 +129,34 @@ pub fn draw(area: Rect, colors: AppColors, f: &mut Frame, fd: &FrameData) {
.marker(symbols::Marker::Dot)
.style(Style::default().fg(colors.chart_cpu.points))
.graph_type(GraphType::Line)
- .data(&cpu.0),
+ .data(&x.cpu.dataset),
];
let mem_dataset = vec![
Dataset::default()
.marker(symbols::Marker::Dot)
.style(Style::default().fg(colors.chart_memory.points))
.graph_type(GraphType::Line)
- .data(&mem.0),
+ .data(&x.memory.dataset),
];
- let cpu_stats = CpuStats::new(cpu.0.last().map_or(0.00, |f| f.1));
- #[allow(clippy::cast_possible_truncation, clippy::cast_sign_loss)]
- let mem_stats = ByteStats::new(mem.0.last().map_or(0, |f| f.1 as u64));
+ // let cpu_stats = CpuStats::new(cpu.0.last().map_or(0.00, |f| f.1));
+ // #[allow(clippy::cast_possible_truncation, clippy::cast_sign_loss)]
+ // let mem_stats = ByteStats::new(mem.0.last().map_or(0, |f| f.1 as u64));
let cpu_chart = make_chart(
ChartVariant::Cpu,
colors,
- &cpu_stats,
+ &x.cpu.current,
cpu_dataset,
- &cpu.1,
- cpu.2,
+ &x.cpu.max,
+ x.state,
);
let mem_chart = make_chart(
ChartVariant::Memory,
colors,
- &mem_stats,
+ &x.memory.current,
mem_dataset,
- &mem.1,
- mem.2,
+ &x.memory.max,
+ x.state,
);
f.render_widget(cpu_chart, area[0]);
@@ -175,7 +175,7 @@ mod tests {
config::AppColors,
ui::{
FrameData,
- draw_blocks::tests::{COLOR_ORANGE, get_result, insert_chart_data, test_setup},
+ draw_blocks::tests::{COLOR_ORANGE, get_result, insert_all_chart_data, test_setup},
},
};
@@ -194,42 +194,41 @@ mod tests {
];
// co-ordinates of the dots from the cpu chart
- const CPU_XY: [(usize, usize); 15] = [
- (1, 12),
- (2, 11),
+ const CPU_XY: [(usize, usize); 16] = [
+ (1, 13),
(2, 12),
- (3, 10),
+ (2, 13),
(3, 11),
- (3, 12),
- (4, 10),
- (4, 12),
- (5, 9),
+ (3, 13),
+ (4, 11),
+ (4, 13),
+ (5, 10),
(5, 13),
- (5, 14),
- (6, 8),
+ (6, 9),
(6, 13),
+ (6, 14),
(7, 8),
+ (7, 9),
(7, 13),
+ (7, 14),
];
// co-ordinates of the dots from the memory chart
- const MEM_XY: [(usize, usize); 16] = [
- (1, 54),
+ const MEM_XY: [(usize, usize); 14] = [
(1, 55),
(2, 54),
(2, 55),
- (3, 53),
+ (3, 54),
(3, 55),
- (4, 52),
+ (4, 53),
(4, 55),
- (5, 51),
(5, 52),
- (5, 55),
+ (5, 53),
(5, 56),
- (6, 51),
- (6, 55),
+ (6, 52),
+ (6, 56),
(7, 51),
- (7, 55),
+ (7, 56),
];
#[test]
@@ -275,7 +274,7 @@ mod tests {
fn test_draw_blocks_charts_running_some() {
let mut setup = test_setup(80, 10, true, true);
- insert_chart_data(&setup);
+ insert_all_chart_data(&setup);
let fd = FrameData::from((&setup.app_data, &setup.gui_state));
setup
@@ -324,7 +323,7 @@ mod tests {
fn test_draw_blocks_charts_paused() {
let mut setup = test_setup(80, 10, true, true);
- insert_chart_data(&setup);
+ insert_all_chart_data(&setup);
setup.app_data.lock().containers.items[0].state = State::Paused;
let fd = FrameData::from((&setup.app_data, &setup.gui_state));
@@ -336,6 +335,7 @@ mod tests {
.unwrap();
assert_snapshot!(setup.terminal.backend());
+ //
for (row_index, result_row) in get_result(&setup) {
for (result_cell_index, result_cell) in result_row.iter().enumerate() {
@@ -369,7 +369,7 @@ mod tests {
/// When dead, text is red
fn test_draw_blocks_charts_dead() {
let mut setup = test_setup(80, 10, true, true);
- insert_chart_data(&setup);
+ insert_all_chart_data(&setup);
setup.app_data.lock().containers.items[0].state = State::Dead;
let fd = FrameData::from((&setup.app_data, &setup.gui_state));
@@ -429,7 +429,7 @@ mod tests {
let mut setup = test_setup(80, 10, true, true);
- insert_chart_data(&setup);
+ insert_all_chart_data(&setup);
let fd = FrameData::from((&setup.app_data, &setup.gui_state));
setup
diff --git a/src/ui/draw_blocks/commands.rs b/src/ui/draw_blocks/commands.rs
index d01af86..2ca6221 100644
--- a/src/ui/draw_blocks/commands.rs
+++ b/src/ui/draw_blocks/commands.rs
@@ -1,6 +1,6 @@
use std::sync::Arc;
-use super::RIGHT_ARROW;
+use super::SELECT_ARROW;
use crate::{
app_data::AppData,
config::AppColors,
@@ -44,7 +44,7 @@ pub fn draw(
let items = List::new(items)
.block(block)
.highlight_style(Style::default().add_modifier(Modifier::BOLD))
- .highlight_symbol(RIGHT_ARROW);
+ .highlight_symbol(SELECT_ARROW);
f.render_stateful_widget(items, area, i);
} else {
let paragraph = Paragraph::new("").block(block).alignment(Alignment::Center);
@@ -173,7 +173,7 @@ mod tests {
setup
.app_data
.lock()
- .docker_controls_scroll(&ScrollDirection::Next);
+ .docker_controls_scroll(&ScrollDirection::Down);
setup
.terminal
@@ -370,7 +370,7 @@ mod tests {
setup
.app_data
.lock()
- .docker_controls_scroll(&ScrollDirection::Next);
+ .docker_controls_scroll(&ScrollDirection::Down);
setup
.terminal
diff --git a/src/ui/draw_blocks/containers.rs b/src/ui/draw_blocks/containers.rs
index a63283c..7078d1b 100644
--- a/src/ui/draw_blocks/containers.rs
+++ b/src/ui/draw_blocks/containers.rs
@@ -82,11 +82,19 @@ fn format_containers<'a>(colors: AppColors, i: &ContainerItem, widths: &Columns)
colors.containers.text,
),
Span::styled(
- format!("{:>width$}{MARGIN}", i.rx, width = widths.net_rx.1.into()),
+ format!(
+ "{:>width$}{MARGIN}",
+ i.rx.current_total(),
+ width = widths.net_rx.1.into()
+ ),
Style::default().fg(colors.containers.text_rx),
),
Span::styled(
- format!("{:>width$}{MARGIN}", i.tx, width = widths.net_tx.1.into()),
+ format!(
+ "{:>width$}{MARGIN}",
+ i.tx.current_total(),
+ width = widths.net_tx.1.into()
+ ),
Style::default().fg(colors.containers.text_tx),
),
])
diff --git a/src/ui/draw_blocks/error.rs b/src/ui/draw_blocks/error.rs
index 0d69f12..ddb85ef 100644
--- a/src/ui/draw_blocks/error.rs
+++ b/src/ui/draw_blocks/error.rs
@@ -22,6 +22,7 @@ pub fn draw(
colors: AppColors,
error: &AppError,
f: &mut Frame,
+ host: Option,
keymap: &Keymap,
seconds: Option,
) {
@@ -31,13 +32,21 @@ pub fn draw(
.title_alignment(Alignment::Center)
.borders(Borders::ALL);
- let to_push = if matches!(error, AppError::DockerConnect) {
- format!(
- "\n\n {}::v{} closing in {:02} seconds",
+ let mut text = format!("\n{error}");
+
+ if error == &AppError::DockerConnect {
+ let s = if let Some(host) = host {
+ format!(" @ \"{host}\"")
+ } else {
+ String::new()
+ };
+ text.push_str(&format!(
+ "{}\n\n {}::v{} closing in {:02} seconds",
+ s,
NAME,
VERSION,
- seconds.unwrap_or(5)
- )
+ seconds.unwrap_or(5),
+ ))
} else {
let clear_text = if keymap.clear == Keymap::new().clear {
format!("( {} ) {SUFFIX_CLEAR}", keymap.clear.0)
@@ -46,20 +55,17 @@ pub fn draw(
} else {
format!(" ( {} ) {SUFFIX_CLEAR}", keymap.clear.0)
};
+ text.push_str(&format!("\n\n{clear_text}"));
+ }
- let quit_text = if keymap.quit == Keymap::new().quit {
- format!("( {} ) {SUFFIX_QUIT}", keymap.quit.0)
- } else if let Some(secondary) = keymap.quit.1 {
- format!(" ( {} | {secondary} ) {SUFFIX_QUIT}", keymap.quit.0)
- } else {
- format!(" ( {} ) {SUFFIX_QUIT}", keymap.quit.0)
- };
- format!("\n\n{clear_text}\n\n{quit_text}")
+ let quit_text = if keymap.quit == Keymap::new().quit {
+ format!("( {} ) {SUFFIX_QUIT}", keymap.quit.0)
+ } else if let Some(secondary) = keymap.quit.1 {
+ format!(" ( {} | {secondary} ) {SUFFIX_QUIT}", keymap.quit.0)
+ } else {
+ format!(" ( {} ) {SUFFIX_QUIT}", keymap.quit.0)
};
-
- let mut text = format!("\n{error}");
-
- text.push_str(to_push.as_str());
+ text.push_str(&format!("\n\n{quit_text}"));
// Find the maximum line width & height
let padded_width = max_line_width(&text) + 8;
@@ -106,8 +112,7 @@ mod tests {
#[test]
/// Test that the error popup is centered, red background, white border, white text, and displays the correct text
fn test_draw_blocks_error_docker_connect_error() {
- let mut setup = test_setup(46, 9, true, true);
-
+ let mut setup = test_setup(50, 11, true, true);
setup
.terminal
.draw(|f| {
@@ -115,6 +120,7 @@ mod tests {
AppColors::new(),
&AppError::DockerConnect,
f,
+ None,
&Keymap::new(),
Some(4),
);
@@ -123,12 +129,50 @@ mod tests {
assert_snapshot!(setup.terminal.backend());
for (row_index, result_row) in get_result(&setup) {
for (result_cell_index, result_cell) in result_row.iter().enumerate() {
- if let (0 | 8, _) = (row_index, result_cell_index) {
- assert_eq!(result_cell.bg, Color::Reset);
- assert_eq!(result_cell.fg, Color::Reset);
- } else {
- assert_eq!(result_cell.bg, Color::Red);
- assert_eq!(result_cell.fg, Color::White);
+ match (row_index, result_cell_index) {
+ (0 | 10, _) | (_, 0 | 49) => {
+ assert_eq!(result_cell.bg, Color::Reset);
+ assert_eq!(result_cell.fg, Color::Reset);
+ }
+ _ => {
+ assert_eq!(result_cell.bg, Color::Red);
+ assert_eq!(result_cell.fg, Color::White);
+ }
+ }
+ }
+ }
+ }
+
+ #[test]
+ /// Test that the error popup is centered, red background, white border, white text, and displays the correct text with the custom docker host address
+ fn test_draw_blocks_error_docker_connect_error_custom_host() {
+ let mut setup = test_setup(60, 11, true, true);
+
+ setup
+ .terminal
+ .draw(|f| {
+ super::draw(
+ AppColors::new(),
+ &AppError::DockerConnect,
+ f,
+ Some("/test/host.sock".to_owned()),
+ &Keymap::new(),
+ Some(4),
+ );
+ })
+ .unwrap();
+ assert_snapshot!(setup.terminal.backend());
+ for (row_index, result_row) in get_result(&setup) {
+ for (result_cell_index, result_cell) in result_row.iter().enumerate() {
+ match (row_index, result_cell_index) {
+ (0 | 10, _) | (_, 0 | 59) => {
+ assert_eq!(result_cell.bg, Color::Reset);
+ assert_eq!(result_cell.fg, Color::Reset);
+ }
+ _ => {
+ assert_eq!(result_cell.bg, Color::Red);
+ assert_eq!(result_cell.fg, Color::White);
+ }
}
}
}
@@ -146,6 +190,7 @@ mod tests {
AppColors::new(),
&AppError::DockerExec,
f,
+ None,
&Keymap::new(),
Some(4),
);
@@ -183,7 +228,14 @@ mod tests {
setup
.terminal
.draw(|f| {
- super::draw(colors, &AppError::DockerExec, f, &Keymap::new(), Some(4));
+ super::draw(
+ colors,
+ &AppError::DockerExec,
+ f,
+ None,
+ &Keymap::new(),
+ Some(4),
+ );
})
.unwrap();
@@ -218,7 +270,14 @@ mod tests {
setup
.terminal
.draw(|f| {
- super::draw(AppColors::new(), &AppError::DockerExec, f, &keymap, None);
+ super::draw(
+ AppColors::new(),
+ &AppError::DockerExec,
+ f,
+ None,
+ &keymap,
+ None,
+ );
})
.unwrap();
assert_snapshot!(setup.terminal.backend());
@@ -235,7 +294,14 @@ mod tests {
setup
.terminal
.draw(|f| {
- super::draw(AppColors::new(), &AppError::DockerExec, f, &keymap, None);
+ super::draw(
+ AppColors::new(),
+ &AppError::DockerExec,
+ f,
+ None,
+ &keymap,
+ None,
+ );
})
.unwrap();
assert_snapshot!(setup.terminal.backend());
@@ -252,7 +318,14 @@ mod tests {
setup
.terminal
.draw(|f| {
- super::draw(AppColors::new(), &AppError::DockerExec, f, &keymap, None);
+ super::draw(
+ AppColors::new(),
+ &AppError::DockerExec,
+ f,
+ None,
+ &keymap,
+ None,
+ );
})
.unwrap();
assert_snapshot!(setup.terminal.backend());
diff --git a/src/ui/draw_blocks/filter.rs b/src/ui/draw_blocks/filter.rs
index 101ce2d..1091cee 100644
--- a/src/ui/draw_blocks/filter.rs
+++ b/src/ui/draw_blocks/filter.rs
@@ -5,7 +5,14 @@ use ratatui::{
text::{Line, Span},
};
-use crate::{app_data::FilterBy, config::AppColors, ui::FrameData};
+use crate::{
+ app_data::FilterBy,
+ config::AppColors,
+ ui::{
+ FrameData,
+ draw_blocks::{LEFT_ARROW, RIGHT_ARROW},
+ },
+};
/// Create the filter_by by spans, coloured dependant on which one is selected
fn filter_by_spans(colors: AppColors, fd: &'_ FrameData) -> [Span<'_>; 4] {
@@ -46,7 +53,7 @@ pub fn draw(area: Rect, colors: AppColors, frame: &mut Frame, fd: &FrameData) {
let mut line = vec![
Span::styled(" Esc ", style_but),
Span::styled(" clear ", style_desc),
- Span::styled(" โ by โ ", style_but),
+ Span::styled(format!(" {LEFT_ARROW} by {RIGHT_ARROW} "), style_but),
Span::from(" "),
];
line.extend_from_slice(&filter_by_spans(colors, fd));
diff --git a/src/ui/draw_blocks/headers.rs b/src/ui/draw_blocks/headers.rs
index 0e24e22..01a0e7d 100644
--- a/src/ui/draw_blocks/headers.rs
+++ b/src/ui/draw_blocks/headers.rs
@@ -39,14 +39,14 @@ fn gen_header<'a>(
fn gen_header_block<'a>(colors: AppColors, fd: &FrameData, header: Header) -> (Color, &'a str) {
let mut color = colors.headers_bar.text;
let mut suffix = "";
- if let Some((a, b)) = &fd.sorted_by {
- if &header == a {
- match b {
- SortedOrder::Asc => suffix = " โฒ",
- SortedOrder::Desc => suffix = " โผ",
- }
- color = colors.headers_bar.text_selected;
+ if let Some((a, b)) = &fd.sorted_by
+ && &header == a
+ {
+ match b {
+ SortedOrder::Asc => suffix = " โฒ",
+ SortedOrder::Desc => suffix = " โผ",
}
+ color = colors.headers_bar.text_selected;
}
(color, suffix)
diff --git a/src/ui/draw_blocks/help.rs b/src/ui/draw_blocks/help.rs
index 7e16abc..1c1fd76 100644
--- a/src/ui/draw_blocks/help.rs
+++ b/src/ui/draw_blocks/help.rs
@@ -1,410 +1,751 @@
-use crossterm::event::KeyCode;
-use jiff::tz::TimeZone;
+use std::sync::LazyLock;
+
use ratatui::{
Frame,
- layout::{Alignment, Constraint, Direction, Layout},
- style::{Color, Modifier, Style},
+ layout::{Alignment, Constraint, Direction, Layout, Rect, Size},
+ style::{Color, Style, Stylize},
text::{Line, Span},
- widgets::{Block, BorderType, Borders, Clear, Paragraph},
+ widgets::{Block, BorderType, Borders, Clear, Padding, Paragraph},
};
use crate::{
- config::{AppColors, Keymap},
+ config::{AppColors, Config, Keymap},
ui::gui_state::BoxLocation,
};
use super::{DESCRIPTION, NAME_TEXT, REPO, VERSION, popup};
-/// Help popup box needs these three pieces of information
-struct HelpInfo {
- lines: Vec>,
- width: usize,
- height: usize,
+macro_rules! to_u16 {
+ ($value:expr) => {
+ u16::try_from($value).unwrap_or_default()
+ };
}
-impl HelpInfo {
- /// Find the max width of a Span in &[Line]
- fn calc_width(lines: &[Line]) -> usize {
- lines
- .iter()
- .map(ratatui::prelude::Line::width)
- .max()
- .unwrap_or(1)
+#[derive(Debug, Clone, Copy, PartialEq, Eq, PartialOrd, Ord, Hash)]
+enum KeyDescriptions {
+ Clear,
+ Command,
+ Exec,
+ FilterMode,
+ Help,
+ InspectMode,
+ LogHeight,
+ LogVisibility,
+ MouseCapture,
+ Panel,
+ Quit,
+ Redraw,
+ Save,
+ ScrollEnd,
+ ScrollH,
+ ScrollSpeed,
+ ScrollStart,
+ ScrollV,
+ SearchMode,
+ SortCpu,
+ SortHeader,
+ SortId,
+ SortImage,
+ SortMem,
+ SortName,
+ SortRX,
+ SortState,
+ SortStatus,
+ SortStop,
+ SortTX,
+}
+
+type Column = Vec<(Vec>, KeyDescriptions)>;
+
+#[derive(Debug, Clone, Hash)]
+struct KeymapColumns {
+ left: Column,
+ right: Column,
+}
+
+impl KeymapColumns {
+ fn default(keymap: &Keymap) -> Self {
+ Self {
+ left: vec![
+ (
+ vec![
+ Some(keymap.quit.0.to_string()),
+ keymap.quit.1.as_ref().map(|i| i.to_string()),
+ ],
+ KeyDescriptions::Quit,
+ ),
+ (
+ vec![
+ Some(keymap.scroll_down.0.to_string()),
+ Some(keymap.scroll_up.0.to_string()),
+ keymap.scroll_down.1.as_ref().map(|i| i.to_string()),
+ keymap.scroll_up.1.as_ref().map(|i| i.to_string()),
+ Some(keymap.scroll_start.0.to_string()),
+ Some(keymap.scroll_end.0.to_string()),
+ keymap.scroll_start.1.as_ref().map(|i| i.to_string()),
+ keymap.scroll_end.1.as_ref().map(|i| i.to_string()),
+ ],
+ KeyDescriptions::ScrollV,
+ ),
+ (
+ vec![Some(keymap.scroll_many.to_string())],
+ KeyDescriptions::ScrollSpeed,
+ ),
+ (
+ vec![
+ Some(keymap.exec.0.to_string()),
+ keymap.exec.1.as_ref().map(|i| i.to_string()),
+ ],
+ KeyDescriptions::Exec,
+ ),
+ (
+ vec![
+ Some(keymap.filter_mode.0.to_string()),
+ keymap.filter_mode.1.as_ref().map(|i| i.to_string()),
+ ],
+ KeyDescriptions::FilterMode,
+ ),
+ (
+ vec![
+ Some(keymap.toggle_help.0.to_string()),
+ keymap.toggle_help.1.as_ref().map(|i| i.to_string()),
+ ],
+ KeyDescriptions::Help,
+ ),
+ (
+ vec![
+ Some(keymap.log_section_height_decrease.0.to_string()),
+ Some(keymap.log_section_height_increase.0.to_string()),
+ keymap
+ .log_section_height_decrease
+ .1
+ .as_ref()
+ .map(|i| i.to_string()),
+ keymap
+ .log_section_height_increase
+ .1
+ .as_ref()
+ .map(|i| i.to_string()),
+ ],
+ KeyDescriptions::LogHeight,
+ ),
+ (vec![Some("1 ~ 9".to_owned())], KeyDescriptions::SortHeader),
+ (
+ vec![
+ Some(keymap.select_next_panel.0.to_string()),
+ Some(keymap.select_previous_panel.0.to_string()),
+ keymap
+ .select_previous_panel
+ .1
+ .as_ref()
+ .map(|i| i.to_string()),
+ keymap.select_next_panel.1.as_ref().map(|i| i.to_string()),
+ ],
+ KeyDescriptions::Panel,
+ ),
+ (
+ vec![
+ Some(keymap.save_logs.0.to_string()),
+ keymap.save_logs.1.as_ref().map(|i| i.to_string()),
+ ],
+ KeyDescriptions::Save,
+ ),
+ ],
+ right: vec![
+ (
+ vec![
+ Some(keymap.clear.0.to_string()),
+ keymap.clear.1.as_ref().map(|i| i.to_string()),
+ ],
+ KeyDescriptions::Clear,
+ ),
+ (
+ vec![
+ Some(keymap.scroll_back.0.to_string()),
+ Some(keymap.scroll_forward.0.to_string()),
+ keymap.scroll_back.1.as_ref().map(|i| i.to_string()),
+ keymap.scroll_forward.1.as_ref().map(|i| i.to_string()),
+ ],
+ KeyDescriptions::ScrollH,
+ ),
+ (vec![Some(String::from("Enter"))], KeyDescriptions::Command),
+ (
+ vec![
+ Some(keymap.inspect.0.to_string()),
+ keymap.inspect.1.as_ref().map(|i| i.to_string()),
+ ],
+ KeyDescriptions::InspectMode,
+ ),
+ (
+ vec![
+ Some(keymap.log_search_mode.0.to_string()),
+ keymap.log_search_mode.1.as_ref().map(|i| i.to_string()),
+ ],
+ KeyDescriptions::SearchMode,
+ ),
+ (
+ vec![
+ Some(keymap.force_redraw.0.to_string()),
+ keymap.force_redraw.1.as_ref().map(|i| i.to_string()),
+ ],
+ KeyDescriptions::Redraw,
+ ),
+ (
+ vec![
+ Some(keymap.log_section_toggle.0.to_string()),
+ keymap.log_section_toggle.1.as_ref().map(|i| i.to_string()),
+ ],
+ KeyDescriptions::LogVisibility,
+ ),
+ (vec![Some("0".to_owned())], KeyDescriptions::SortStop),
+ (
+ vec![
+ Some(keymap.toggle_mouse_capture.0.to_string()),
+ keymap
+ .toggle_mouse_capture
+ .1
+ .as_ref()
+ .map(|i| i.to_string()),
+ ],
+ KeyDescriptions::MouseCapture,
+ ),
+ ],
+ }
}
+ fn custom(config: &Config) -> Self {
+ Self {
+ left: vec![
+ (
+ vec![
+ Some(config.keymap.quit.0.to_string()),
+ config.keymap.quit.1.as_ref().map(|i| i.to_string()),
+ ],
+ KeyDescriptions::Quit,
+ ),
+ (
+ vec![
+ Some(config.keymap.scroll_down.0.to_string()),
+ Some(config.keymap.scroll_up.0.to_string()),
+ config.keymap.scroll_down.1.as_ref().map(|i| i.to_string()),
+ config.keymap.scroll_up.1.as_ref().map(|i| i.to_string()),
+ ],
+ KeyDescriptions::ScrollV,
+ ),
+ (
+ vec![
+ Some(config.keymap.scroll_start.0.to_string()),
+ config.keymap.scroll_start.1.as_ref().map(|i| i.to_string()),
+ ],
+ KeyDescriptions::ScrollStart,
+ ),
+ (
+ vec![Some(config.keymap.scroll_many.to_string())],
+ KeyDescriptions::ScrollSpeed,
+ ),
+ (
+ vec![
+ Some(config.keymap.exec.0.to_string()),
+ config.keymap.exec.1.as_ref().map(|i| i.to_string()),
+ ],
+ KeyDescriptions::Exec,
+ ),
+ (
+ vec![
+ Some(config.keymap.filter_mode.0.to_string()),
+ config.keymap.filter_mode.1.as_ref().map(|i| i.to_string()),
+ ],
+ KeyDescriptions::FilterMode,
+ ),
+ (
+ vec![
+ Some(config.keymap.toggle_help.0.to_string()),
+ config.keymap.toggle_help.1.as_ref().map(|i| i.to_string()),
+ ],
+ KeyDescriptions::Help,
+ ),
+ (
+ vec![
+ Some(config.keymap.log_section_height_decrease.0.to_string()),
+ Some(config.keymap.log_section_height_increase.0.to_string()),
+ config
+ .keymap
+ .log_section_height_decrease
+ .1
+ .as_ref()
+ .map(|i| i.to_string()),
+ config
+ .keymap
+ .log_section_height_increase
+ .1
+ .as_ref()
+ .map(|i| i.to_string()),
+ ],
+ KeyDescriptions::LogHeight,
+ ),
+ (
+ vec![
+ Some(config.keymap.sort_by_name.0.to_string()),
+ config.keymap.sort_by_name.1.as_ref().map(|i| i.to_string()),
+ ],
+ KeyDescriptions::SortName,
+ ),
+ (
+ vec![
+ Some(config.keymap.sort_by_status.0.to_string()),
+ config
+ .keymap
+ .sort_by_status
+ .1
+ .as_ref()
+ .map(|i| i.to_string()),
+ ],
+ KeyDescriptions::SortStatus,
+ ),
+ (
+ vec![
+ Some(config.keymap.sort_by_memory.0.to_string()),
+ config
+ .keymap
+ .sort_by_memory
+ .1
+ .as_ref()
+ .map(|i| i.to_string()),
+ ],
+ KeyDescriptions::SortMem,
+ ),
+ (
+ vec![
+ Some(config.keymap.sort_by_image.0.to_string()),
+ config
+ .keymap
+ .sort_by_image
+ .1
+ .as_ref()
+ .map(|i| i.to_string()),
+ ],
+ KeyDescriptions::SortImage,
+ ),
+ (
+ vec![
+ Some(config.keymap.sort_by_tx.0.to_string()),
+ config.keymap.sort_by_tx.1.as_ref().map(|i| i.to_string()),
+ ],
+ KeyDescriptions::SortTX,
+ ),
+ (
+ vec![
+ Some(config.keymap.select_next_panel.0.to_string()),
+ Some(config.keymap.select_previous_panel.0.to_string()),
+ config
+ .keymap
+ .select_previous_panel
+ .1
+ .as_ref()
+ .map(|i| i.to_string()),
+ config
+ .keymap
+ .select_next_panel
+ .1
+ .as_ref()
+ .map(|i| i.to_string()),
+ ],
+ KeyDescriptions::Panel,
+ ),
+ (
+ vec![
+ Some(config.keymap.save_logs.0.to_string()),
+ config.keymap.save_logs.1.as_ref().map(|i| i.to_string()),
+ ],
+ KeyDescriptions::Save,
+ ),
+ ],
+
+ right: vec![
+ (
+ vec![
+ Some(config.keymap.clear.0.to_string()),
+ config.keymap.clear.1.as_ref().map(|i| i.to_string()),
+ ],
+ KeyDescriptions::Clear,
+ ),
+ (
+ vec![
+ Some(config.keymap.scroll_back.0.to_string()),
+ Some(config.keymap.scroll_forward.0.to_string()),
+ config.keymap.scroll_back.1.as_ref().map(|i| i.to_string()),
+ config
+ .keymap
+ .scroll_forward
+ .1
+ .as_ref()
+ .map(|i| i.to_string()),
+ ],
+ KeyDescriptions::ScrollH,
+ ),
+ (
+ vec![
+ Some(config.keymap.scroll_end.0.to_string()),
+ config.keymap.scroll_end.1.as_ref().map(|i| i.to_string()),
+ ],
+ KeyDescriptions::ScrollEnd,
+ ),
+ (vec![Some(String::from("Enter"))], KeyDescriptions::Command),
+ (
+ vec![
+ Some(config.keymap.inspect.0.to_string()),
+ config.keymap.inspect.1.as_ref().map(|i| i.to_string()),
+ ],
+ KeyDescriptions::InspectMode,
+ ),
+ (
+ vec![
+ Some(config.keymap.log_search_mode.0.to_string()),
+ config
+ .keymap
+ .log_search_mode
+ .1
+ .as_ref()
+ .map(|i| i.to_string()),
+ ],
+ KeyDescriptions::SearchMode,
+ ),
+ (
+ vec![
+ Some(config.keymap.force_redraw.0.to_string()),
+ config.keymap.force_redraw.1.as_ref().map(|i| i.to_string()),
+ ],
+ KeyDescriptions::Redraw,
+ ),
+ (
+ vec![
+ Some(config.keymap.log_section_toggle.0.to_string()),
+ config
+ .keymap
+ .log_section_toggle
+ .1
+ .as_ref()
+ .map(|i| i.to_string()),
+ ],
+ KeyDescriptions::LogVisibility,
+ ),
+ (
+ vec![
+ Some(config.keymap.sort_by_state.0.to_string()),
+ config
+ .keymap
+ .sort_by_state
+ .1
+ .as_ref()
+ .map(|i| i.to_string()),
+ ],
+ KeyDescriptions::SortState,
+ ),
+ (
+ vec![
+ Some(config.keymap.sort_by_cpu.0.to_string()),
+ config.keymap.sort_by_cpu.1.as_ref().map(|i| i.to_string()),
+ ],
+ KeyDescriptions::SortCpu,
+ ),
+ (
+ vec![
+ Some(config.keymap.sort_by_id.0.to_string()),
+ config.keymap.sort_by_id.1.as_ref().map(|i| i.to_string()),
+ ],
+ KeyDescriptions::SortId,
+ ),
+ (
+ vec![
+ Some(config.keymap.sort_by_rx.0.to_string()),
+ config.keymap.sort_by_rx.1.as_ref().map(|i| i.to_string()),
+ ],
+ KeyDescriptions::SortRX,
+ ),
+ (
+ vec![
+ Some(config.keymap.sort_reset.0.to_string()),
+ config.keymap.sort_reset.1.as_ref().map(|i| i.to_string()),
+ ],
+ KeyDescriptions::SortStop,
+ ),
+ (
+ vec![
+ Some(config.keymap.toggle_mouse_capture.0.to_string()),
+ config
+ .keymap
+ .toggle_mouse_capture
+ .1
+ .as_ref()
+ .map(|i| i.to_string()),
+ ],
+ KeyDescriptions::MouseCapture,
+ ),
+ ],
+ }
+ }
+
+ /// Add 1 to allow spacing between the key and the definition
+ fn longest_line(column: &Column) -> usize {
+ column
+ .iter()
+ .map(|(keys, _)| {
+ keys.iter()
+ .filter_map(|k| k.as_deref())
+ .collect::>()
+ .join(" ")
+ .len()
+ })
+ .max()
+ .unwrap_or(0)
+ .saturating_add(1)
+ }
+
+ fn create_button_line(column: &Column, colors: &AppColors) -> Vec> {
+ let longest_button = Self::longest_line(column);
+ column
+ .iter()
+ .map(|(keys, desc)| HelpInfo::create_button_line(keys, desc, *colors, longest_button))
+ .collect::>()
+ }
+
+ fn to_helpinfo(&self, config: &Config) -> (HelpInfo, HelpInfo) {
+ let left = Self::create_button_line(&self.left, &config.app_colors);
+ let right = Self::create_button_line(&self.right, &config.app_colors);
+
+ let size_left = HelpInfo::calc_size(&left);
+ let size_right = HelpInfo::calc_size(&right);
+ (
+ HelpInfo {
+ lines: left,
+ size: size_left,
+ },
+ HelpInfo {
+ lines: right,
+ size: size_right,
+ },
+ )
+ }
+}
+
+impl KeyDescriptions {
+ fn as_str(&self) -> &'static str {
+ match self {
+ Self::Clear => "close dialog",
+ Self::Command => "send docker command",
+ Self::Exec => "exec into a container",
+ Self::FilterMode => "filter mode",
+ Self::Help => "toggle this panel",
+ Self::InspectMode => "container inspect mode",
+ Self::LogHeight => "change log section height",
+ Self::LogVisibility => "toggle of section visibility",
+ Self::MouseCapture => "toggle mouse capture - allows text selection",
+ Self::Panel => "change panel",
+ Self::Quit => "quit",
+ Self::Redraw => "force clear screen and redraw",
+ Self::Save => "save logs to file",
+ Self::ScrollH => "scroll horizontally",
+ Self::ScrollStart => "scroll to start",
+ Self::ScrollEnd => "scroll to end",
+ Self::ScrollSpeed => "increase scroll speed",
+ Self::ScrollV => "scroll vertically",
+ Self::SearchMode => "log search mode",
+ Self::SortHeader => "sort by header - or click header",
+ Self::SortStop => "stop sort",
+ Self::SortCpu => "sort by CPU",
+ Self::SortId => "sort by ID",
+ Self::SortImage => "sort by Image",
+ Self::SortMem => "sort by memory",
+ Self::SortName => "sort by name",
+ Self::SortRX => "sort by RX",
+ Self::SortState => "sort by state",
+ Self::SortStatus => "sort by status",
+ Self::SortTX => "sort by TX",
+ }
+ }
+}
+
+/// Help popup box needs these three pieces of information
+/// Change this to a trait
+#[derive(Debug, Clone, Hash)]
+struct HelpInfo {
+ lines: Vec>,
+ size: Size,
+}
+
+static DEFAULT_NAME: LazyLock = LazyLock::new(|| {
+ let colors = AppColors::new();
+ HelpInfo::gen_name_description(colors)
+});
+
+static DEFAULT_COLUMNS: LazyLock =
+ LazyLock::new(|| KeymapColumns::default(&Keymap::new()));
+
+impl HelpInfo {
+ /// Find the height and width of an array of lines
+ fn calc_size(lines: &[Line]) -> Size {
+ Size {
+ width: to_u16!(
+ lines
+ .iter()
+ .map(ratatui::prelude::Line::width)
+ .max()
+ .unwrap_or(1)
+ ),
+ height: to_u16!(lines.len()),
+ }
+ }
/// Just an empty span, i.e. a new line
- fn empty_span<'a>() -> Line<'a> {
+ fn empty_line<'a>() -> Line<'a> {
Line::from(String::new())
}
/// generate a span, of given &str and given color
- fn span<'a>(input: &str, color: Color) -> Span<'a> {
- Span::styled(input.to_owned(), Style::default().fg(color))
+ fn span<'a>(input: String, color: Color) -> Span<'a> {
+ Span::styled(input, Style::default().fg(color))
}
/// &str to black text span
- fn text_span<'a>(input: &str, color: AppColors) -> Span<'a> {
+ fn text_span<'a>(input: String, color: AppColors) -> Span<'a> {
Self::span(input, color.popup_help.text)
}
/// &str to white text span
- fn highlighted_text_span<'a>(input: &str, color: AppColors) -> Span<'a> {
+ fn highlighted_text_span<'a>(input: String, color: AppColors) -> Span<'a> {
Self::span(input, color.popup_help.text_highlight)
}
- /// Generate the `oxker` name span + metadata
- fn gen_name(colors: AppColors) -> Self {
+ /// Generate the `oxker` name section
+ fn gen_name_description(colors: AppColors) -> Self {
let mut lines = NAME_TEXT
.lines()
- .map(|i| Line::from(Self::highlighted_text_span(i, colors)))
+ .map(|i| Line::from(Self::highlighted_text_span(i.to_owned(), colors)))
.collect::>();
- lines.insert(0, Self::empty_span());
- let width = Self::calc_width(&lines);
- let height = lines.len();
-
- Self {
- lines,
- width,
- height,
- }
+ lines.extend([
+ Self::empty_line(),
+ Line::from(Self::highlighted_text_span(DESCRIPTION.to_owned(), colors)).centered(),
+ ]);
+ let size = Self::calc_size(&lines);
+ Self { lines, size }
}
- /// Generate the description span + metadata
- fn gen_description(colors: AppColors) -> Self {
- let lines = [
- Self::empty_span(),
- Line::from(Self::highlighted_text_span(DESCRIPTION, colors)),
- Self::empty_span(),
- ];
+ fn create_button<'a>(
+ input: &[Option], // Use a slice for better flexibility
+ color: AppColors,
+ spacing: usize,
+ ) -> Span<'a> {
+ let label = input
+ .iter()
+ .flatten()
+ .map(|s| s.as_str())
+ .collect::>()
+ .join(" ");
- Self {
- lines: lines.to_vec(),
- width: Self::calc_width(&lines),
- height: lines.len(),
- }
+ let padded_text = format!("{label:, show_timestamp: bool) -> Self {
- let button_item = |x: &str| Self::highlighted_text_span(&format!(" ( {x} ) "), colors);
- let button_desc = |x: &str| Self::text_span(x, colors);
- let or = || button_desc("or");
- let space = || button_desc(" ");
+ fn create_button_line<'a>(
+ keys: &[Option],
+ desc: &KeyDescriptions,
+ app_colors: AppColors,
+ longest_button: usize,
+ ) -> Line<'a> {
+ Line::from(vec![
+ Self::create_button(keys, app_colors, longest_button),
+ Span::from(desc.as_str()),
+ ])
+ }
- let descriptions = [
- Line::from(vec![
- space(),
- button_item("tab"),
- or(),
- button_item("shift+tab"),
- button_desc("change panels"),
- ]),
- Line::from(vec![
- space(),
- button_item("โ โ"),
- or(),
- button_item("j k"),
- or(),
- button_item("Home End"),
- button_desc("scroll vertically"),
- ]),
- Line::from(vec![
- space(),
- button_item("โ โ"),
- button_desc("horizontal scroll across logs"),
- ]),
- Line::from(vec![
- space(),
- button_item("ctrl"),
- button_desc("increase scroll speed, used in conjunction scroll keys"),
- ]),
- Line::from(vec![
- space(),
- button_item("enter"),
- button_desc("send docker container command"),
- ]),
- Line::from(vec![
- space(),
- button_item("e"),
- button_desc("exec into a container"),
- #[cfg(target_os = "windows")]
- button_desc(" - not available on Windows"),
- ]),
- Line::from(vec![
- space(),
- button_item("f"),
- button_desc("force clear the screen & redraw the gui"),
- ]),
- Line::from(vec![
- space(),
- button_item("h"),
- button_desc("toggle this help information - or click heading"),
- ]),
- Line::from(vec![
- space(),
- button_item("s"),
- button_desc("save logs to file"),
- ]),
- Line::from(vec![
- space(),
- button_item("m"),
- button_desc(
- "toggle mouse capture - if disabled, text on screen can be selected & copied",
- ),
- ]),
- Line::from(vec![
- space(),
- button_item("F1"),
- or(),
- button_item("/"),
- button_desc("enter filter mode"),
- ]),
- Line::from(vec![
- space(),
- button_item("#"),
- button_desc("enter log search mode"),
- ]),
- Line::from(vec![space(), button_item("0"), button_desc("stop sort")]),
- Line::from(vec![
- space(),
- button_item("1 - 9"),
- button_desc("sort by header - or click header"),
- ]),
- Line::from(vec![
- space(),
- button_item("- ="),
- button_desc("change log section height"),
- ]),
- Line::from(vec![
- space(),
- button_item("\\"),
- button_desc("toggle log section visibility"),
- ]),
- Line::from(vec![
- space(),
- button_item("esc"),
- button_desc("close dialog"),
- ]),
- Line::from(vec![
- space(),
- button_item("q"),
- button_desc("quit at any time"),
- ]),
+ fn gen_keymap_title(style: Style) -> Self {
+ let lines = vec![
+ Self::empty_line(),
+ Line::from(Span::from("Keymap"))
+ .style(style)
+ .centered()
+ .underlined(),
];
+ let size = Self::calc_size(&lines);
+ Self { lines, size }
+ }
- let mut lines = if show_timestamp {
- Vec::from([
- Self::custom_text(colors, &Keymap::new(), zone),
- Self::empty_span(),
- ])
+ fn gen_keymap(config: &Config) -> (Self, Self) {
+ let columns = if config.keymap == Keymap::new() {
+ DEFAULT_COLUMNS.clone()
} else {
- vec![]
+ KeymapColumns::custom(config)
};
-
- lines.extend_from_slice(&descriptions);
- let width = Self::calc_width(&lines);
- let height = lines.len();
-
- Self {
- lines,
- width,
- height,
- }
+ columns.to_helpinfo(config)
}
- /// Generate the final lines, GitHub link etc, + metadata
- fn gen_final(colors: AppColors) -> Self {
- let lines = [
- Self::empty_span(),
- Line::from(vec![Self::text_span(
- "currently an early work in progress, all and any input appreciated",
- colors,
- )]),
- Line::from(vec![Span::styled(
- REPO,
- Style::default()
- .fg(colors.popup_help.text_highlight)
- .add_modifier(Modifier::UNDERLINED),
- )]),
- ];
+ fn gen_locations(config: &Config) -> Self {
+ let mut entries = Vec::new();
- Self {
- lines: lines.to_vec(),
- width: Self::calc_width(&lines),
- height: lines.len(),
+ if let Some(path) = &config.dir_config {
+ entries.push(("config location: ", path.display().to_string()));
}
- }
-
- /// Display timezone in timestamps are visible
- /// Has ability to display if keymap or colors are customized, but currently not in use
- fn custom_text<'a>(colors: AppColors, _keymap: &Keymap, zone: Option<&TimeZone>) -> Line<'a> {
- let highlighted = |x: &str| Self::highlighted_text_span(x, colors);
- let text = |x: &str| Self::text_span(x, colors);
- let zone = zone.and_then(|i| i.iana_name()).unwrap_or("Etc/UTC");
- Line::from(Vec::from([text("logs timezone: "), highlighted(zone)])).centered()
- }
-
- /// Generate the display information when a custom keymap is being used
- fn gen_custom_keymap_info(
- colors: AppColors,
- km: &Keymap,
- zone: Option<&TimeZone>,
- show_timestamp: bool,
- ) -> Self {
- let button_item = |x: &str| Self::highlighted_text_span(&format!(" ( {x} ) "), colors);
- let button_desc = |x: &str| Self::text_span(x, colors);
- let or = || button_desc("or");
- let space = || button_desc(" ");
-
- let or_secondary = |a: (KeyCode, Option), desc: &str| {
- a.1.map_or_else(
- || {
- Line::from(vec![
- space(),
- button_item(&a.0.to_string()),
- button_desc(desc),
- ])
- },
- |secondary| {
- Line::from(vec![
- space(),
- button_item(&a.0.to_string()),
- or(),
- button_item(&secondary.to_string()),
- button_desc(desc),
- ])
- },
- )
- };
- let descriptions = [
- or_secondary(km.select_next_panel, "select next panel"),
- or_secondary(km.select_previous_panel, "select previous panel"),
- or_secondary(km.scroll_down, "scroll list down by one"),
- or_secondary(km.scroll_up, "scroll list up by one"),
- or_secondary(km.scroll_end, "scroll list to end"),
- or_secondary(km.scroll_start, "scroll list to start"),
- or_secondary(km.log_scroll_forward, "horizontal scroll logs right"),
- or_secondary(km.log_scroll_back, "horizontal scroll logs left"),
- Line::from(vec![
- space(),
- button_item(km.scroll_many.to_string().as_str()),
- button_desc("increase scroll speed, used in conjunction scroll keys"),
- ]),
- Line::from(vec![
- space(),
- button_item("enter"),
- button_desc("send docker container command"),
- ]),
- #[cfg(not(target_os = "windows"))]
- or_secondary(km.exec, "exec into a container"),
- #[cfg(target_os = "windows")]
- or_secondary(km.exec, "exec into a container - not available on Windows"),
- or_secondary(km.force_redraw, "force clear the screen & redraw the gui"),
- or_secondary(
- km.toggle_help,
- "toggle this help information - or click heading",
- ),
- or_secondary(km.save_logs, "save logs to file"),
- or_secondary(
- km.toggle_mouse_capture,
- "toggle mouse capture - if disabled, text on screen can be selected & copied",
- ),
- or_secondary(km.filter_mode, "enter filter mode"),
- or_secondary(km.log_search_mode, "enter log search mode"),
- or_secondary(km.sort_reset, "reset container sorting"),
- or_secondary(km.sort_by_name, "sort containers by name"),
- or_secondary(km.sort_by_state, "sort containers by state"),
- or_secondary(km.sort_by_status, "sort containers by status"),
- or_secondary(km.sort_by_cpu, "sort containers by cpu"),
- or_secondary(km.sort_by_memory, "sort containers by memory"),
- or_secondary(km.sort_by_id, "sort containers by id"),
- or_secondary(km.sort_by_image, "sort containers by image"),
- or_secondary(km.sort_by_rx, "sort containers by rx"),
- or_secondary(km.sort_by_tx, "sort containers by tx"),
- or_secondary(
- km.log_section_height_decrease,
- "decrease log section height",
- ),
- or_secondary(
- km.log_section_height_increase,
- "increase log section height",
- ),
- or_secondary(km.log_section_toggle, "toggle log section visibility"),
- or_secondary(km.clear, "close dialog"),
- or_secondary(km.quit, "quit at any time"),
- ];
-
- let mut lines = if show_timestamp {
- Vec::from([Self::custom_text(colors, km, zone), Self::empty_span()])
- } else {
- vec![]
- };
-
- lines.extend_from_slice(&descriptions);
- let width = Self::calc_width(&lines);
- let height = lines.len();
-
- Self {
- lines,
- width,
- height,
+ if let Some(path) = &config.dir_save {
+ entries.push(("export location: ", path.display().to_string()));
}
+ if config.show_timestamp {
+ let tz = config
+ .timezone
+ .as_ref()
+ .and_then(|t| t.iana_name())
+ .unwrap_or("Etc/UTC");
+ entries.push((" logs timezone: ", tz.to_string()));
+ }
+
+ let max_len = entries
+ .iter()
+ .map(|(_, val)| val.chars().count())
+ .max()
+ .unwrap_or_default();
+
+ // 3. Map entries to Lines
+ let mut lines = entries
+ .into_iter()
+ .map(|(label, val)| {
+ let spacing = " ".repeat(max_len.saturating_sub(val.chars().count()));
+ Line::from(vec![
+ Self::text_span(label.to_owned(), config.app_colors),
+ Self::highlighted_text_span(format!("{spacing}{val}"), config.app_colors),
+ ])
+ .right_aligned()
+ })
+ .collect::>();
+
+ lines.extend([
+ Self::empty_line(),
+ Line::from(Self::text_span(
+ "a work in progress, all and any input appreciated".to_owned(),
+ config.app_colors,
+ )),
+ Self::highlighted_text_span(REPO.to_owned(), config.app_colors)
+ .underlined()
+ .into_centered_line(),
+ ]);
+
+ let size = Self::calc_size(&lines);
+ Self { lines, size }
}
}
-/// Draw the help box in the centre of the screen
-pub fn draw(
- colors: AppColors,
+// Draw the oxker name on one half, other half shoe logs location, save location, timezone
+fn draw_top_section(
f: &mut Frame,
- keymap: &Keymap,
- show_timestamp: bool,
- zone: Option<&TimeZone>,
+ area: Rect,
+ colors: AppColors,
+ style: Style,
+ name: HelpInfo,
+ config_dir: HelpInfo,
) {
- let title = format!(" {VERSION} ");
-
- let name_info = HelpInfo::gen_name(colors);
- let description_info = HelpInfo::gen_description(colors);
- let final_info = HelpInfo::gen_final(colors);
-
- let button_info = if keymap == &Keymap::new() {
- HelpInfo::gen_keymap_info(colors, zone, show_timestamp)
- } else {
- HelpInfo::gen_custom_keymap_info(colors, keymap, zone, show_timestamp)
- };
-
- let max_line_width = [
- name_info.width,
- description_info.width,
- button_info.width,
- final_info.width,
- ]
- .into_iter()
- .max()
- .unwrap_or_default()
- + 2;
-
- let max_height =
- name_info.height + description_info.height + button_info.height + final_info.height + 2;
-
- let area = popup::draw(
- max_height,
- max_line_width,
- f.area(),
- BoxLocation::MiddleCentre,
- );
-
- let split_popup = Layout::default()
- .direction(Direction::Vertical)
- .constraints([
- Constraint::Max(name_info.height.try_into().unwrap_or_default()),
- Constraint::Max(description_info.height.try_into().unwrap_or_default()),
- Constraint::Max(button_info.height.try_into().unwrap_or_default()),
- Constraint::Min(final_info.height.try_into().unwrap_or_default()),
- ])
+ let horizontal_split = Layout::default()
+ .direction(Direction::Horizontal)
+ .constraints([Constraint::Percentage(50), Constraint::Percentage(50)])
.split(area);
- let name_paragraph = Paragraph::new(name_info.lines)
+ let name_paragraph = Paragraph::new(name.lines)
.style(
Style::default()
.bg(colors.popup_help.background)
@@ -412,71 +753,159 @@ pub fn draw(
)
.alignment(Alignment::Center);
- let style = || {
- Style::default()
- .bg(colors.popup_help.background)
- .fg(colors.popup_help.text)
+ let location_top_padding = name.size.height.saturating_sub(config_dir.size.height);
+
+ let right_vertical_split = Layout::default()
+ .direction(Direction::Vertical)
+ .constraints([
+ Constraint::Max(location_top_padding),
+ Constraint::Max(config_dir.size.height),
+ ])
+ .split(horizontal_split[1]);
+
+ let config_paragraph = Paragraph::new(config_dir.lines).style(style);
+
+ f.render_widget(name_paragraph, horizontal_split[0]);
+ f.render_widget(config_paragraph, right_vertical_split[1]);
+}
+
+fn draw_keymap_title(f: &mut Frame, area: Rect, title: HelpInfo) {
+ f.render_widget(Paragraph::new(title.lines), area);
+}
+
+fn draw_keymap(f: &mut Frame, area: Rect, style: Style, columns: (HelpInfo, HelpInfo)) {
+ // Calculate some padding
+ let horizontal_padding = area
+ .width
+ .saturating_sub(columns.0.size.width)
+ .saturating_sub(columns.1.size.width)
+ .saturating_div(2)
+ .saturating_sub(1);
+
+ let horizontal_split = Layout::default()
+ .direction(Direction::Horizontal)
+ .constraints([
+ Constraint::Max(horizontal_padding),
+ Constraint::Max(columns.0.size.width),
+ Constraint::Max(2),
+ Constraint::Max(columns.1.size.width),
+ Constraint::Max(horizontal_padding),
+ ])
+ .split(area);
+
+ let left_column = Paragraph::new(columns.0.lines).style(style).left_aligned();
+ let right_column = Paragraph::new(columns.1.lines).style(style).left_aligned();
+ f.render_widget(left_column, horizontal_split[1]);
+ f.render_widget(right_column, horizontal_split[3]);
+}
+
+pub fn draw(config: &Config, f: &mut Frame) {
+ let default_colors = config.app_colors == AppColors::new();
+ let title = format!(" {VERSION} ");
+ let style = Style::default()
+ .bg(config.app_colors.popup_help.background)
+ .fg(config.app_colors.popup_help.text);
+
+ let name_info = if default_colors {
+ DEFAULT_NAME.clone()
+ } else {
+ HelpInfo::gen_name_description(config.app_colors)
};
- let description_paragraph = Paragraph::new(description_info.lines)
- .style(style())
- .alignment(Alignment::Center);
+ let locations = HelpInfo::gen_locations(config);
+ let keymap_title = HelpInfo::gen_keymap_title(style);
+ let keymap_columns = HelpInfo::gen_keymap(config);
- let help_paragraph = Paragraph::new(button_info.lines)
- .style(style())
- .alignment(Alignment::Left);
-
- let final_paragraph = Paragraph::new(final_info.lines)
- .style(style())
- .alignment(Alignment::Center);
+ let total_width = name_info
+ .size
+ .width
+ // Account for spacing between the two sections
+ .saturating_add(locations.size.width)
+ .saturating_add(2)
+ .max(
+ keymap_columns
+ .0
+ .size
+ .width
+ .saturating_add(keymap_columns.1.size.width)
+ // Account for the spacing spacing between each column
+ .saturating_add(2),
+ );
+ let top_height = name_info.size.height.max(locations.size.height);
+ let keymap_height = keymap_columns
+ .0
+ .size
+ .height
+ .max(keymap_columns.1.size.height);
+ let total_height = top_height
+ .saturating_add(keymap_title.size.height)
+ .saturating_add(keymap_height);
let block = Block::default()
.title(title)
.borders(Borders::ALL)
.border_type(BorderType::Rounded)
- .border_style(
- Style::default()
- .fg(colors.popup_help.text)
- .bg(colors.popup_help.background),
- );
+ .border_style(style)
+ .style(style)
+ .padding(Padding::horizontal(1));
+
+ let area = popup::draw(
+ (total_height + 2).into(),
+ (total_width + 4).into(),
+ f.area(),
+ BoxLocation::MiddleCentre,
+ );
+
+ let inner_area = block.inner(area);
+
+ let vertical_split = Layout::default()
+ .direction(Direction::Vertical)
+ .constraints([
+ Constraint::Length(top_height),
+ Constraint::Length(keymap_title.size.height),
+ Constraint::Length(keymap_height),
+ ])
+ .split(inner_area);
- // Order is important here
f.render_widget(Clear, area);
- f.render_widget(name_paragraph, split_popup[0]);
- f.render_widget(description_paragraph, split_popup[1]);
- f.render_widget(help_paragraph, split_popup[2]);
- f.render_widget(final_paragraph, split_popup[3]);
f.render_widget(block, area);
+ draw_top_section(
+ f,
+ vertical_split[0],
+ config.app_colors,
+ style,
+ name_info,
+ locations,
+ );
+ draw_keymap_title(f, vertical_split[1], keymap_title);
+ draw_keymap(f, vertical_split[2], style, keymap_columns);
}
#[cfg(test)]
#[allow(clippy::unwrap_used, clippy::too_many_lines)]
mod tests {
+ use std::path::PathBuf;
+
use crate::config::{AppColors, Keymap};
use crossterm::event::{KeyCode, KeyModifiers};
use insta::assert_snapshot;
- use jiff::tz::TimeZone;
- use ratatui::style::{Color, Modifier};
+ use ratatui::style::Color;
use crate::ui::draw_blocks::tests::{get_result, test_setup};
#[test]
- /// This will cause issues once the version has more than the current 5 chars (0.5.0)
/// This test is incredibly annoying
/// println!("{} {} {} {} {}", row_index, result_cell_index, result_cell.symbol(), result_cell.bg, result_cell.fg);
fn test_draw_blocks_help() {
- let mut setup = test_setup(87, 39, true, true);
- let tz = setup.app_data.lock().config.timezone.clone();
+ let mut setup = test_setup(118, 25, true, true);
+ setup.app_data.lock().config.dir_save = Some(PathBuf::from("/test_dir"));
+ setup.app_data.lock().config.dir_config =
+ Some(PathBuf::from("/home/user/.config/oxker/config.toml"));
+ setup.app_data.lock().config.show_timestamp = true;
setup
.terminal
.draw(|f| {
- super::draw(
- AppColors::new(),
- f,
- &setup.app_data.lock().config.keymap,
- false,
- tz.as_ref(),
- );
+ super::draw(&setup.app_data.lock().config, f);
})
.unwrap();
@@ -485,100 +914,209 @@ mod tests {
for (row_index, result_row) in get_result(&setup) {
for (result_cell_index, result_cell) in result_row.iter().enumerate() {
match (row_index, result_cell_index) {
- // first & last row, and first & last char on each row, is reset/reset, making sure that the help info is centered in the given area
- (0 | 38, _) | (0..=37, 0 | 86) => {
- assert_eq!(result_cell.bg, Color::Reset);
- assert_eq!(result_cell.fg, Color::Reset);
- }
- // Buttons
- (2..=10, 2..=84)
- | (12, 19..=66)
- | (14, 2..=10 | 13..=27)
- | (15, 2..=10 | 13..=21 | 24..=37)
- | (16 | 28 | 30, 2..=10)
- | (19..=26 | 29 | 31, 2..=8)
- | (17, 2..=11)
- | (18 | 27, 2..=12)
- | (24, 2..=9 | 12..=18) => {
- assert_eq!(result_cell.bg, Color::Magenta);
- assert_eq!(result_cell.fg, Color::White);
- }
- // The URL is white on yellow and underlined
- (34, 25..=60) => {
- assert_eq!(result_cell.bg, Color::Magenta);
- assert_eq!(result_cell.fg, Color::White);
- assert_eq!(result_cell.modifier, Modifier::UNDERLINED);
- }
- // The rest is black on magenta
- _ => {
- assert_eq!(result_cell.bg, Color::Magenta);
- assert_eq!(result_cell.fg, Color::Black);
- }
- }
+ // The space around the popup
+ (0|24, _) | (_, 0|117) => assert_eq!((result_cell.bg, result_cell.fg), (Color::Reset, Color::Reset)),
+ // The borders
+ (1|23, 1..=23) | (_, 1|116) => assert_eq!((result_cell.bg, result_cell.fg), (Color::Magenta, Color::Black)),
+ // The oxker logo
+ // The description
+ (2..=10, 3..=58)|
+ // Config location
+ (5, 79..=114) |
+ // Export location
+ (6, 79..=114) |
+ // Timezone
+ (7, 79..=114) |
+ //url
+ (10, 69..=104) |
+ // Left column
+ (13..=22, 4..=24) |
+ // Right Column
+ (13..=21,59..=69)
+ => assert_eq!((result_cell.bg, result_cell.fg), (Color::Magenta, Color::White)),
+ _ => assert_eq!((result_cell.bg, result_cell.fg), (Color::Magenta, Color::Black)),
+ };
}
}
}
#[test]
- /// Test that the help panel gets drawn with custom colors
- /// This test is incredibly annoying
- /// println!("{} {} {} {} {}", row_index, result_cell_index, result_cell.symbol(), result_cell.bg, result_cell.fg);
- fn test_draw_blocks_help_custom_colors() {
- let mut setup = test_setup(87, 39, true, true);
- let mut colors = AppColors::new();
- let tz = setup.app_data.lock().config.timezone.clone();
-
- colors.popup_help.background = Color::Black;
- colors.popup_help.text = Color::Red;
- colors.popup_help.text_highlight = Color::Yellow;
+ fn test_draw_blocks_help_no_config() {
+ let mut setup = test_setup(116, 25, true, true);
+ setup.app_data.lock().config.dir_save = Some(PathBuf::from("/test_dir"));
+ setup.app_data.lock().config.show_timestamp = true;
setup
.terminal
.draw(|f| {
- super::draw(
- colors,
- f,
- &setup.app_data.lock().config.keymap,
- false,
- tz.as_ref(),
- );
+ super::draw(&setup.app_data.lock().config, f);
})
.unwrap();
assert_snapshot!(setup.terminal.backend());
+
for (row_index, result_row) in get_result(&setup) {
for (result_cell_index, result_cell) in result_row.iter().enumerate() {
match (row_index, result_cell_index) {
- // first & last row, and first & last char on each row, is reset/reset, making sure that the help info is centered in the given area
- (0 | 38, _) | (0..=37, 0 | 86) => {
- assert_eq!(result_cell.bg, Color::Reset);
- assert_eq!(result_cell.fg, Color::Reset);
- }
- // Buttons
- (2..=10, 2..=84)
- | (12, 19..=66)
- | (14, 2..=10 | 13..=27)
- | (15, 2..=10 | 13..=21 | 24..=37)
- | (16 | 28 | 30, 2..=10)
- | (19..=26 | 29 | 31, 2..=8)
- | (17, 2..=11)
- | (18 | 27, 2..=12)
- | (24, 2..=9 | 12..=18) => {
- assert_eq!(result_cell.bg, Color::Black);
- assert_eq!(result_cell.fg, Color::Yellow);
- }
- // The URL is white on yellow and underlined
- (34, 25..=60) => {
- assert_eq!(result_cell.bg, Color::Black);
- assert_eq!(result_cell.fg, Color::Yellow);
- assert_eq!(result_cell.modifier, Modifier::UNDERLINED);
- }
- // The rest is black on magenta
- _ => {
- assert_eq!(result_cell.bg, Color::Black);
- assert_eq!(result_cell.fg, Color::Red);
- }
- }
+ // The space around the popup
+ (0|24, _) | (_, 0|115) => assert_eq!((result_cell.bg, result_cell.fg), (Color::Reset, Color::Reset)),
+ // The borders
+ (1|23, 1..=23) | (_, 1|114) => assert_eq!((result_cell.bg, result_cell.fg), (Color::Magenta, Color::Black)),
+ // The oxker logo
+ // The description
+ (2..=10, 3..=57)|
+ // Export location
+ (6, 104..=112) |
+ // Timezone
+ (7, 104..=112) |
+ //url
+ (10, 67..=102) |
+ // Left column
+ (13..=22, 3..=23) |
+ // Right Column
+ (13..=21,58..=68)
+ => assert_eq!((result_cell.bg, result_cell.fg), (Color::Magenta, Color::White)),
+ _ => assert_eq!((result_cell.bg, result_cell.fg), (Color::Magenta, Color::Black)),
+ };
+ }
+ }
+ }
+
+ #[test]
+ fn test_draw_blocks_help_no_save() {
+ let mut setup = test_setup(118, 25, true, true);
+ setup.app_data.lock().config.dir_config =
+ Some(PathBuf::from("/home/user/.config/oxker/config.toml"));
+ setup.app_data.lock().config.show_timestamp = true;
+
+ setup
+ .terminal
+ .draw(|f| {
+ super::draw(&setup.app_data.lock().config, f);
+ })
+ .unwrap();
+
+ assert_snapshot!(setup.terminal.backend());
+
+ for (row_index, result_row) in get_result(&setup) {
+ for (result_cell_index, result_cell) in result_row.iter().enumerate() {
+ match (row_index, result_cell_index) {
+ // The space around the popup
+ (0|24, _) | (_, 0|117) => assert_eq!((result_cell.bg, result_cell.fg), (Color::Reset, Color::Reset)),
+ // The borders
+ (1|23, 1..=23) | (_, 1|116) => assert_eq!((result_cell.bg, result_cell.fg), (Color::Magenta, Color::Black)),
+ // The oxker logo
+ // The description
+ (2..=10, 3..=58)|
+ // Config location
+ (6, 79..=114) |
+ // Timezone
+ (7, 79..=114) |
+ //url
+ (10, 69..=104) |
+ // Left column
+ (13..=22, 4..=24) |
+ // Right Column
+ (13..=21,59..=69)
+ => assert_eq!((result_cell.bg, result_cell.fg), (Color::Magenta, Color::White)),
+ _ => assert_eq!((result_cell.bg, result_cell.fg), (Color::Magenta, Color::Black)),
+ };
+ }
+ }
+ }
+
+ #[test]
+ fn test_draw_blocks_help_no_timezone() {
+ let mut setup = test_setup(118, 25, true, true);
+ setup.app_data.lock().config.dir_save = Some(PathBuf::from("/test_dir"));
+ setup.app_data.lock().config.dir_config =
+ Some(PathBuf::from("/home/user/.config/oxker/config.toml"));
+
+ setup
+ .terminal
+ .draw(|f| {
+ super::draw(&setup.app_data.lock().config, f);
+ })
+ .unwrap();
+
+ assert_snapshot!(setup.terminal.backend());
+
+ for (row_index, result_row) in get_result(&setup) {
+ for (result_cell_index, result_cell) in result_row.iter().enumerate() {
+ match (row_index, result_cell_index) {
+ // The space around the popup
+ (0|24, _) | (_, 0|117) => assert_eq!((result_cell.bg, result_cell.fg), (Color::Reset, Color::Reset)),
+ // The borders
+ (1|23, 1..=23) | (_, 1|116) => assert_eq!((result_cell.bg, result_cell.fg), (Color::Magenta, Color::Black)),
+ // The oxker logo
+ // The description
+ (2..=10, 3..=58)|
+ // Config location
+ (6, 79..=114) |
+ // Export location
+ (7, 79..=114) |
+ //url
+ (10, 69..=104) |
+ // Left column
+ (13..=22, 4..=24) |
+ // Right Column
+ (13..=21,59..=69)
+ => assert_eq!((result_cell.bg, result_cell.fg), (Color::Magenta, Color::White)),
+ _ => assert_eq!((result_cell.bg, result_cell.fg), (Color::Magenta, Color::Black)),
+ };
+ }
+ }
+ }
+
+ #[test]
+ fn test_draw_blocks_help_custom_color() {
+ let mut setup = test_setup(118, 25, true, true);
+ setup.app_data.lock().config.dir_save = Some(PathBuf::from("/test_dir"));
+ setup.app_data.lock().config.dir_config =
+ Some(PathBuf::from("/home/user/.config/oxker/config.toml"));
+ setup.app_data.lock().config.show_timestamp = true;
+
+ let mut colors = AppColors::new();
+ colors.popup_help.background = Color::Black;
+ colors.popup_help.text = Color::Red;
+ colors.popup_help.text_highlight = Color::Yellow;
+
+ setup.app_data.lock().config.app_colors = colors;
+
+ setup
+ .terminal
+ .draw(|f| {
+ super::draw(&setup.app_data.lock().config, f);
+ })
+ .unwrap();
+
+ assert_snapshot!(setup.terminal.backend());
+
+ for (row_index, result_row) in get_result(&setup) {
+ for (result_cell_index, result_cell) in result_row.iter().enumerate() {
+ match (row_index, result_cell_index) {
+ // The space around the popup
+ (0|24, _) | (_, 0|117) => assert_eq!((result_cell.bg, result_cell.fg), (Color::Reset, Color::Reset)),
+ // The borders
+ (1|23, 1..=23) | (_, 1|116) => assert_eq!((result_cell.bg, result_cell.fg), (Color::Black, Color::Red)),
+ // The oxker logo
+ // The description
+ (2..=10, 3..=58)|
+ // Config location
+ (5, 79..=114) |
+ // Export location
+ (6, 79..=114) |
+ // Timezone
+ (7, 79..=114) |
+ //url
+ (10, 69..=104) |
+ // Left column
+ (13..=22, 4..=24) |
+ // Right Column
+ (13..=21,59..=69)
+ => assert_eq!((result_cell.bg, result_cell.fg), (Color::Black, Color::Yellow)),
+ _ => assert_eq!((result_cell.bg, result_cell.fg), (Color::Black, Color::Red)),
+ };
}
}
}
@@ -586,27 +1124,33 @@ mod tests {
#[test]
/// Help panel will show custom keymap if in use, with one definition for each entry
fn test_draw_blocks_help_custom_keymap_one_definition() {
- let mut setup = test_setup(98, 50, true, true);
+ let mut setup = test_setup(118, 25, true, true);
- let input = Keymap {
+ setup.app_data.lock().config.dir_save = Some(PathBuf::from("/test_dir"));
+ setup.app_data.lock().config.dir_config =
+ Some(PathBuf::from("/home/user/.config/oxker/config.toml"));
+ setup.app_data.lock().config.show_timestamp = true;
+
+ let keymap = Keymap {
clear: (KeyCode::Char('a'), None),
delete_confirm: (KeyCode::Char('b'), None),
delete_deny: (KeyCode::Char('c'), None),
exec: (KeyCode::Char('d'), None),
- filter_mode: (KeyCode::Char('e'), None),
- log_search_mode: (KeyCode::Char('7'), None),
- force_redraw: (KeyCode::Char('f'), None),
- log_scroll_back: (KeyCode::Char('g'), None),
- log_scroll_forward: (KeyCode::Char('h'), None),
- log_section_height_decrease: (KeyCode::Char('i'), None),
- log_section_height_increase: (KeyCode::Char('j'), None),
- log_section_toggle: (KeyCode::Char('k'), None),
- quit: (KeyCode::Char('l'), None),
- save_logs: (KeyCode::Char('m'), None),
- scroll_down: (KeyCode::Char('o'), None),
- scroll_end: (KeyCode::Char('p'), None),
+ inspect: (KeyCode::Char('e'), None),
+ filter_mode: (KeyCode::Char('f'), None),
+ log_search_mode: (KeyCode::Char('g'), None),
+ force_redraw: (KeyCode::Char('h'), None),
+ scroll_back: (KeyCode::Char('i'), None),
+ scroll_forward: (KeyCode::Char('j'), None),
+ log_section_height_decrease: (KeyCode::Char('k'), None),
+ log_section_height_increase: (KeyCode::Char('l'), None),
+ log_section_toggle: (KeyCode::Char('m'), None),
+ quit: (KeyCode::Char('n'), None),
+ save_logs: (KeyCode::Char('o'), None),
+ scroll_down: (KeyCode::Char('p'), None),
+ scroll_end: (KeyCode::Char('q'), None),
scroll_many: KeyModifiers::ALT,
- scroll_start: (KeyCode::Char('q'), None),
+ scroll_start: (KeyCode::Char('r'), None),
scroll_up: (KeyCode::Char('s'), None),
select_next_panel: (KeyCode::Char('t'), None),
select_previous_panel: (KeyCode::Char('u'), None),
@@ -624,10 +1168,12 @@ mod tests {
toggle_mouse_capture: (KeyCode::Char('6'), None),
};
+ setup.app_data.lock().config.keymap = keymap;
+
setup
.terminal
.draw(|f| {
- super::draw(AppColors::new(), f, &input, false, None);
+ super::draw(&setup.app_data.lock().config, f);
})
.unwrap();
@@ -635,50 +1181,58 @@ mod tests {
}
#[test]
- /// Help panel will show custom keymap if in use, with two definition for each entry
- fn test_draw_blocks_help_custom_keymap_two_definitions() {
- let mut setup = test_setup(110, 50, true, true);
+ /// Help panel will show custom keymap if in use, with two definitions for each entry
+ fn test_draw_blocks_help_custom_keymap_two_definition() {
+ let mut setup = test_setup(124, 30, true, true);
+
+ setup.app_data.lock().config.dir_save = Some(PathBuf::from("/test_dir"));
+ setup.app_data.lock().config.dir_config =
+ Some(PathBuf::from("/home/user/.config/oxker/config.toml"));
+ setup.app_data.lock().config.show_timestamp = true;
let keymap = Keymap {
- clear: (KeyCode::Char('a'), Some(KeyCode::Char('A'))),
- delete_confirm: (KeyCode::Char('b'), Some(KeyCode::Char('B'))),
- delete_deny: (KeyCode::Char('c'), Some(KeyCode::Char('C'))),
- exec: (KeyCode::Char('d'), Some(KeyCode::Char('D'))),
- filter_mode: (KeyCode::Char('e'), Some(KeyCode::Char('E'))),
- log_search_mode: (KeyCode::Char('m'), Some(KeyCode::Char('M'))),
- force_redraw: (KeyCode::Char('f'), Some(KeyCode::Char('F'))),
- log_scroll_back: (KeyCode::Char('f'), Some(KeyCode::Char('F'))),
- log_scroll_forward: (KeyCode::Char('g'), Some(KeyCode::Char('G'))),
- log_section_height_decrease: (KeyCode::Char('h'), Some(KeyCode::Char('H'))),
- log_section_height_increase: (KeyCode::Char('i'), Some(KeyCode::Char('I'))),
- log_section_toggle: (KeyCode::Char('j'), Some(KeyCode::Char('J'))),
- quit: (KeyCode::Char('k'), Some(KeyCode::Char('K'))),
- save_logs: (KeyCode::Char('l'), Some(KeyCode::Char('L'))),
- scroll_down: (KeyCode::Char('n'), Some(KeyCode::Char('N'))),
- scroll_end: (KeyCode::Char('o'), Some(KeyCode::Char('O'))),
+ clear: (KeyCode::Char('a'), Some(KeyCode::Char('b'))),
+ delete_confirm: (KeyCode::Char('c'), Some(KeyCode::Char('d'))),
+ delete_deny: (KeyCode::Char('e'), Some(KeyCode::Char('f'))),
+ exec: (KeyCode::Char('g'), Some(KeyCode::Char('h'))),
+ inspect: (KeyCode::Char('i'), Some(KeyCode::Char('j'))),
+ filter_mode: (KeyCode::Char('k'), Some(KeyCode::Char('l'))),
+ log_search_mode: (KeyCode::Char('m'), Some(KeyCode::Char('n'))),
+ force_redraw: (KeyCode::Char('o'), Some(KeyCode::Char('p'))),
+ scroll_back: (KeyCode::Char('q'), Some(KeyCode::Char('r'))),
+ scroll_forward: (KeyCode::Char('s'), Some(KeyCode::Char('t'))),
+ log_section_height_decrease: (KeyCode::Char('u'), Some(KeyCode::Char('v'))),
+ log_section_height_increase: (KeyCode::Char('w'), Some(KeyCode::Char('x'))),
+ log_section_toggle: (KeyCode::Char('y'), Some(KeyCode::Char('z'))),
+ quit: (KeyCode::Char('0'), Some(KeyCode::Char('1'))),
+ save_logs: (KeyCode::Char('2'), Some(KeyCode::Char('3'))),
+ scroll_down: (KeyCode::Char('4'), Some(KeyCode::Char('5'))),
+ scroll_end: (KeyCode::Char('6'), Some(KeyCode::Char('7'))),
scroll_many: KeyModifiers::ALT,
- scroll_start: (KeyCode::Char('p'), Some(KeyCode::Char('P'))),
- scroll_up: (KeyCode::Char('r'), Some(KeyCode::Char('R'))),
- select_next_panel: (KeyCode::Char('s'), Some(KeyCode::Char('S'))),
- select_previous_panel: (KeyCode::Char('t'), Some(KeyCode::Char('T'))),
- sort_by_cpu: (KeyCode::Char('u'), Some(KeyCode::Char('U'))),
- sort_by_id: (KeyCode::Char('v'), Some(KeyCode::Char('V'))),
- sort_by_image: (KeyCode::Char('w'), Some(KeyCode::Char('W'))),
- sort_by_memory: (KeyCode::Char('x'), Some(KeyCode::Char('X'))),
- sort_by_name: (KeyCode::Char('y'), Some(KeyCode::Char('Y'))),
- sort_by_rx: (KeyCode::Char('z'), Some(KeyCode::Char('Z'))),
- sort_by_state: (KeyCode::Char('0'), Some(KeyCode::Char('9'))),
- sort_by_status: (KeyCode::Char('1'), Some(KeyCode::Char('8'))),
- sort_by_tx: (KeyCode::Char('2'), Some(KeyCode::Char('7'))),
- sort_reset: (KeyCode::Char('3'), Some(KeyCode::Char('6'))),
- toggle_help: (KeyCode::Char('4'), Some(KeyCode::Char('5'))),
- toggle_mouse_capture: (KeyCode::Char('5'), Some(KeyCode::PageDown)),
+ scroll_start: (KeyCode::Char('8'), Some(KeyCode::Char('9'))),
+ scroll_up: (KeyCode::CapsLock, Some(KeyCode::ScrollLock)),
+ select_next_panel: (KeyCode::PrintScreen, Some(KeyCode::Right)),
+ select_previous_panel: (KeyCode::Left, Some(KeyCode::Up)),
+ sort_by_cpu: (KeyCode::Down, Some(KeyCode::Delete)),
+ sort_by_id: (KeyCode::BackTab, Some(KeyCode::Backspace)),
+ sort_by_image: (KeyCode::End, Some(KeyCode::Esc)),
+ sort_by_memory: (KeyCode::Home, Some(KeyCode::Insert)),
+ sort_by_name: (KeyCode::KeypadBegin, Some(KeyCode::Menu)),
+ sort_by_rx: (KeyCode::NumLock, Some(KeyCode::PageDown)),
+ sort_by_state: (KeyCode::PageUp, Some(KeyCode::Pause)),
+ sort_by_status: (KeyCode::PrintScreen, Some(KeyCode::Tab)),
+ sort_by_tx: (KeyCode::F(1), Some(KeyCode::F(2))),
+ sort_reset: (KeyCode::F(3), Some(KeyCode::F(4))),
+ toggle_help: (KeyCode::F(5), Some(KeyCode::F(6))),
+ toggle_mouse_capture: (KeyCode::F(7), Some(KeyCode::F(8))),
};
+ setup.app_data.lock().config.keymap = keymap;
+
setup
.terminal
.draw(|f| {
- super::draw(AppColors::new(), f, &keymap, false, None);
+ super::draw(&setup.app_data.lock().config, f);
})
.unwrap();
@@ -686,90 +1240,61 @@ mod tests {
}
#[test]
- /// Help panel will show custom keymap if in use, with either one or two definition for each entry
- #[allow(clippy::todo)]
- fn test_draw_blocks_help_one_and_two_definitions() {
- let mut setup = test_setup(110, 50, true, true);
+ /// Help panel will show custom keymap if in use, with one or two definitions for each entry
+ fn test_draw_blocks_help_custom_keymap_one_two_definition() {
+ let mut setup = test_setup(124, 30, true, true);
+
+ setup.app_data.lock().config.dir_save = Some(PathBuf::from("/test_dir"));
+ setup.app_data.lock().config.dir_config =
+ Some(PathBuf::from("/home/user/.config/oxker/config.toml"));
+ setup.app_data.lock().config.show_timestamp = true;
let keymap = Keymap {
- clear: (KeyCode::Char('a'), Some(KeyCode::Char('A'))),
- delete_confirm: (KeyCode::Char('b'), None),
- delete_deny: (KeyCode::Char('c'), Some(KeyCode::Char('C'))),
- exec: (KeyCode::Char('d'), None),
- filter_mode: (KeyCode::Char('e'), Some(KeyCode::Char('E'))),
- log_search_mode: (KeyCode::Char('8'), None),
- force_redraw: (KeyCode::Char('f'), None),
- log_scroll_back: (KeyCode::Char('g'), Some(KeyCode::Char('G'))),
- log_scroll_forward: (KeyCode::Char('h'), None),
- log_section_height_decrease: (KeyCode::Char('i'), Some(KeyCode::Char('I'))),
- log_section_height_increase: (KeyCode::Char('j'), None),
- log_section_toggle: (KeyCode::Char('k'), Some(KeyCode::Char('K'))),
- quit: (KeyCode::Char('l'), None),
- save_logs: (KeyCode::Char('m'), Some(KeyCode::Char('M'))),
- scroll_down: (KeyCode::Char('o'), Some(KeyCode::Char('O'))),
- scroll_end: (KeyCode::Char('p'), None),
+ clear: (KeyCode::Char('a'), Some(KeyCode::Char('b'))),
+ delete_confirm: (KeyCode::Char('c'), None),
+ delete_deny: (KeyCode::Char('e'), Some(KeyCode::Char('f'))),
+ exec: (KeyCode::Char('g'), None),
+ inspect: (KeyCode::Char('i'), Some(KeyCode::Char('j'))),
+ filter_mode: (KeyCode::Char('k'), None),
+ log_search_mode: (KeyCode::Char('m'), Some(KeyCode::Char('n'))),
+ force_redraw: (KeyCode::Char('o'), None),
+ scroll_back: (KeyCode::Char('q'), Some(KeyCode::Char('r'))),
+ scroll_forward: (KeyCode::Char('s'), None),
+ log_section_height_decrease: (KeyCode::Char('u'), Some(KeyCode::Char('v'))),
+ log_section_height_increase: (KeyCode::Char('w'), None),
+ log_section_toggle: (KeyCode::Char('y'), Some(KeyCode::Char('z'))),
+ quit: (KeyCode::Char('0'), None),
+ save_logs: (KeyCode::Char('2'), Some(KeyCode::Char('3'))),
+ scroll_down: (KeyCode::Char('4'), None),
+ scroll_end: (KeyCode::Char('6'), Some(KeyCode::Char('7'))),
scroll_many: KeyModifiers::ALT,
- scroll_start: (KeyCode::Char('q'), Some(KeyCode::Char('Q'))),
- scroll_up: (KeyCode::Char('s'), Some(KeyCode::Char('S'))),
- select_next_panel: (KeyCode::Char('t'), None),
- select_previous_panel: (KeyCode::Char('u'), Some(KeyCode::Char('U'))),
- sort_by_cpu: (KeyCode::Char('v'), None),
- sort_by_id: (KeyCode::Char('w'), Some(KeyCode::Char('W'))),
- sort_by_image: (KeyCode::Char('x'), None),
- sort_by_memory: (KeyCode::Char('y'), Some(KeyCode::Char('Y'))),
- sort_by_name: (KeyCode::Char('z'), None),
- sort_by_rx: (KeyCode::Char('0'), Some(KeyCode::Char('9'))),
- sort_by_state: (KeyCode::Char('1'), None),
- sort_by_status: (KeyCode::Char('2'), Some(KeyCode::Char('7'))),
- sort_by_tx: (KeyCode::Char('3'), None),
- sort_reset: (KeyCode::Char('4'), Some(KeyCode::Char('5'))),
- toggle_help: (KeyCode::Char('5'), None),
- toggle_mouse_capture: (KeyCode::Char('6'), Some(KeyCode::Char('#'))),
+ scroll_start: (KeyCode::Char('8'), None),
+ scroll_up: (KeyCode::CapsLock, Some(KeyCode::ScrollLock)),
+ select_next_panel: (KeyCode::PrintScreen, None),
+ select_previous_panel: (KeyCode::Left, Some(KeyCode::Up)),
+ sort_by_cpu: (KeyCode::Down, None),
+ sort_by_id: (KeyCode::BackTab, None),
+ sort_by_image: (KeyCode::End, Some(KeyCode::Esc)),
+ sort_by_memory: (KeyCode::Home, None),
+ sort_by_name: (KeyCode::KeypadBegin, Some(KeyCode::Menu)),
+ sort_by_rx: (KeyCode::NumLock, None),
+ sort_by_state: (KeyCode::PageUp, Some(KeyCode::Pause)),
+ sort_by_status: (KeyCode::PrintScreen, None),
+ sort_by_tx: (KeyCode::F(1), Some(KeyCode::F(2))),
+ sort_reset: (KeyCode::F(3), None),
+ toggle_help: (KeyCode::F(5), Some(KeyCode::F(6))),
+ toggle_mouse_capture: (KeyCode::F(7), None),
};
- let tz = setup.app_data.lock().config.timezone.clone();
+ setup.app_data.lock().config.keymap = keymap;
setup
.terminal
.draw(|f| {
- super::draw(AppColors::new(), f, &keymap, false, tz.as_ref());
+ super::draw(&setup.app_data.lock().config, f);
})
.unwrap();
assert_snapshot!(setup.terminal.backend());
}
-
- #[test]
- fn test_draw_blocks_help_show_timezone() {
- let mut setup = test_setup(87, 39, true, true);
-
- setup
- .terminal
- .draw(|f| {
- super::draw(
- AppColors::new(),
- f,
- &Keymap::new(),
- true,
- Some(&TimeZone::get("asia/tokyo").unwrap()),
- );
- })
- .unwrap();
-
- assert_snapshot!(setup.terminal.backend());
-
- for (row_index, result_row) in get_result(&setup) {
- for (result_cell_index, result_cell) in result_row.iter().enumerate() {
- match (row_index, result_cell_index) {
- (13, 31..=45) => {
- assert_eq!(result_cell.fg, AppColors::new().popup_help.text);
- }
- (13, 46..=55) => {
- assert_eq!(result_cell.fg, AppColors::new().popup_help.text_highlight);
- }
- _ => (),
- }
- }
- }
- }
}
diff --git a/src/ui/draw_blocks/inspect.rs b/src/ui/draw_blocks/inspect.rs
new file mode 100644
index 0000000..3c5917d
--- /dev/null
+++ b/src/ui/draw_blocks/inspect.rs
@@ -0,0 +1,777 @@
+use std::sync::Arc;
+
+use parking_lot::Mutex;
+use ratatui::{
+ Frame,
+ layout::Rect,
+ style::{Style, Stylize},
+ text::Line,
+ widgets::{Block, Borders, Paragraph, Wrap},
+};
+
+use crate::{
+ app_data::InspectData,
+ config::{AppColors, Keymap},
+ ui::{
+ GuiState,
+ draw_blocks::{DOWN_ARROW, LEFT_ARROW, RIGHT_ARROW, UP_ARROW},
+ gui_state::ScrollOffset,
+ },
+};
+
+/// Create a bordered block with a title.
+fn title_block<'a>(upper_title: &'a str, lower_title: &'a str, colors: &AppColors) -> Block<'a> {
+ Block::default()
+ .borders(Borders::all())
+ .border_type(ratatui::widgets::BorderType::Rounded)
+ .border_style(Style::default().fg(colors.borders.selected))
+ .title(upper_title.bold().into_centered_line())
+ .title_bottom(lower_title.bold().into_centered_line())
+}
+
+/// Create the upper title, with container name, id, and keymap to clear
+fn generate_upper_title(data: &InspectData, keymap: &Keymap) -> String {
+ let mut output = String::from(" inspecting: ");
+ let name = if data.name.starts_with("/") {
+ data.name.replacen('/', "", 1)
+ } else {
+ data.name.clone()
+ };
+
+ output.push_str(&format!("{} {} ", name, data.id.get_short()));
+ let mut inspect_key = keymap.inspect.0.to_string();
+ if let Some(x) = keymap.inspect.1 {
+ inspect_key.push_str(&format!(" or {x}"));
+ }
+ let mut clear_key = keymap.clear.0.to_string();
+ if let Some(x) = keymap.clear.1 {
+ clear_key.push_str(&format!(" or {x}"));
+ }
+ output.push_str(&format!(" - {clear_key} or {inspect_key} to exit"));
+ output.push(' ');
+ output
+}
+
+/// Generate the lower title, with the current scroll and the scrolling limits
+fn generate_lower_title(length: usize, width: usize, offset: ScrollOffset) -> String {
+ let length_width = length
+ .to_string()
+ .chars()
+ .count()
+ .max(offset.y.to_string().chars().count());
+ let width_width = width
+ .to_string()
+ .chars()
+ .count()
+ .max(offset.x.to_string().chars().count());
+
+ let left_arrow = if offset.x == 0 { " " } else { LEFT_ARROW };
+ let right_arrow = if offset.x == width { " " } else { RIGHT_ARROW };
+ let up_arrow = if offset.y == 0 { " " } else { UP_ARROW };
+ let down_arrow = if offset.y == length { " " } else { DOWN_ARROW };
+
+ format!(
+ " {up_arrow} {:>length_width$}/{:>length_width$} {down_arrow} {left_arrow} {:>width_width$}/{:>width_width$} {right_arrow} ",
+ offset.y, length, offset.x, width
+ )
+}
+
+/// Generate the Lines, remove lines & chars based on the offset and viewport
+fn gen_lines<'a>(data_as_str: &'a str, offset: &ScrollOffset, rect: &Rect) -> Vec> {
+ let first_line_index = offset.y.max(0);
+ let first_char_index = offset.x.max(0);
+ let last_char_index = usize::from(rect.width.saturating_sub(2));
+ let take_lines = usize::from(rect.height);
+ //todo see if log scrolling does this - What?
+
+ data_as_str
+ .lines()
+ .skip(first_line_index)
+ .take(take_lines)
+ .map(|line| {
+ Line::from(
+ line.chars()
+ .skip(first_char_index)
+ .take(last_char_index)
+ .collect::(),
+ )
+ })
+ .collect()
+}
+
+/// Draw the InspectContainer widget to the entire screen
+pub fn draw(
+ f: &mut Frame,
+ colors: AppColors,
+ data: InspectData,
+ gui_state: &Arc>,
+ keymap: &Keymap,
+) {
+ let rect = f.area();
+ let offset = gui_state.lock().get_inspect_offset();
+ // +2 to account for the border
+ let height = data
+ .height
+ .saturating_sub(usize::from(rect.height))
+ .saturating_add(2);
+ let width = data
+ .width
+ .saturating_sub(usize::from(rect.width))
+ .saturating_add(2);
+ let upper_title = generate_upper_title(&data, keymap);
+ let lower_title = generate_lower_title(height, width, offset);
+
+ gui_state.lock().set_inspect_offset_max(ScrollOffset {
+ x: width,
+ y: height,
+ });
+
+ let paragraph = Paragraph::new(gen_lines(&data.as_string, &offset, &rect))
+ .block(title_block(&upper_title, &lower_title, &colors))
+ .gray()
+ .left_aligned()
+ .wrap(Wrap { trim: false });
+ f.render_widget(paragraph, rect);
+}
+
+#[cfg(test)]
+#[allow(clippy::unwrap_used)]
+mod tests {
+ use std::{collections::HashMap, sync::LazyLock};
+
+ use crate::{
+ app_data::InspectData,
+ config::{AppColors, Keymap},
+ ui::draw_blocks::tests::{get_result, test_setup},
+ };
+ use bollard::secret::{
+ ContainerConfig, ContainerInspectResponse, ContainerState, ContainerStateStatusEnum,
+ DriverData, EndpointSettings, HostConfig, HostConfigLogConfig, MountPoint,
+ MountPointTypeEnum, NetworkSettings, RestartPolicy, RestartPolicyNameEnum,
+ };
+ use crossterm::event::KeyCode;
+ use insta::assert_snapshot;
+ use ratatui::style::Color;
+
+ static INSPECT_DATA: LazyLock =
+ LazyLock::new(|| InspectData::from(gen_container_inspect_response()));
+
+ #[test]
+ /// Test a inspect container with default settings, keymap, and position
+ fn test_draw_blocks_inspect_default_valid() {
+ let mut setup = test_setup(100, 50, true, true);
+ setup
+ .terminal
+ .draw(|f| {
+ super::draw(
+ f,
+ AppColors::new(),
+ INSPECT_DATA.clone(),
+ &setup.gui_state,
+ &Keymap::new(),
+ );
+ })
+ .unwrap();
+ assert_snapshot!(setup.terminal.backend());
+
+ // Assert border colors
+ for (row_index, result_row) in get_result(&setup) {
+ for (result_cell_index, result_cell) in result_row.iter().enumerate() {
+ match (row_index, result_cell_index) {
+ (0 | 49, _) | (_, 0 | 99) => {
+ assert_eq!(result_cell.bg, Color::Reset);
+ assert_eq!(result_cell.fg, Color::LightCyan);
+ }
+ _ => {
+ assert_eq!(result_cell.bg, Color::Reset);
+ assert_eq!(result_cell.fg, Color::Gray);
+ }
+ }
+ }
+ }
+ }
+
+ #[test]
+ /// Test a inspect container with custom colors
+ fn test_draw_blocks_inspect_custom_color() {
+ let mut setup = test_setup(100, 50, true, true);
+
+ let mut colors = AppColors::new();
+ colors.borders.selected = Color::Red;
+ setup
+ .terminal
+ .draw(|f| {
+ super::draw(
+ f,
+ colors,
+ INSPECT_DATA.clone(),
+ &setup.gui_state,
+ &Keymap::new(),
+ );
+ })
+ .unwrap();
+ assert_snapshot!(setup.terminal.backend());
+
+ // Assert custom border colors
+ for (row_index, result_row) in get_result(&setup) {
+ for (result_cell_index, result_cell) in result_row.iter().enumerate() {
+ match (row_index, result_cell_index) {
+ (0 | 49, _) | (_, 0 | 99) => {
+ assert_eq!(result_cell.bg, Color::Reset);
+ assert_eq!(result_cell.fg, Color::Red);
+ }
+ _ => {
+ assert_eq!(result_cell.bg, Color::Reset);
+ assert_eq!(result_cell.fg, Color::Gray);
+ }
+ }
+ }
+ }
+ }
+
+ #[test]
+ /// Test a inspect container with custom keymap for one clear key
+ fn test_draw_blocks_inspect_custom_keymap_clear_one() {
+ let mut setup = test_setup(100, 50, true, true);
+
+ let mut keymap = Keymap::new();
+
+ keymap.clear.0 = KeyCode::Char('F');
+
+ setup
+ .terminal
+ .draw(|f| {
+ super::draw(
+ f,
+ AppColors::new(),
+ INSPECT_DATA.clone(),
+ &setup.gui_state,
+ &keymap,
+ );
+ })
+ .unwrap();
+ assert_snapshot!(setup.terminal.backend());
+
+ // Assert border colors
+ for (row_index, result_row) in get_result(&setup) {
+ for (result_cell_index, result_cell) in result_row.iter().enumerate() {
+ match (row_index, result_cell_index) {
+ (0 | 49, _) | (_, 0 | 99) => {
+ assert_eq!(result_cell.bg, Color::Reset);
+ assert_eq!(result_cell.fg, Color::LightCyan);
+ }
+ _ => {
+ assert_eq!(result_cell.bg, Color::Reset);
+ assert_eq!(result_cell.fg, Color::Gray);
+ }
+ }
+ }
+ }
+ }
+
+ #[test]
+ /// Test a inspect container with custom keymap for both clear keys
+ fn test_draw_blocks_inspect_custom_keymap_clear_two() {
+ let mut setup = test_setup(100, 50, true, true);
+
+ let mut keymap = Keymap::new();
+
+ keymap.clear.0 = KeyCode::Char('F');
+ keymap.clear.1 = Some(KeyCode::Char('Z'));
+
+ setup
+ .terminal
+ .draw(|f| {
+ super::draw(
+ f,
+ AppColors::new(),
+ INSPECT_DATA.clone(),
+ &setup.gui_state,
+ &keymap,
+ );
+ })
+ .unwrap();
+ assert_snapshot!(setup.terminal.backend());
+
+ // Assert border colors
+ for (row_index, result_row) in get_result(&setup) {
+ for (result_cell_index, result_cell) in result_row.iter().enumerate() {
+ match (row_index, result_cell_index) {
+ (0 | 49, _) | (_, 0 | 99) => {
+ assert_eq!(result_cell.bg, Color::Reset);
+ assert_eq!(result_cell.fg, Color::LightCyan);
+ }
+ _ => {
+ assert_eq!(result_cell.bg, Color::Reset);
+ assert_eq!(result_cell.fg, Color::Gray);
+ }
+ }
+ }
+ }
+ }
+
+ #[test]
+ /// Test a inspect container with custom keymap for one inspect key
+ fn test_draw_blocks_inspect_custom_keymap_inspect_one() {
+ let mut setup = test_setup(100, 50, true, true);
+
+ let mut keymap = Keymap::new();
+
+ keymap.inspect.0 = KeyCode::Char('4');
+
+ setup
+ .terminal
+ .draw(|f| {
+ super::draw(
+ f,
+ AppColors::new(),
+ INSPECT_DATA.clone(),
+ &setup.gui_state,
+ &keymap,
+ );
+ })
+ .unwrap();
+ assert_snapshot!(setup.terminal.backend());
+
+ // Assert border colors
+ for (row_index, result_row) in get_result(&setup) {
+ for (result_cell_index, result_cell) in result_row.iter().enumerate() {
+ match (row_index, result_cell_index) {
+ (0 | 49, _) | (_, 0 | 99) => {
+ assert_eq!(result_cell.bg, Color::Reset);
+ assert_eq!(result_cell.fg, Color::LightCyan);
+ }
+ _ => {
+ assert_eq!(result_cell.bg, Color::Reset);
+ assert_eq!(result_cell.fg, Color::Gray);
+ }
+ }
+ }
+ }
+ }
+
+ #[test]
+ /// Test a inspect container with custom keymap for both inspect keys
+ fn test_draw_blocks_inspect_custom_keymap_inspect_two() {
+ let mut setup = test_setup(100, 50, true, true);
+
+ let mut keymap = Keymap::new();
+
+ keymap.inspect.0 = KeyCode::Char('4');
+ keymap.inspect.1 = Some(KeyCode::Char('5'));
+
+ setup
+ .terminal
+ .draw(|f| {
+ super::draw(
+ f,
+ AppColors::new(),
+ INSPECT_DATA.clone(),
+ &setup.gui_state,
+ &keymap,
+ );
+ })
+ .unwrap();
+ assert_snapshot!(setup.terminal.backend());
+
+ // Assert border colors
+ for (row_index, result_row) in get_result(&setup) {
+ for (result_cell_index, result_cell) in result_row.iter().enumerate() {
+ match (row_index, result_cell_index) {
+ (0 | 49, _) | (_, 0 | 99) => {
+ assert_eq!(result_cell.bg, Color::Reset);
+ assert_eq!(result_cell.fg, Color::LightCyan);
+ }
+ _ => {
+ assert_eq!(result_cell.bg, Color::Reset);
+ assert_eq!(result_cell.fg, Color::Gray);
+ }
+ }
+ }
+ }
+ }
+
+ #[test]
+ /// Test a inspect container with all custom keymaps
+ fn test_draw_blocks_inspect_custom_keymap_all() {
+ let mut setup = test_setup(100, 50, true, true);
+
+ let mut keymap = Keymap::new();
+
+ keymap.clear.0 = KeyCode::Char('F');
+ keymap.clear.1 = Some(KeyCode::Char('Z'));
+ keymap.inspect.0 = KeyCode::Char('4');
+ keymap.inspect.1 = Some(KeyCode::Char('5'));
+
+ setup
+ .terminal
+ .draw(|f| {
+ super::draw(
+ f,
+ AppColors::new(),
+ INSPECT_DATA.clone(),
+ &setup.gui_state,
+ &keymap,
+ );
+ })
+ .unwrap();
+ assert_snapshot!(setup.terminal.backend());
+
+ // Assert border colors
+ for (row_index, result_row) in get_result(&setup) {
+ for (result_cell_index, result_cell) in result_row.iter().enumerate() {
+ match (row_index, result_cell_index) {
+ (0 | 49, _) | (_, 0 | 99) => {
+ assert_eq!(result_cell.bg, Color::Reset);
+ assert_eq!(result_cell.fg, Color::LightCyan);
+ }
+ _ => {
+ assert_eq!(result_cell.bg, Color::Reset);
+ assert_eq!(result_cell.fg, Color::Gray);
+ }
+ }
+ }
+ }
+ }
+
+ #[test]
+ /// Inspect details are offset 10 in x and y axis
+ fn test_draw_blocks_inspect_offset() {
+ let mut setup = test_setup(100, 50, true, true);
+
+ // Why does one need to draw first, although it *should* be impossible to scroll before an initial drawing
+ setup
+ .terminal
+ .draw(|f| {
+ super::draw(
+ f,
+ AppColors::new(),
+ INSPECT_DATA.clone(),
+ &setup.gui_state,
+ &Keymap::new(),
+ );
+ })
+ .unwrap();
+
+ {
+ let mut gui_state = setup.gui_state.lock();
+ for _ in 0..=9 {
+ gui_state.set_inspect_offset(&crate::app_data::ScrollDirection::Down);
+ gui_state.set_inspect_offset(&crate::app_data::ScrollDirection::Right);
+ }
+ }
+ setup
+ .terminal
+ .draw(|f| {
+ super::draw(
+ f,
+ AppColors::new(),
+ INSPECT_DATA.clone(),
+ &setup.gui_state,
+ &Keymap::new(),
+ );
+ })
+ .unwrap();
+ assert_snapshot!(setup.terminal.backend());
+
+ for (row_index, result_row) in get_result(&setup) {
+ for (result_cell_index, result_cell) in result_row.iter().enumerate() {
+ match (row_index, result_cell_index) {
+ (0 | 49, _) | (_, 0 | 99) => {
+ assert_eq!(result_cell.bg, Color::Reset);
+ assert_eq!(result_cell.fg, Color::LightCyan);
+ }
+ _ => {
+ assert_eq!(result_cell.bg, Color::Reset);
+ assert_eq!(result_cell.fg, Color::Gray);
+ }
+ }
+ }
+ }
+ }
+
+ #[test]
+ /// Inspect details are offset to the maximum allowed
+ fn test_draw_blocks_inspect_offset_max() {
+ let mut setup = test_setup(100, 50, true, true);
+
+ // Why does one need to draw first, although it *should* be impossible to scroll before an initial drawing
+ setup
+ .terminal
+ .draw(|f| {
+ super::draw(
+ f,
+ AppColors::new(),
+ INSPECT_DATA.clone(),
+ &setup.gui_state,
+ &Keymap::new(),
+ );
+ })
+ .unwrap();
+
+ // Lazy way of getting the max offset
+ {
+ let mut gui_state = setup.gui_state.lock();
+ for _ in 0..=1000 {
+ gui_state.set_inspect_offset(&crate::app_data::ScrollDirection::Down);
+ gui_state.set_inspect_offset(&crate::app_data::ScrollDirection::Right);
+ }
+ }
+ setup
+ .terminal
+ .draw(|f| {
+ super::draw(
+ f,
+ AppColors::new(),
+ INSPECT_DATA.clone(),
+ &setup.gui_state,
+ &Keymap::new(),
+ );
+ })
+ .unwrap();
+ assert_snapshot!(setup.terminal.backend());
+
+ for (row_index, result_row) in get_result(&setup) {
+ for (result_cell_index, result_cell) in result_row.iter().enumerate() {
+ match (row_index, result_cell_index) {
+ (0 | 49, _) | (_, 0 | 99) => {
+ assert_eq!(result_cell.bg, Color::Reset);
+ assert_eq!(result_cell.fg, Color::LightCyan);
+ }
+ _ => {
+ assert_eq!(result_cell.bg, Color::Reset);
+ assert_eq!(result_cell.fg, Color::Gray);
+ }
+ }
+ }
+ }
+ }
+
+ fn gen_container_inspect_response() -> ContainerInspectResponse {
+ ContainerInspectResponse {
+ id: Some("0bdea64212f9c75eb4a1184dd406c2c79a986a7a889a23c85358456cc1bb60c7".to_owned()),
+ created: Some("2026-01-23T22:20:19.927967311Z".to_owned()),
+ path: Some("docker-entrypoint.sh".to_owned()),
+ args: Some(vec!["postgres".to_owned()]),
+ state: Some(ContainerState {
+ status: Some(ContainerStateStatusEnum::RUNNING),
+ running: Some(true),
+ paused: Some(false),
+ restarting: Some(false),
+ oom_killed: Some(false),
+ dead: Some(false),
+ pid: Some(782),
+ exit_code: Some(0),
+ error: Some("".to_owned()),
+ started_at: Some("2026-01-30T08:09:01.574885915Z".to_owned()),
+ finished_at: Some("2026-01-30T08:09:01.180567927Z".to_owned()),
+ health: None,
+ }),
+ image: Some("sha256:aa3668fcbcb5ded731b7d5c27065a4edf545debb7f27bf514c709b1b4e032352".to_owned()),
+ resolv_conf_path: Some("/var/lib/docker/containers/0bdea64212f9c75eb4a1184dd406c2c79a986a7a889a23c85358456cc1bb60c7/resolv.conf".to_owned()),
+ hostname_path: Some("/var/lib/docker/containers/0bdea64212f9c75eb4a1184dd406c2c79a986a7a889a23c85358456cc1bb60c7/hostname".to_owned()),
+ hosts_path: Some("/var/lib/docker/containers/0bdea64212f9c75eb4a1184dd406c2c79a986a7a889a23c85358456cc1bb60c7/hosts".to_owned()),
+ log_path: Some("/var/lib/docker/containers/0bdea64212f9c75eb4a1184dd406c2c79a986a7a889a23c85358456cc1bb60c7/0bdea64212f9c75eb4a1184dd406c2c79a986a7a889a23c85358456cc1bb60c7-json.log".to_owned()),
+ name: Some("/postgres".to_owned()),
+ restart_count: Some(0),
+ driver: Some("overlay2".to_owned()),
+ platform: Some("linux".to_owned()),
+ image_manifest_descriptor: None,
+ mount_label: Some("".to_owned()),
+ process_label: Some("".to_owned()),
+ app_armor_profile: Some("".to_owned()),
+ exec_ids: None,
+ host_config: Some(HostConfig {
+ cpu_shares: Some(0),
+ memory: Some(1073741824),
+ cgroup_parent: Some("".to_owned()),
+ blkio_weight: Some(0),
+ blkio_weight_device: None,
+ blkio_device_read_bps: None,
+ blkio_device_write_bps: None,
+ blkio_device_read_iops: None,
+ blkio_device_write_iops: None,
+ cpu_period: Some(0),
+ cpu_quota: Some(0),
+ cpu_realtime_period: Some(0),
+ cpu_realtime_runtime: Some(0),
+ cpuset_cpus: Some("".to_owned()),
+ cpuset_mems: Some("".to_owned()),
+ devices: None,
+ device_cgroup_rules: None,
+ device_requests: None,
+ memory_reservation: Some(0),
+ memory_swap: Some(2147483648),
+ memory_swappiness: None,
+ nano_cpus: Some(0),
+ oom_kill_disable: Some(false),
+ init: None,
+ pids_limit: None,
+ ulimits: None,
+ cpu_count: Some(0),
+ cpu_percent: Some(0),
+ io_maximum_iops: Some(0),
+ io_maximum_bandwidth: Some(0),
+ binds: None,
+ container_id_file: Some("".to_owned()),
+ log_config: Some(HostConfigLogConfig {
+ typ: Some("json-file".to_owned()),
+ config: Some(HashMap::new()),
+ }),
+ network_mode: Some("oxker-examaple-net".to_owned()),
+ port_bindings: Some(HashMap::new()),
+ restart_policy: Some(RestartPolicy {
+ name: Some(RestartPolicyNameEnum::ALWAYS),
+ maximum_retry_count: Some(0),
+ }),
+ auto_remove: Some(false),
+ volume_driver: Some("".to_owned()),
+ volumes_from: None,
+ mounts: None,
+ console_size: Some(vec![0, 0]),
+ annotations: None,
+ cap_add: None,
+ cap_drop: None,
+ cgroupns_mode: Some(bollard::secret::HostConfigCgroupnsModeEnum::HOST),
+ dns: Some(vec![]),
+ dns_options: Some(vec![]),
+ dns_search: Some(vec![]),
+ extra_hosts: Some(vec![]),
+ group_add: None,
+ ipc_mode: Some("private".to_owned()),
+ cgroup: Some("".to_owned()),
+ links: None,
+ oom_score_adj: Some(0),
+ pid_mode: Some("".to_owned()),
+ privileged: Some(false),
+ publish_all_ports: Some(false),
+ readonly_rootfs: Some(false),
+ security_opt: None,
+ storage_opt: None,
+ tmpfs: None,
+ uts_mode: Some("".to_owned()),
+ userns_mode: Some("".to_owned()),
+ shm_size: Some(268435456),
+ sysctls: None,
+ runtime: Some("runc".to_owned()),
+ isolation: Some(bollard::secret::HostConfigIsolationEnum::EMPTY),
+ masked_paths: Some(vec![
+ "/proc/acpi".to_owned(),
+ "/proc/asound".to_owned(),
+ "/proc/interrupts".to_owned(),
+ "/proc/kcore".to_owned(),
+ "/proc/keys".to_owned(),
+ "/proc/latency_stats".to_owned(),
+ "/proc/sched_debug".to_owned(),
+ "/proc/scsi".to_owned(),
+ "/proc/timer_list".to_owned(),
+ "/proc/timer_stats".to_owned(),
+ "/sys/devices/virtual/powercap".to_owned(),
+ "/sys/firmware".to_owned(),
+ ]),
+ readonly_paths: Some(vec![
+ "/proc/bus".to_owned(),
+ "/proc/fs".to_owned(),
+ "/proc/irq".to_owned(),
+ "/proc/sys".to_owned(),
+ "/proc/sysrq-trigger".to_owned(),
+ ]),
+ }),
+ graph_driver: Some(DriverData {
+ name: "overlay2".to_owned(),
+ data: HashMap::from([
+ ("LowerDir".to_owned(), "/var/lib/docker/overlay2/b8dae7c82251b8dadc084dbcaceec47b3d48a5ba9d055a59934a8b88d18569ea-init/diff:/var/lib/docker/overlay2/51b93846f7ba3e00cb1ed86564e3e1d7c30df2bb1cd5a8469d54625f1e5a2eca/diff:/var/lib/docker/overlay2/c1364ead843d3af87ce286013b6301329d3089422b22b001e156e45d29b5b4dd/diff:/var/lib/docker/overlay2/0e6dc322cad77b1db3906a3a4e5e6d6b80fbffd138437e550d8849fcf4f4c1f2/diff:/var/lib/docker/overlay2/cc0f967a7471cf06e0c9ad3d474650c668a4cf0c02efe20e9c250c436f93033b/diff:/var/lib/docker/overlay2/5c59e0919969987c96a5d0e0a512a0a1a0f67ea747596af9a9c14a9566198d91/diff:/var/lib/docker/overlay2/d7709b7685c9704e1e392c515b6155517270541f6ccde426ef784403e1681fca/diff:/var/lib/docker/overlay2/c891528563fff91bffaf07416e77bcd3bdebb03e5d32ed0e3d4ee1ec5e80e880/diff:/var/lib/docker/overlay2/2b25c179a432c35cc599a082cd709c8c9a1523f8d1959f72fda21fc76e50ad00/diff:/var/lib/docker/overlay2/3b409d2f7a2455578148892302823a7f03c7c36482d08bb68fd6c1aeeec05f05/diff:/var/lib/docker/overlay2/55dbb2fab0ae8bb3bfe8183093cdd576686f7333e2b2c41e6e4178a7b6407554/diff".to_owned()),
+ ("MergedDir".to_owned(), "/var/lib/docker/overlay2/b8dae7c82251b8dadc084dbcaceec47b3d48a5ba9d055a59934a8b88d18569ea/merged".to_owned()),
+ ("WorkDir".to_owned(), "/var/lib/docker/overlay2/b8dae7c82251b8dadc084dbcaceec47b3d48a5ba9d055a59934a8b88d18569ea/work".to_owned()),
+ ("ID".to_owned(), "0bdea64212f9c75eb4a1184dd406c2c79a986a7a889a23c85358456cc1bb60c7".to_owned()),
+ ("UpperDir".to_owned(), "/var/lib/docker/overlay2/b8dae7c82251b8dadc084dbcaceec47b3d48a5ba9d055a59934a8b88d18569ea/diff".to_owned()),
+ ]),
+ }),
+ storage: None,
+ size_rw: None,
+ size_root_fs: None,
+ mounts: Some(vec![MountPoint {
+ typ: Some(MountPointTypeEnum::VOLUME),
+ name: Some("93bc4e4c8d3823964b58105a99a7b3a7e02c801d5560338bdaf7589966a1b02d".to_owned()),
+ source: Some("/var/lib/docker/volumes/93bc4e4c8d3823964b58105a99a7b3a7e02c801d5560338bdaf7589966a1b02d/_data".to_owned()),
+ destination: Some("/var/lib/postgresql/data".to_owned()),
+ driver: Some("local".to_owned()),
+ mode: Some("".to_owned()),
+ rw: Some(true),
+ propagation: Some("".to_owned()),
+ }]),
+ config: Some(ContainerConfig {
+ hostname: Some("0bdea64212f9".to_owned()),
+ domainname: Some("".to_owned()),
+ user: Some("".to_owned()),
+ attach_stdin: Some(false),
+ attach_stdout: Some(true),
+ attach_stderr: Some(true),
+ exposed_ports: Some(vec!["5432/tcp".to_owned()]),
+ tty: Some(false),
+ open_stdin: Some(false),
+ stdin_once: Some(false),
+ env: Some(vec![
+ "POSTGRES_PASSWORD=never_use_this_password_in_production".to_owned(),
+ "PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin".to_owned(),
+ "GOSU_VERSION=1.19".to_owned(),
+ "LANG=en_US.utf8".to_owned(),
+ "PG_MAJOR=17".to_owned(),
+ "PG_VERSION=17.7".to_owned(),
+ "PG_SHA256=ef9e343302eccd33112f1b2f0247be493cb5768313adeb558b02de8797a2e9b5".to_owned(),
+ "DOCKER_PG_LLVM_DEPS=llvm19-dev \t\tclang19".to_owned(),
+ "PGDATA=/var/lib/postgresql/data".to_owned(),
+ ]),
+ cmd: Some(vec!["postgres".to_owned()]),
+ healthcheck: None,
+ args_escaped: None,
+ image: Some("postgres:17-alpine".to_owned()),
+ volumes: Some(vec!["/var/lib/postgresql/data".to_owned()]),
+ working_dir: Some("/".to_owned()),
+ entrypoint: Some(vec!["docker-entrypoint.sh".to_owned()]),
+ network_disabled: None,
+ on_build: None,
+ labels: Some(HashMap::from([
+ ("com.docker.compose.oneoff".to_owned(), "False".to_owned()),
+ ("com.docker.compose.project.config_files".to_owned(), "/workspaces/oxker/docker/docker-compose.yml".to_owned()),
+ ("com.docker.compose.image".to_owned(), "sha256:aa3668fcbcb5ded731b7d5c27065a4edf545debb7f27bf514c709b1b4e032352".to_owned()),
+ ("com.docker.compose.project.working_dir".to_owned(), "/workspaces/oxker/docker".to_owned()),
+ ("com.docker.compose.service".to_owned(), "postgres".to_owned()),
+ ("com.docker.compose.config-hash".to_owned(), "e06d69ffb3f9b69dd51b356b60c2297df57caf0da16792ccafaabffdb920e443".to_owned()),
+ ("com.docker.compose.depends_on".to_owned(), "".to_owned()),
+ ("com.docker.compose.container-number".to_owned(), "1".to_owned()),
+ ("com.docker.compose.version".to_owned(), "2.40.3".to_owned()),
+ ("com.docker.compose.project".to_owned(), "docker".to_owned()),
+ ])),
+ stop_signal: Some("SIGINT".to_owned()),
+ stop_timeout: None,
+ shell: None,
+ }),
+ network_settings: Some(NetworkSettings {
+ sandbox_id: Some("dab64a66594dd8d06478184e2928c81acdcd9c931f643bd5ca62b7edb6345f8d".to_owned()),
+ sandbox_key: Some("/var/run/docker/netns/dab64a66594d".to_owned()),
+ ports: Some(HashMap::from([("5432/tcp".to_owned(), None)])),
+ networks: Some(HashMap::from([(
+ "oxker-examaple-net".to_owned(),
+ EndpointSettings {
+ ipam_config: None,
+ links: None,
+ mac_address: Some("a2:bd:4e:61:25:c7".to_owned()),
+ aliases: Some(vec!["postgres".to_owned(), "postgres".to_owned()]),
+ driver_opts: None,
+ gw_priority: Some(0),
+ network_id: Some("3cbeb475d81676f89a7aa205d8749ec2ad78d685e45d77b638992956f6dc569a".to_owned()),
+ endpoint_id: Some("31718069b2a3ea77487f3ece36b014d5d1329bc3294568e2621e5c0999071bed".to_owned()),
+ gateway: Some("172.19.0.1".to_owned()),
+ ip_address: Some("172.19.0.4".to_owned()),
+ ip_prefix_len: Some(16),
+ ipv6_gateway: Some("".to_owned()),
+ global_ipv6_address: Some("".to_owned()),
+ global_ipv6_prefix_len: Some(0),
+ dns_names: Some(vec!["postgres".to_owned(), "0bdea64212f9".to_owned()]),
+ },
+ )])),
+ }),
+}
+ }
+}
diff --git a/src/ui/draw_blocks/logs.rs b/src/ui/draw_blocks/logs.rs
index ebf6ec7..98b643f 100644
--- a/src/ui/draw_blocks/logs.rs
+++ b/src/ui/draw_blocks/logs.rs
@@ -14,7 +14,7 @@ use crate::{
ui::{FrameData, GuiState, SelectablePanel, Status},
};
-use super::{RIGHT_ARROW, generate_block};
+use super::{SELECT_ARROW, generate_block};
/// Draw the logs panel
pub fn draw(
@@ -52,7 +52,7 @@ pub fn draw(
} else if fd.color_logs {
let items = List::new(logs)
.block(block)
- .highlight_symbol(RIGHT_ARROW)
+ .highlight_symbol(SELECT_ARROW)
.scroll_padding(padding)
.highlight_style(Style::default().add_modifier(Modifier::BOLD));
// This should always return Some, as logs is not empty
@@ -63,7 +63,7 @@ pub fn draw(
let items = List::new(logs)
.fg(colors.logs.text)
.block(block)
- .highlight_symbol(RIGHT_ARROW)
+ .highlight_symbol(SELECT_ARROW)
.highlight_style(Style::default().add_modifier(Modifier::BOLD));
// This should always return Some, as logs is not empty
if let Some(log_state) = app_data.lock().get_log_state() {
@@ -309,7 +309,7 @@ mod tests {
);
})
.unwrap();
- setup.app_data.lock().log_scroll(&ScrollDirection::Previous);
+ setup.app_data.lock().log_scroll(&ScrollDirection::Up);
let fd = FrameData::from((&setup.app_data, &setup.gui_state));
setup
diff --git a/src/ui/draw_blocks/mod.rs b/src/ui/draw_blocks/mod.rs
index 507a913..147e166 100644
--- a/src/ui/draw_blocks/mod.rs
+++ b/src/ui/draw_blocks/mod.rs
@@ -11,7 +11,8 @@ use crate::config::AppColors;
use super::{FrameData, GuiState, SelectablePanel, Status, gui_state::Region};
-pub mod charts;
+pub mod chart_bandwidth;
+pub mod chart_cpu_mem;
pub mod commands;
pub mod containers;
pub mod delete_confirm;
@@ -20,26 +21,29 @@ pub mod filter;
pub mod headers;
pub mod help;
pub mod info;
+pub mod inspect;
pub mod logs;
pub mod popup;
pub mod ports;
pub mod search_logs;
-pub const NAME_TEXT: &str = r#"
- 88
- 88
- 88
- ,adPPYba, 8b, ,d8 88 ,d8 ,adPPYba, 8b,dPPYba,
-a8" "8a `Y8, ,8P' 88 ,a8" a8P_____88 88P' "Y8
-8b d8 )888( 8888[ 8PP""""""" 88
-"8a, ,a8" ,d8" "8b, 88`"Yba, "8b, ,aa 88
- `"YbbdP"' 8P' `Y8 88 `Y8a `"Ybbd8"' 88 "#;
+pub const NAME_TEXT: &str = r#" 88
+ 88
+ ,adPPYba, 8b, ,d8 88 ,d8 ,adPPYba, 8b,dPPYba,
+a8" "8a `Y8, ,8P' 88 ,a8" a8P_____88 88P' "Y8
+8b d8 )888( 8888( 8PP""""""" 88
+"8a, ,a8" ,d8" "8b, 88`"Yba, "8b, ,aa 88
+ `"YbbdP"' 8P' `Y8 88 `Y8a `"Ybbd8"' 88 "#;
pub const NAME: &str = env!("CARGO_PKG_NAME");
pub const REPO: &str = env!("CARGO_PKG_REPOSITORY");
pub const DESCRIPTION: &str = env!("CARGO_PKG_DESCRIPTION");
pub const MARGIN: &str = " ";
-pub const RIGHT_ARROW: &str = "โถ ";
+pub const SELECT_ARROW: &str = "โถ ";
+pub const LEFT_ARROW: &str = "โ";
+pub const RIGHT_ARROW: &str = "โ";
+pub const DOWN_ARROW: &str = "โ";
+pub const UP_ARROW: &str = "โ";
pub const CIRCLE: &str = "โช ";
#[cfg(not(test))]
@@ -103,12 +107,12 @@ fn generate_block<'a>(
.border_type(BorderType::Rounded)
.title(ratatui::text::Line::from(title).left_aligned());
- if panel == SelectablePanel::Logs {
- if let Some(x) = fd.scroll_title.as_ref() {
- block = block
- .title_bottom(x.to_owned())
- .title_alignment(ratatui::layout::Alignment::Right);
- }
+ if panel == SelectablePanel::Logs
+ && let Some(x) = fd.scroll_title.as_ref()
+ {
+ block = block
+ .title_bottom(x.to_owned())
+ .title_alignment(ratatui::layout::Alignment::Right);
}
if !fd.status.contains(&Status::Filter) {
if fd.selected_panel == panel {
@@ -242,7 +246,7 @@ pub mod tests {
#[allow(clippy::cast_precision_loss)]
// Add fixed data to the cpu & mem vecdeques
- pub fn insert_chart_data(setup: &TuiTestSetup) {
+ pub fn insert_all_chart_data(setup: &TuiTestSetup) {
for i in 1..=10 {
setup.app_data.lock().update_stats_by_id(
&setup.ids[0],
@@ -273,7 +277,7 @@ pub mod tests {
fn test_draw_blocks_whole_layout() {
let mut setup = test_setup(160, 30, true, true);
- insert_chart_data(&setup);
+ insert_all_chart_data(&setup);
insert_logs(&setup);
setup.app_data.lock().containers.items[0]
.ports
@@ -301,7 +305,7 @@ pub mod tests {
/// Check that the whole layout is drawn correctly
fn test_draw_blocks_whole_layout_with_filter_bar() {
let mut setup = test_setup(160, 30, true, true);
- insert_chart_data(&setup);
+ insert_all_chart_data(&setup);
insert_logs(&setup);
setup.app_data.lock().containers.items[1]
@@ -337,7 +341,7 @@ pub mod tests {
fn test_draw_blocks_whole_layout_long_name() {
let mut setup = test_setup(190, 30, true, true);
- insert_chart_data(&setup);
+ insert_all_chart_data(&setup);
insert_logs(&setup);
setup.app_data.lock().containers.items[0]
.ports
@@ -370,7 +374,7 @@ pub mod tests {
fn test_draw_blocks_whole_layout_no_logs() {
let mut setup = test_setup(160, 30, true, true);
- insert_chart_data(&setup);
+ insert_all_chart_data(&setup);
insert_logs(&setup);
setup.app_data.lock().containers.items[0]
.ports
@@ -399,7 +403,7 @@ pub mod tests {
fn test_draw_blocks_whole_layout_short_height_logs() {
let mut setup = test_setup(160, 30, true, true);
- insert_chart_data(&setup);
+ insert_all_chart_data(&setup);
insert_logs(&setup);
setup.app_data.lock().containers.items[0]
.ports
@@ -431,7 +435,7 @@ pub mod tests {
fn test_draw_blocks_whole_layout_help_panel() {
let mut setup = test_setup(160, 40, true, true);
- insert_chart_data(&setup);
+ insert_all_chart_data(&setup);
insert_logs(&setup);
setup.app_data.lock().containers.items[0]
.ports
@@ -461,7 +465,7 @@ pub mod tests {
fn test_draw_blocks_whole_layout_error() {
let mut setup = test_setup(160, 40, true, true);
- insert_chart_data(&setup);
+ insert_all_chart_data(&setup);
insert_logs(&setup);
setup.app_data.lock().containers.items[0]
.ports
@@ -495,7 +499,7 @@ pub mod tests {
fn test_draw_blocks_whole_layout_delete() {
let mut setup = test_setup(160, 40, true, true);
- insert_chart_data(&setup);
+ insert_all_chart_data(&setup);
insert_logs(&setup);
setup.app_data.lock().containers.items[0]
.ports
@@ -527,7 +531,7 @@ pub mod tests {
fn test_draw_blocks_whole_layout_info_box() {
let mut setup = test_setup(160, 40, true, true);
- insert_chart_data(&setup);
+ insert_all_chart_data(&setup);
insert_logs(&setup);
setup.app_data.lock().containers.items[0]
.ports
diff --git a/src/ui/draw_blocks/search_logs.rs b/src/ui/draw_blocks/search_logs.rs
index 81b1e31..335aa31 100644
--- a/src/ui/draw_blocks/search_logs.rs
+++ b/src/ui/draw_blocks/search_logs.rs
@@ -241,11 +241,11 @@ mod tests {
setup
.app_data
.lock()
- .log_scroll(&crate::app_data::ScrollDirection::Previous);
+ .log_scroll(&crate::app_data::ScrollDirection::Up);
setup
.app_data
.lock()
- .log_scroll(&crate::app_data::ScrollDirection::Previous);
+ .log_scroll(&crate::app_data::ScrollDirection::Up);
let fd = FrameData::from((&setup.app_data, &setup.gui_state));
setup
@@ -298,7 +298,7 @@ mod tests {
setup
.app_data
.lock()
- .log_scroll(&crate::app_data::ScrollDirection::Previous);
+ .log_scroll(&crate::app_data::ScrollDirection::Up);
let fd = FrameData::from((&setup.app_data, &setup.gui_state));
setup
@@ -404,7 +404,7 @@ mod tests {
setup
.app_data
.lock()
- .log_scroll(&crate::app_data::ScrollDirection::Previous);
+ .log_scroll(&crate::app_data::ScrollDirection::Up);
let fd = FrameData::from((&setup.app_data, &setup.gui_state));
setup
@@ -433,7 +433,7 @@ mod tests {
setup
.app_data
.lock()
- .log_scroll(&crate::app_data::ScrollDirection::Previous);
+ .log_scroll(&crate::app_data::ScrollDirection::Up);
let mut colors = AppColors::new();
diff --git a/src/ui/draw_blocks/snapshots/oxker__ui__draw_blocks__chart_bandwidth__tests__draw_blocks_charts_custom_colors.snap b/src/ui/draw_blocks/snapshots/oxker__ui__draw_blocks__chart_bandwidth__tests__draw_blocks_charts_custom_colors.snap
new file mode 100644
index 0000000..699967c
--- /dev/null
+++ b/src/ui/draw_blocks/snapshots/oxker__ui__draw_blocks__chart_bandwidth__tests__draw_blocks_charts_custom_colors.snap
@@ -0,0 +1,14 @@
+---
+source: src/ui/draw_blocks/chart_bandwidth.rs
+expression: setup.terminal.backend()
+---
+"โญโโโ rx: 566.00 kb/s tx: 56.60 kb/s โโโโฎ"
+"โ โ โข โ"
+"โ โ โขโข โ"
+"โ โ โขโข โ"
+"โ566.00 kb/sโ โขโข โ"
+"โ โ โข โ"
+"โ56.60 kb/s โ โขโข โ"
+"โ โโขโข โขโขโข โ"
+"โ โโขโขโขโขโขโข โ"
+"โฐโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโฏ"
diff --git a/src/ui/draw_blocks/snapshots/oxker__ui__draw_blocks__chart_bandwidth__tests__draw_blocks_charts_dead.snap b/src/ui/draw_blocks/snapshots/oxker__ui__draw_blocks__chart_bandwidth__tests__draw_blocks_charts_dead.snap
new file mode 100644
index 0000000..64b250a
--- /dev/null
+++ b/src/ui/draw_blocks/snapshots/oxker__ui__draw_blocks__chart_bandwidth__tests__draw_blocks_charts_dead.snap
@@ -0,0 +1,14 @@
+---
+source: src/ui/draw_blocks/chart_bandwidth.rs
+expression: setup.terminal.backend()
+---
+"โญโโโโ rx: 0.00 kb/s tx: 0.00 kb/s โโโโโโฎ"
+"โ โ โ"
+"โ โ โ"
+"โ โ โ"
+"โ0.00 kb/sโ โ"
+"โ โ โ"
+"โ0.00 kb/sโ โ"
+"โ โ โ"
+"โ โ โ"
+"โฐโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโฏ"
diff --git a/src/ui/draw_blocks/snapshots/oxker__ui__draw_blocks__chart_bandwidth__tests__draw_blocks_charts_paused.snap b/src/ui/draw_blocks/snapshots/oxker__ui__draw_blocks__chart_bandwidth__tests__draw_blocks_charts_paused.snap
new file mode 100644
index 0000000..64b250a
--- /dev/null
+++ b/src/ui/draw_blocks/snapshots/oxker__ui__draw_blocks__chart_bandwidth__tests__draw_blocks_charts_paused.snap
@@ -0,0 +1,14 @@
+---
+source: src/ui/draw_blocks/chart_bandwidth.rs
+expression: setup.terminal.backend()
+---
+"โญโโโโ rx: 0.00 kb/s tx: 0.00 kb/s โโโโโโฎ"
+"โ โ โ"
+"โ โ โ"
+"โ โ โ"
+"โ0.00 kb/sโ โ"
+"โ โ โ"
+"โ0.00 kb/sโ โ"
+"โ โ โ"
+"โ โ โ"
+"โฐโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโฏ"
diff --git a/src/ui/draw_blocks/snapshots/oxker__ui__draw_blocks__chart_bandwidth__tests__draw_blocks_charts_running_none.snap b/src/ui/draw_blocks/snapshots/oxker__ui__draw_blocks__chart_bandwidth__tests__draw_blocks_charts_running_none.snap
new file mode 100644
index 0000000..64b250a
--- /dev/null
+++ b/src/ui/draw_blocks/snapshots/oxker__ui__draw_blocks__chart_bandwidth__tests__draw_blocks_charts_running_none.snap
@@ -0,0 +1,14 @@
+---
+source: src/ui/draw_blocks/chart_bandwidth.rs
+expression: setup.terminal.backend()
+---
+"โญโโโโ rx: 0.00 kb/s tx: 0.00 kb/s โโโโโโฎ"
+"โ โ โ"
+"โ โ โ"
+"โ โ โ"
+"โ0.00 kb/sโ โ"
+"โ โ โ"
+"โ0.00 kb/sโ โ"
+"โ โ โ"
+"โ โ โ"
+"โฐโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโฏ"
diff --git a/src/ui/draw_blocks/snapshots/oxker__ui__draw_blocks__chart_bandwidth__tests__draw_blocks_charts_running_with_data.snap b/src/ui/draw_blocks/snapshots/oxker__ui__draw_blocks__chart_bandwidth__tests__draw_blocks_charts_running_with_data.snap
new file mode 100644
index 0000000..f2451e2
--- /dev/null
+++ b/src/ui/draw_blocks/snapshots/oxker__ui__draw_blocks__chart_bandwidth__tests__draw_blocks_charts_running_with_data.snap
@@ -0,0 +1,14 @@
+---
+source: src/ui/draw_blocks/chart_bandwidth.rs
+expression: setup.terminal.backend()
+---
+"โญโโโ rx: 0.00 kb/s tx: 205.00 kb/s โโโโโฎ"
+"โ โ โข โ"
+"โ โ โขโข โ"
+"โ โ โขโข โ"
+"โ205.00 kb/sโ โขโข โ"
+"โ โ โข โ"
+"โ0.00 kb/s โ โขโข โ"
+"โ โโขโข โ"
+"โ โ โ"
+"โฐโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโฏ"
diff --git a/src/ui/draw_blocks/snapshots/oxker__ui__draw_blocks__chart_bandwidth__tests__draw_blocks_charts_running_with_data_rx.snap b/src/ui/draw_blocks/snapshots/oxker__ui__draw_blocks__chart_bandwidth__tests__draw_blocks_charts_running_with_data_rx.snap
new file mode 100644
index 0000000..bff8635
--- /dev/null
+++ b/src/ui/draw_blocks/snapshots/oxker__ui__draw_blocks__chart_bandwidth__tests__draw_blocks_charts_running_with_data_rx.snap
@@ -0,0 +1,14 @@
+---
+source: src/ui/draw_blocks/chart_bandwidth.rs
+expression: setup.terminal.backend()
+---
+"โญโโโ rx: 566.00 kb/s tx: 0.00 kb/s โโโโโฎ"
+"โ โ โข โ"
+"โ โ โขโข โ"
+"โ โ โขโข โ"
+"โ566.00 kb/sโ โขโข โ"
+"โ โ โข โ"
+"โ0.00 kb/s โ โขโข โ"
+"โ โโขโข โ"
+"โ โโข โ"
+"โฐโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโฏ"
diff --git a/src/ui/draw_blocks/snapshots/oxker__ui__draw_blocks__chart_bandwidth__tests__draw_blocks_charts_running_with_data_tx.snap b/src/ui/draw_blocks/snapshots/oxker__ui__draw_blocks__chart_bandwidth__tests__draw_blocks_charts_running_with_data_tx.snap
new file mode 100644
index 0000000..f2451e2
--- /dev/null
+++ b/src/ui/draw_blocks/snapshots/oxker__ui__draw_blocks__chart_bandwidth__tests__draw_blocks_charts_running_with_data_tx.snap
@@ -0,0 +1,14 @@
+---
+source: src/ui/draw_blocks/chart_bandwidth.rs
+expression: setup.terminal.backend()
+---
+"โญโโโ rx: 0.00 kb/s tx: 205.00 kb/s โโโโโฎ"
+"โ โ โข โ"
+"โ โ โขโข โ"
+"โ โ โขโข โ"
+"โ205.00 kb/sโ โขโข โ"
+"โ โ โข โ"
+"โ0.00 kb/s โ โขโข โ"
+"โ โโขโข โ"
+"โ โ โ"
+"โฐโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโฏ"
diff --git a/src/ui/draw_blocks/snapshots/oxker__ui__draw_blocks__chart_bandwidth__tests__draw_blocks_charts_running_with_data_tx_and_rx.snap b/src/ui/draw_blocks/snapshots/oxker__ui__draw_blocks__chart_bandwidth__tests__draw_blocks_charts_running_with_data_tx_and_rx.snap
new file mode 100644
index 0000000..699967c
--- /dev/null
+++ b/src/ui/draw_blocks/snapshots/oxker__ui__draw_blocks__chart_bandwidth__tests__draw_blocks_charts_running_with_data_tx_and_rx.snap
@@ -0,0 +1,14 @@
+---
+source: src/ui/draw_blocks/chart_bandwidth.rs
+expression: setup.terminal.backend()
+---
+"โญโโโ rx: 566.00 kb/s tx: 56.60 kb/s โโโโฎ"
+"โ โ โข โ"
+"โ โ โขโข โ"
+"โ โ โขโข โ"
+"โ566.00 kb/sโ โขโข โ"
+"โ โ โข โ"
+"โ56.60 kb/s โ โขโข โ"
+"โ โโขโข โขโขโข โ"
+"โ โโขโขโขโขโขโข โ"
+"โฐโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโฏ"
diff --git a/src/ui/draw_blocks/snapshots/oxker__ui__draw_blocks__chart_cpu_mem__tests__draw_blocks_charts_custom_colors.snap b/src/ui/draw_blocks/snapshots/oxker__ui__draw_blocks__chart_cpu_mem__tests__draw_blocks_charts_custom_colors.snap
new file mode 100644
index 0000000..8a75efc
--- /dev/null
+++ b/src/ui/draw_blocks/snapshots/oxker__ui__draw_blocks__chart_cpu_mem__tests__draw_blocks_charts_custom_colors.snap
@@ -0,0 +1,14 @@
+---
+source: src/ui/draw_blocks/chart_cpu_mem.rs
+expression: setup.terminal.backend()
+---
+"โญโโโโโโโโโโโโโ cpu 03.00% โโโโโโโโโโโโโโฎโญโโโโโโโโโโ memory 30.00 kB โโโโโโโโโโโโฎ"
+"โ10.00%โ โข โโ100.00 kBโ โข โ"
+"โ โ โขโข โโ โ โขโข โ"
+"โ โ โข โข โโ โ โขโข โ"
+"โ โ โข โข โโ โ โข โข โ"
+"โ โ โข โข โโ โ โขโข โข โ"
+"โ โ โข โขโข โโ โ โข โข โ"
+"โ โโขโข โขโข โโ โโข โข โ"
+"โ โ โโ โ โ"
+"โฐโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโฏโฐโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโฏ"
diff --git a/src/ui/draw_blocks/snapshots/oxker__ui__draw_blocks__chart_cpu_mem__tests__draw_blocks_charts_dead.snap b/src/ui/draw_blocks/snapshots/oxker__ui__draw_blocks__chart_cpu_mem__tests__draw_blocks_charts_dead.snap
new file mode 100644
index 0000000..8a75efc
--- /dev/null
+++ b/src/ui/draw_blocks/snapshots/oxker__ui__draw_blocks__chart_cpu_mem__tests__draw_blocks_charts_dead.snap
@@ -0,0 +1,14 @@
+---
+source: src/ui/draw_blocks/chart_cpu_mem.rs
+expression: setup.terminal.backend()
+---
+"โญโโโโโโโโโโโโโ cpu 03.00% โโโโโโโโโโโโโโฎโญโโโโโโโโโโ memory 30.00 kB โโโโโโโโโโโโฎ"
+"โ10.00%โ โข โโ100.00 kBโ โข โ"
+"โ โ โขโข โโ โ โขโข โ"
+"โ โ โข โข โโ โ โขโข โ"
+"โ โ โข โข โโ โ โข โข โ"
+"โ โ โข โข โโ โ โขโข โข โ"
+"โ โ โข โขโข โโ โ โข โข โ"
+"โ โโขโข โขโข โโ โโข โข โ"
+"โ โ โโ โ โ"
+"โฐโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโฏโฐโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโฏ"
diff --git a/src/ui/draw_blocks/snapshots/oxker__ui__draw_blocks__chart_cpu_mem__tests__draw_blocks_charts_paused.snap b/src/ui/draw_blocks/snapshots/oxker__ui__draw_blocks__chart_cpu_mem__tests__draw_blocks_charts_paused.snap
new file mode 100644
index 0000000..8a75efc
--- /dev/null
+++ b/src/ui/draw_blocks/snapshots/oxker__ui__draw_blocks__chart_cpu_mem__tests__draw_blocks_charts_paused.snap
@@ -0,0 +1,14 @@
+---
+source: src/ui/draw_blocks/chart_cpu_mem.rs
+expression: setup.terminal.backend()
+---
+"โญโโโโโโโโโโโโโ cpu 03.00% โโโโโโโโโโโโโโฎโญโโโโโโโโโโ memory 30.00 kB โโโโโโโโโโโโฎ"
+"โ10.00%โ โข โโ100.00 kBโ โข โ"
+"โ โ โขโข โโ โ โขโข โ"
+"โ โ โข โข โโ โ โขโข โ"
+"โ โ โข โข โโ โ โข โข โ"
+"โ โ โข โข โโ โ โขโข โข โ"
+"โ โ โข โขโข โโ โ โข โข โ"
+"โ โโขโข โขโข โโ โโข โข โ"
+"โ โ โโ โ โ"
+"โฐโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโฏโฐโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโฏ"
diff --git a/src/ui/draw_blocks/snapshots/oxker__ui__draw_blocks__chart_cpu_mem__tests__draw_blocks_charts_running_none.snap b/src/ui/draw_blocks/snapshots/oxker__ui__draw_blocks__chart_cpu_mem__tests__draw_blocks_charts_running_none.snap
new file mode 100644
index 0000000..8632071
--- /dev/null
+++ b/src/ui/draw_blocks/snapshots/oxker__ui__draw_blocks__chart_cpu_mem__tests__draw_blocks_charts_running_none.snap
@@ -0,0 +1,14 @@
+---
+source: src/ui/draw_blocks/chart_cpu_mem.rs
+expression: setup.terminal.backend()
+---
+"โญโโโโโโโโโโโโโ cpu 00.00% โโโโโโโโโโโโโโฎโญโโโโโโโโโโโ memory 0.00 kB โโโโโโโโโโโโฎ"
+"โ00.00%โ โโ0.00 kBโ โ"
+"โ โ โโ โ โ"
+"โ โ โโ โ โ"
+"โ โ โโ โ โ"
+"โ โ โโ โ โ"
+"โ โ โโ โ โ"
+"โ โ โโ โ โ"
+"โ โ โโ โ โ"
+"โฐโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโฏโฐโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโฏ"
diff --git a/src/ui/draw_blocks/snapshots/oxker__ui__draw_blocks__chart_cpu_mem__tests__draw_blocks_charts_running_some.snap b/src/ui/draw_blocks/snapshots/oxker__ui__draw_blocks__chart_cpu_mem__tests__draw_blocks_charts_running_some.snap
new file mode 100644
index 0000000..8a75efc
--- /dev/null
+++ b/src/ui/draw_blocks/snapshots/oxker__ui__draw_blocks__chart_cpu_mem__tests__draw_blocks_charts_running_some.snap
@@ -0,0 +1,14 @@
+---
+source: src/ui/draw_blocks/chart_cpu_mem.rs
+expression: setup.terminal.backend()
+---
+"โญโโโโโโโโโโโโโ cpu 03.00% โโโโโโโโโโโโโโฎโญโโโโโโโโโโ memory 30.00 kB โโโโโโโโโโโโฎ"
+"โ10.00%โ โข โโ100.00 kBโ โข โ"
+"โ โ โขโข โโ โ โขโข โ"
+"โ โ โข โข โโ โ โขโข โ"
+"โ โ โข โข โโ โ โข โข โ"
+"โ โ โข โข โโ โ โขโข โข โ"
+"โ โ โข โขโข โโ โ โข โข โ"
+"โ โโขโข โขโข โโ โโข โข โ"
+"โ โ โโ โ โ"
+"โฐโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโฏโฐโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโฏ"
diff --git a/src/ui/draw_blocks/snapshots/oxker__ui__draw_blocks__charts__tests__draw_blocks_charts_custom_colors.snap b/src/ui/draw_blocks/snapshots/oxker__ui__draw_blocks__charts__tests__draw_blocks_charts_custom_colors.snap
index a92f2bd..90160a2 100644
--- a/src/ui/draw_blocks/snapshots/oxker__ui__draw_blocks__charts__tests__draw_blocks_charts_custom_colors.snap
+++ b/src/ui/draw_blocks/snapshots/oxker__ui__draw_blocks__charts__tests__draw_blocks_charts_custom_colors.snap
@@ -3,12 +3,12 @@ source: src/ui/draw_blocks/charts.rs
expression: setup.terminal.backend()
---
"โญโโโโโโโโโโโโโ cpu 03.00% โโโโโโโโโโโโโโฎโญโโโโโโโโโโ memory 30.00 kB โโโโโโโโโโโโฎ"
-"โ10.00%โ โข โโ100.00 kBโ โขโข โ"
-"โ โ โขโข โโ โ โขโข โ"
-"โ โ โขโขโข โโ โ โข โข โ"
-"โ โ โข โข โโ โ โข โข โ"
-"โ โ โข โขโข โโ โโขโข โขโข โ"
-"โ โโข โข โโ โโข โข โ"
-"โ โโข โข โโ โโข โข โ"
+"โ10.00%โ โข โโ100.00 kBโ โข โ"
+"โ โ โขโข โโ โ โขโข โ"
+"โ โ โข โข โโ โ โขโข โ"
+"โ โ โข โข โโ โ โข โข โ"
+"โ โ โข โข โโ โ โขโข โข โ"
+"โ โ โข โขโข โโ โ โข โข โ"
+"โ โโขโข โขโข โโ โโข โข โ"
"โ โ โโ โ โ"
"โฐโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโฏโฐโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโฏ"
diff --git a/src/ui/draw_blocks/snapshots/oxker__ui__draw_blocks__charts__tests__draw_blocks_charts_dead.snap b/src/ui/draw_blocks/snapshots/oxker__ui__draw_blocks__charts__tests__draw_blocks_charts_dead.snap
index a92f2bd..90160a2 100644
--- a/src/ui/draw_blocks/snapshots/oxker__ui__draw_blocks__charts__tests__draw_blocks_charts_dead.snap
+++ b/src/ui/draw_blocks/snapshots/oxker__ui__draw_blocks__charts__tests__draw_blocks_charts_dead.snap
@@ -3,12 +3,12 @@ source: src/ui/draw_blocks/charts.rs
expression: setup.terminal.backend()
---
"โญโโโโโโโโโโโโโ cpu 03.00% โโโโโโโโโโโโโโฎโญโโโโโโโโโโ memory 30.00 kB โโโโโโโโโโโโฎ"
-"โ10.00%โ โข โโ100.00 kBโ โขโข โ"
-"โ โ โขโข โโ โ โขโข โ"
-"โ โ โขโขโข โโ โ โข โข โ"
-"โ โ โข โข โโ โ โข โข โ"
-"โ โ โข โขโข โโ โโขโข โขโข โ"
-"โ โโข โข โโ โโข โข โ"
-"โ โโข โข โโ โโข โข โ"
+"โ10.00%โ โข โโ100.00 kBโ โข โ"
+"โ โ โขโข โโ โ โขโข โ"
+"โ โ โข โข โโ โ โขโข โ"
+"โ โ โข โข โโ โ โข โข โ"
+"โ โ โข โข โโ โ โขโข โข โ"
+"โ โ โข โขโข โโ โ โข โข โ"
+"โ โโขโข โขโข โโ โโข โข โ"
"โ โ โโ โ โ"
"โฐโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโฏโฐโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโฏ"
diff --git a/src/ui/draw_blocks/snapshots/oxker__ui__draw_blocks__charts__tests__draw_blocks_charts_paused.snap b/src/ui/draw_blocks/snapshots/oxker__ui__draw_blocks__charts__tests__draw_blocks_charts_paused.snap
index a92f2bd..90160a2 100644
--- a/src/ui/draw_blocks/snapshots/oxker__ui__draw_blocks__charts__tests__draw_blocks_charts_paused.snap
+++ b/src/ui/draw_blocks/snapshots/oxker__ui__draw_blocks__charts__tests__draw_blocks_charts_paused.snap
@@ -3,12 +3,12 @@ source: src/ui/draw_blocks/charts.rs
expression: setup.terminal.backend()
---
"โญโโโโโโโโโโโโโ cpu 03.00% โโโโโโโโโโโโโโฎโญโโโโโโโโโโ memory 30.00 kB โโโโโโโโโโโโฎ"
-"โ10.00%โ โข โโ100.00 kBโ โขโข โ"
-"โ โ โขโข โโ โ โขโข โ"
-"โ โ โขโขโข โโ โ โข โข โ"
-"โ โ โข โข โโ โ โข โข โ"
-"โ โ โข โขโข โโ โโขโข โขโข โ"
-"โ โโข โข โโ โโข โข โ"
-"โ โโข โข โโ โโข โข โ"
+"โ10.00%โ โข โโ100.00 kBโ โข โ"
+"โ โ โขโข โโ โ โขโข โ"
+"โ โ โข โข โโ โ โขโข โ"
+"โ โ โข โข โโ โ โข โข โ"
+"โ โ โข โข โโ โ โขโข โข โ"
+"โ โ โข โขโข โโ โ โข โข โ"
+"โ โโขโข โขโข โโ โโข โข โ"
"โ โ โโ โ โ"
"โฐโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโฏโฐโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโฏ"
diff --git a/src/ui/draw_blocks/snapshots/oxker__ui__draw_blocks__charts__tests__draw_blocks_charts_running_some.snap b/src/ui/draw_blocks/snapshots/oxker__ui__draw_blocks__charts__tests__draw_blocks_charts_running_some.snap
index a92f2bd..90160a2 100644
--- a/src/ui/draw_blocks/snapshots/oxker__ui__draw_blocks__charts__tests__draw_blocks_charts_running_some.snap
+++ b/src/ui/draw_blocks/snapshots/oxker__ui__draw_blocks__charts__tests__draw_blocks_charts_running_some.snap
@@ -3,12 +3,12 @@ source: src/ui/draw_blocks/charts.rs
expression: setup.terminal.backend()
---
"โญโโโโโโโโโโโโโ cpu 03.00% โโโโโโโโโโโโโโฎโญโโโโโโโโโโ memory 30.00 kB โโโโโโโโโโโโฎ"
-"โ10.00%โ โข โโ100.00 kBโ โขโข โ"
-"โ โ โขโข โโ โ โขโข โ"
-"โ โ โขโขโข โโ โ โข โข โ"
-"โ โ โข โข โโ โ โข โข โ"
-"โ โ โข โขโข โโ โโขโข โขโข โ"
-"โ โโข โข โโ โโข โข โ"
-"โ โโข โข โโ โโข โข โ"
+"โ10.00%โ โข โโ100.00 kBโ โข โ"
+"โ โ โขโข โโ โ โขโข โ"
+"โ โ โข โข โโ โ โขโข โ"
+"โ โ โข โข โโ โ โข โข โ"
+"โ โ โข โข โโ โ โขโข โข โ"
+"โ โ โข โขโข โโ โ โข โข โ"
+"โ โโขโข โขโข โโ โโข โข โ"
"โ โ โโ โ โ"
"โฐโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโฏโฐโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโฏ"
diff --git a/src/ui/draw_blocks/snapshots/oxker__ui__draw_blocks__error__tests__draw_blocks_error_docker_connect_error.snap b/src/ui/draw_blocks/snapshots/oxker__ui__draw_blocks__error__tests__draw_blocks_error_docker_connect_error.snap
index 629c56a..6bd72ae 100644
--- a/src/ui/draw_blocks/snapshots/oxker__ui__draw_blocks__error__tests__draw_blocks_error_docker_connect_error.snap
+++ b/src/ui/draw_blocks/snapshots/oxker__ui__draw_blocks__error__tests__draw_blocks_error_docker_connect_error.snap
@@ -2,12 +2,14 @@
source: src/ui/draw_blocks/error.rs
expression: setup.terminal.backend()
---
-" "
-"โญโโโโโโโโโโโโโโโโโโ Error โโโโโโโโโโโโโโโโโโโโฎ"
-"โ โ"
-"โ Unable to access docker daemon โ"
-"โ โ"
-"โ oxker::v0.00.000 closing in 04 seconds โ"
-"โ โ"
-"โฐโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโฏ"
-" "
+" "
+" โญโโโโโโโโโโโโโโโโโโโ Error โโโโโโโโโโโโโโโโโโโโโฎ "
+" โ โ "
+" โ Unable to access docker daemon โ "
+" โ โ "
+" โ oxker::v0.00.000 closing in 04 seconds โ "
+" โ โ "
+" โ ( q ) quit oxker โ "
+" โ โ "
+" โฐโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโฏ "
+" "
diff --git a/src/ui/draw_blocks/snapshots/oxker__ui__draw_blocks__error__tests__draw_blocks_error_docker_connect_error_custom_host.snap b/src/ui/draw_blocks/snapshots/oxker__ui__draw_blocks__error__tests__draw_blocks_error_docker_connect_error_custom_host.snap
new file mode 100644
index 0000000..9dabfef
--- /dev/null
+++ b/src/ui/draw_blocks/snapshots/oxker__ui__draw_blocks__error__tests__draw_blocks_error_docker_connect_error_custom_host.snap
@@ -0,0 +1,15 @@
+---
+source: src/ui/draw_blocks/error.rs
+expression: setup.terminal.backend()
+---
+" "
+" โญโโโโโโโโโโโโโโโโโโโโโโโโ Error โโโโโโโโโโโโโโโโโโโโโโโโโโฎ "
+" โ โ "
+" โ Unable to access docker daemon @ "/test/host.sock" โ "
+" โ โ "
+" โ oxker::v0.00.000 closing in 04 seconds โ "
+" โ โ "
+" โ ( q ) quit oxker โ "
+" โ โ "
+" โฐโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโฏ "
+" "
diff --git a/src/ui/draw_blocks/snapshots/oxker__ui__draw_blocks__help__tests__draw_blocks_help.snap b/src/ui/draw_blocks/snapshots/oxker__ui__draw_blocks__help__tests__draw_blocks_help.snap
index 9d29eeb..a68dbd3 100644
--- a/src/ui/draw_blocks/snapshots/oxker__ui__draw_blocks__help__tests__draw_blocks_help.snap
+++ b/src/ui/draw_blocks/snapshots/oxker__ui__draw_blocks__help__tests__draw_blocks_help.snap
@@ -2,42 +2,28 @@
source: src/ui/draw_blocks/help.rs
expression: setup.terminal.backend()
---
-" "
-" โญ 0.00.000 โโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโฎ "
-" โ โ "
-" โ 88 โ "
-" โ 88 โ "
-" โ 88 โ "
-" โ ,adPPYba, 8b, ,d8 88 ,d8 ,adPPYba, 8b,dPPYba, โ "
-" โ a8" "8a `Y8, ,8P' 88 ,a8" a8P_____88 88P' "Y8 โ "
-" โ 8b d8 )888( 8888[ 8PP""""""" 88 โ "
-" โ "8a, ,a8" ,d8" "8b, 88`"Yba, "8b, ,aa 88 โ "
-" โ `"YbbdP"' 8P' `Y8 88 `Y8a `"Ybbd8"' 88 โ "
-" โ โ "
-" โ A simple tui to view & control docker containers โ "
-" โ โ "
-" โ ( tab ) or ( shift+tab ) change panels โ "
-" โ ( โ โ ) or ( j k ) or ( Home End ) scroll vertically โ "
-" โ ( โ โ ) horizontal scroll across logs โ "
-" โ ( ctrl ) increase scroll speed, used in conjunction scroll keys โ "
-" โ ( enter ) send docker container command โ "
-" โ ( e ) exec into a container โ "
-" โ ( f ) force clear the screen & redraw the gui โ "
-" โ ( h ) toggle this help information - or click heading โ "
-" โ ( s ) save logs to file โ "
-" โ ( m ) toggle mouse capture - if disabled, text on screen can be selected & copied โ "
-" โ ( F1 ) or ( / ) enter filter mode โ "
-" โ ( # ) enter log search mode โ "
-" โ ( 0 ) stop sort โ "
-" โ ( 1 - 9 ) sort by header - or click header โ "
-" โ ( - = ) change log section height โ "
-" โ ( \ ) toggle log section visibility โ "
-" โ ( esc ) close dialog โ "
-" โ ( q ) quit at any time โ "
-" โ โ "
-" โ currently an early work in progress, all and any input appreciated โ "
-" โ https://github.com/mrjackwills/oxker โ "
-" โ โ "
-" โ โ "
-" โฐโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโฏ "
-" "
+" "
+" โญ 0.00.000 โโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโฎ "
+" โ 88 โ "
+" โ 88 โ "
+" โ ,adPPYba, 8b, ,d8 88 ,d8 ,adPPYba, 8b,dPPYba โ "
+" โ a8" "8a `Y8, ,8P' 88 ,a8" a8P_____88 88P' "Y config location: /home/user/.config/oxker/config.toml โ "
+" โ 8b d8 )888( 8888( 8PP""""""" 88 export location: /test_dir โ "
+" โ "8a, ,a8" ,d8" "8b, 88`"Yba, "8b, ,aa 88 logs timezone: Etc/UTC โ "
+" โ `"YbbdP"' 8P' `Y8 88 `Y8a `"Ybbd8"' 88 โ "
+" โ a work in progress, all and any input appreciated โ "
+" โ A simple tui to view & control docker containers https://github.com/mrjackwills/oxker โ "
+" โ โ "
+" โ Keymap โ "
+" โ q quit c Esc close dialog โ "
+" โ Down Up j k Home End scroll vertically Left Right scroll horizontally โ "
+" โ Control increase scroll speed Enter send docker command โ "
+" โ e exec into a container i container inspect mode โ "
+" โ / F1 filter mode # log search mode โ "
+" โ h toggle this panel f force clear screen and redraw โ "
+" โ - = change log section height \ toggle of section visibility โ "
+" โ 1 ~ 9 sort by header - or click header 0 stop sort โ "
+" โ Tab Back Tab change panel m toggle mouse capture - allows text selection โ "
+" โ s save logs to file โ "
+" โฐโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโฏ "
+" "
diff --git a/src/ui/draw_blocks/snapshots/oxker__ui__draw_blocks__help__tests__draw_blocks_help_custom_color.snap b/src/ui/draw_blocks/snapshots/oxker__ui__draw_blocks__help__tests__draw_blocks_help_custom_color.snap
new file mode 100644
index 0000000..a68dbd3
--- /dev/null
+++ b/src/ui/draw_blocks/snapshots/oxker__ui__draw_blocks__help__tests__draw_blocks_help_custom_color.snap
@@ -0,0 +1,29 @@
+---
+source: src/ui/draw_blocks/help.rs
+expression: setup.terminal.backend()
+---
+" "
+" โญ 0.00.000 โโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโฎ "
+" โ 88 โ "
+" โ 88 โ "
+" โ ,adPPYba, 8b, ,d8 88 ,d8 ,adPPYba, 8b,dPPYba โ "
+" โ a8" "8a `Y8, ,8P' 88 ,a8" a8P_____88 88P' "Y config location: /home/user/.config/oxker/config.toml โ "
+" โ 8b d8 )888( 8888( 8PP""""""" 88 export location: /test_dir โ "
+" โ "8a, ,a8" ,d8" "8b, 88`"Yba, "8b, ,aa 88 logs timezone: Etc/UTC โ "
+" โ `"YbbdP"' 8P' `Y8 88 `Y8a `"Ybbd8"' 88 โ "
+" โ a work in progress, all and any input appreciated โ "
+" โ A simple tui to view & control docker containers https://github.com/mrjackwills/oxker โ "
+" โ โ "
+" โ Keymap โ "
+" โ q quit c Esc close dialog โ "
+" โ Down Up j k Home End scroll vertically Left Right scroll horizontally โ "
+" โ Control increase scroll speed Enter send docker command โ "
+" โ e exec into a container i container inspect mode โ "
+" โ / F1 filter mode # log search mode โ "
+" โ h toggle this panel f force clear screen and redraw โ "
+" โ - = change log section height \ toggle of section visibility โ "
+" โ 1 ~ 9 sort by header - or click header 0 stop sort โ "
+" โ Tab Back Tab change panel m toggle mouse capture - allows text selection โ "
+" โ s save logs to file โ "
+" โฐโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโฏ "
+" "
diff --git a/src/ui/draw_blocks/snapshots/oxker__ui__draw_blocks__help__tests__draw_blocks_help_custom_colors.snap b/src/ui/draw_blocks/snapshots/oxker__ui__draw_blocks__help__tests__draw_blocks_help_custom_colors.snap
deleted file mode 100644
index 9d29eeb..0000000
--- a/src/ui/draw_blocks/snapshots/oxker__ui__draw_blocks__help__tests__draw_blocks_help_custom_colors.snap
+++ /dev/null
@@ -1,43 +0,0 @@
----
-source: src/ui/draw_blocks/help.rs
-expression: setup.terminal.backend()
----
-" "
-" โญ 0.00.000 โโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโฎ "
-" โ โ "
-" โ 88 โ "
-" โ 88 โ "
-" โ 88 โ "
-" โ ,adPPYba, 8b, ,d8 88 ,d8 ,adPPYba, 8b,dPPYba, โ "
-" โ a8" "8a `Y8, ,8P' 88 ,a8" a8P_____88 88P' "Y8 โ "
-" โ 8b d8 )888( 8888[ 8PP""""""" 88 โ "
-" โ "8a, ,a8" ,d8" "8b, 88`"Yba, "8b, ,aa 88 โ "
-" โ `"YbbdP"' 8P' `Y8 88 `Y8a `"Ybbd8"' 88 โ "
-" โ โ "
-" โ A simple tui to view & control docker containers โ "
-" โ โ "
-" โ ( tab ) or ( shift+tab ) change panels โ "
-" โ ( โ โ ) or ( j k ) or ( Home End ) scroll vertically โ "
-" โ ( โ โ ) horizontal scroll across logs โ "
-" โ ( ctrl ) increase scroll speed, used in conjunction scroll keys โ "
-" โ ( enter ) send docker container command โ "
-" โ ( e ) exec into a container โ "
-" โ ( f ) force clear the screen & redraw the gui โ "
-" โ ( h ) toggle this help information - or click heading โ "
-" โ ( s ) save logs to file โ "
-" โ ( m ) toggle mouse capture - if disabled, text on screen can be selected & copied โ "
-" โ ( F1 ) or ( / ) enter filter mode โ "
-" โ ( # ) enter log search mode โ "
-" โ ( 0 ) stop sort โ "
-" โ ( 1 - 9 ) sort by header - or click header โ "
-" โ ( - = ) change log section height โ "
-" โ ( \ ) toggle log section visibility โ "
-" โ ( esc ) close dialog โ "
-" โ ( q ) quit at any time โ "
-" โ โ "
-" โ currently an early work in progress, all and any input appreciated โ "
-" โ https://github.com/mrjackwills/oxker โ "
-" โ โ "
-" โ โ "
-" โฐโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโฏ "
-" "
diff --git a/src/ui/draw_blocks/snapshots/oxker__ui__draw_blocks__help__tests__draw_blocks_help_custom_keymap_one_definition.snap b/src/ui/draw_blocks/snapshots/oxker__ui__draw_blocks__help__tests__draw_blocks_help_custom_keymap_one_definition.snap
index 97b4d43..a7b1daf 100644
--- a/src/ui/draw_blocks/snapshots/oxker__ui__draw_blocks__help__tests__draw_blocks_help_custom_keymap_one_definition.snap
+++ b/src/ui/draw_blocks/snapshots/oxker__ui__draw_blocks__help__tests__draw_blocks_help_custom_keymap_one_definition.snap
@@ -2,53 +2,28 @@
source: src/ui/draw_blocks/help.rs
expression: setup.terminal.backend()
---
-" โญ 0.00.000 โโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโฎ "
-" โ โ "
-" โ 88 โ "
-" โ 88 โ "
-" โ 88 โ "
-" โ ,adPPYba, 8b, ,d8 88 ,d8 ,adPPYba, 8b,dPPYba, โ "
-" โ a8" "8a `Y8, ,8P' 88 ,a8" a8P_____88 88P' "Y8 โ "
-" โ 8b d8 )888( 8888[ 8PP""""""" 88 โ "
-" โ "8a, ,a8" ,d8" "8b, 88`"Yba, "8b, ,aa 88 โ "
-" โ `"YbbdP"' 8P' `Y8 88 `Y8a `"Ybbd8"' 88 โ "
-" โ โ "
-" โ A simple tui to view & control docker containers โ "
-" โ โ "
-" โ ( t ) select next panel โ "
-" โ ( u ) select previous panel โ "
-" โ ( o ) scroll list down by one โ "
-" โ ( s ) scroll list up by one โ "
-" โ ( p ) scroll list to end โ "
-" โ ( q ) scroll list to start โ "
-" โ ( h ) horizontal scroll logs right โ "
-" โ ( g ) horizontal scroll logs left โ "
-" โ ( Alt ) increase scroll speed, used in conjunction scroll keys โ "
-" โ ( enter ) send docker container command โ "
-" โ ( d ) exec into a container โ "
-" โ ( f ) force clear the screen & redraw the gui โ "
-" โ ( 5 ) toggle this help information - or click heading โ "
-" โ ( m ) save logs to file โ "
-" โ ( 6 ) toggle mouse capture - if disabled, text on screen can be selected & copied โ "
-" โ ( e ) enter filter mode โ "
-" โ ( 7 ) enter log search mode โ "
-" โ ( 4 ) reset container sorting โ "
-" โ ( z ) sort containers by name โ "
-" โ ( 1 ) sort containers by state โ "
-" โ ( 2 ) sort containers by status โ "
-" โ ( v ) sort containers by cpu โ "
-" โ ( y ) sort containers by memory โ "
-" โ ( w ) sort containers by id โ "
-" โ ( x ) sort containers by image โ "
-" โ ( 0 ) sort containers by rx โ "
-" โ ( 3 ) sort containers by tx โ "
-" โ ( i ) decrease log section height โ "
-" โ ( j ) increase log section height โ "
-" โ ( k ) toggle log section visibility โ "
-" โ ( a ) close dialog โ "
-" โ ( l ) quit at any time โ "
-" โ โ "
-" โ currently an early work in progress, all and any input appreciated โ "
-" โ https://github.com/mrjackwills/oxker โ "
-" โ โ "
-" โฐโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโฏ "
+" โญ 0.00.000 โโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโฎ "
+" โ 88 โ "
+" โ 88 โ "
+" โ ,adPPYba, 8b, ,d8 88 ,d8 ,adPPYba, 8b,dPPYba โ "
+" โ a8" "8a `Y8, ,8P' 88 ,a8" a8P_____88 88P' "Y config location: /home/user/.config/oxker/config.toml โ "
+" โ 8b d8 )888( 8888( 8PP""""""" 88 export location: /test_dir โ "
+" โ "8a, ,a8" ,d8" "8b, 88`"Yba, "8b, ,aa 88 logs timezone: Etc/UTC โ "
+" โ โ "
+" โ Keymap โ "
+" โ n quit a close dialog โ "
+" โ p s scroll vertically i j scroll horizontally โ "
+" โ r scroll to start q scroll to end โ "
+" โ Alt increase scroll speed Enter send docker command โ "
+" โ d exec into a container e container inspect mode โ "
+" โ f filter mode g log search mode โ "
+" โ 5 toggle this panel h force clear screen and redraw โ "
+" โ k l change log section height m toggle of section visibility โ "
+" โ z sort by name 1 sort by state โ "
+" โ 2 sort by status v sort by CPU โ "
+" โ y sort by memory w sort by ID โ "
+" โ x sort by Image 0 sort by RX โ "
+" โ 3 sort by TX 4 stop sort โ "
+" โ t u change panel 6 toggle mouse capture - allows text selection โ "
+" โ o save logs to file โ "
+" โฐโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโฏ "
diff --git a/src/ui/draw_blocks/snapshots/oxker__ui__draw_blocks__help__tests__draw_blocks_help_custom_keymap_one_two_definition.snap b/src/ui/draw_blocks/snapshots/oxker__ui__draw_blocks__help__tests__draw_blocks_help_custom_keymap_one_two_definition.snap
new file mode 100644
index 0000000..ed14a24
--- /dev/null
+++ b/src/ui/draw_blocks/snapshots/oxker__ui__draw_blocks__help__tests__draw_blocks_help_custom_keymap_one_two_definition.snap
@@ -0,0 +1,34 @@
+---
+source: src/ui/draw_blocks/help.rs
+expression: setup.terminal.backend()
+---
+" "
+" โญ 0.00.000 โโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโฎ "
+" โ 88 โ "
+" โ 88 โ "
+" โ ,adPPYba, 8b, ,d8 88 ,d8 ,adPPYba, 8b,dPPYba โ "
+" โ a8" "8a `Y8, ,8P' 88 ,a8" a8P_____88 88P' "Y config location: /home/user/.config/oxker/config.toml โ "
+" โ 8b d8 )888( 8888( 8PP""""""" 88 export location: /test_dir โ "
+" โ "8a, ,a8" ,d8" "8b, 88`"Yba, "8b, ,aa 88 logs timezone: Etc/UTC โ "
+" โ `"YbbdP"' 8P' `Y8 88 `Y8a `"Ybbd8"' 88 โ "
+" โ a work in progress, all and any input appreciated โ "
+" โ A simple tui to view & control docker containers https://github.com/mrjackwills/oxker โ "
+" โ โ "
+" โ Keymap โ "
+" โ 0 quit a b close dialog โ "
+" โ 4 Caps Lock Scroll Lock scroll vertically q s r scroll horizontally โ "
+" โ 8 scroll to start 6 7 scroll to end โ "
+" โ Alt increase scroll speed Enter send docker command โ "
+" โ g exec into a container i j container inspect mode โ "
+" โ k filter mode m n log search mode โ "
+" โ F5 F6 toggle this panel o force clear screen and redraw โ "
+" โ u w v change log section height y z toggle of section visibility โ "
+" โ Begin Menu sort by name Page Up Pause sort by state โ "
+" โ Print Screen sort by status Down sort by CPU โ "
+" โ Home sort by memory Back Tab sort by ID โ "
+" โ End Esc sort by Image Num Lock sort by RX โ "
+" โ F1 F2 sort by TX F3 stop sort โ "
+" โ Print Screen Left Up change panel F7 toggle mouse capture - allows text selection โ "
+" โ 2 3 save logs to file โ "
+" โฐโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโฏ "
+" "
diff --git a/src/ui/draw_blocks/snapshots/oxker__ui__draw_blocks__help__tests__draw_blocks_help_custom_keymap_two_definition.snap b/src/ui/draw_blocks/snapshots/oxker__ui__draw_blocks__help__tests__draw_blocks_help_custom_keymap_two_definition.snap
new file mode 100644
index 0000000..1aecc71
--- /dev/null
+++ b/src/ui/draw_blocks/snapshots/oxker__ui__draw_blocks__help__tests__draw_blocks_help_custom_keymap_two_definition.snap
@@ -0,0 +1,34 @@
+---
+source: src/ui/draw_blocks/help.rs
+expression: setup.terminal.backend()
+---
+" "
+" โญ 0.00.000 โโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโฎ "
+" โ 88 โ "
+" โ 88 โ "
+" โ ,adPPYba, 8b, ,d8 88 ,d8 ,adPPYba, 8b,dPPYba, โ "
+" โ a8" "8a `Y8, ,8P' 88 ,a8" a8P_____88 88P' "Y8 config location: /home/user/.config/oxker/config.toml โ "
+" โ 8b d8 )888( 8888( 8PP""""""" 88 export location: /test_dir โ "
+" โ "8a, ,a8" ,d8" "8b, 88`"Yba, "8b, ,aa 88 logs timezone: Etc/UTC โ "
+" โ `"YbbdP"' 8P' `Y8 88 `Y8a `"Ybbd8"' 88 โ "
+" โ a work in progress, all and any input appreciated โ "
+" โ A simple tui to view & control docker containers https://github.com/mrjackwills/oxker โ "
+" โ โ "
+" โ Keymap โ "
+" โ 0 1 quit a b close dialog โ "
+" โ 4 Caps Lock 5 Scroll Lock scroll vertically q s r t scroll horizontally โ "
+" โ 8 9 scroll to start 6 7 scroll to end โ "
+" โ Alt increase scroll speed Enter send docker command โ "
+" โ g h exec into a container i j container inspect mode โ "
+" โ k l filter mode m n log search mode โ "
+" โ F5 F6 toggle this panel o p force clear screen and redraw โ "
+" โ u w v x change log section height y z toggle of section visibility โ "
+" โ Begin Menu sort by name Page Up Pause sort by state โ "
+" โ Print Screen Tab sort by status Down Del sort by CPU โ "
+" โ Home Insert sort by memory Back Tab Backspace sort by ID โ "
+" โ End Esc sort by Image Num Lock Page Down sort by RX โ "
+" โ F1 F2 sort by TX F3 F4 stop sort โ "
+" โ Print Screen Left Up Right change panel F7 F8 toggle mouse capture - allows text selection โ "
+" โ 2 3 save logs to file โ "
+" โฐโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโฏ "
+" "
diff --git a/src/ui/draw_blocks/snapshots/oxker__ui__draw_blocks__help__tests__draw_blocks_help_custom_keymap_two_definitions.snap b/src/ui/draw_blocks/snapshots/oxker__ui__draw_blocks__help__tests__draw_blocks_help_custom_keymap_two_definitions.snap
deleted file mode 100644
index f884948..0000000
--- a/src/ui/draw_blocks/snapshots/oxker__ui__draw_blocks__help__tests__draw_blocks_help_custom_keymap_two_definitions.snap
+++ /dev/null
@@ -1,54 +0,0 @@
----
-source: src/ui/draw_blocks/help.rs
-expression: setup.terminal.backend()
----
-" โญ 0.00.000 โโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโฎ "
-" โ โ "
-" โ 88 โ "
-" โ 88 โ "
-" โ 88 โ "
-" โ ,adPPYba, 8b, ,d8 88 ,d8 ,adPPYba, 8b,dPPYba, โ "
-" โ a8" "8a `Y8, ,8P' 88 ,a8" a8P_____88 88P' "Y8 โ "
-" โ 8b d8 )888( 8888[ 8PP""""""" 88 โ "
-" โ "8a, ,a8" ,d8" "8b, 88`"Yba, "8b, ,aa 88 โ "
-" โ `"YbbdP"' 8P' `Y8 88 `Y8a `"Ybbd8"' 88 โ "
-" โ โ "
-" โ A simple tui to view & control docker containers โ "
-" โ โ "
-" โ ( s ) or ( S ) select next panel โ "
-" โ ( t ) or ( T ) select previous panel โ "
-" โ ( n ) or ( N ) scroll list down by one โ "
-" โ ( r ) or ( R ) scroll list up by one โ "
-" โ ( o ) or ( O ) scroll list to end โ "
-" โ ( p ) or ( P ) scroll list to start โ "
-" โ ( g ) or ( G ) horizontal scroll logs right โ "
-" โ ( f ) or ( F ) horizontal scroll logs left โ "
-" โ ( Alt ) increase scroll speed, used in conjunction scroll keys โ "
-" โ ( enter ) send docker container command โ "
-" โ ( d ) or ( D ) exec into a container โ "
-" โ ( f ) or ( F ) force clear the screen & redraw the gui โ "
-" โ ( 4 ) or ( 5 ) toggle this help information - or click heading โ "
-" โ ( l ) or ( L ) save logs to file โ "
-" โ ( 5 ) or ( Page Down ) toggle mouse capture - if disabled, text on screen can be selected & copied โ "
-" โ ( e ) or ( E ) enter filter mode โ "
-" โ ( m ) or ( M ) enter log search mode โ "
-" โ ( 3 ) or ( 6 ) reset container sorting โ "
-" โ ( y ) or ( Y ) sort containers by name โ "
-" โ ( 0 ) or ( 9 ) sort containers by state โ "
-" โ ( 1 ) or ( 8 ) sort containers by status โ "
-" โ ( u ) or ( U ) sort containers by cpu โ "
-" โ ( x ) or ( X ) sort containers by memory โ "
-" โ ( v ) or ( V ) sort containers by id โ "
-" โ ( w ) or ( W ) sort containers by image โ "
-" โ ( z ) or ( Z ) sort containers by rx โ "
-" โ ( 2 ) or ( 7 ) sort containers by tx โ "
-" โ ( h ) or ( H ) decrease log section height โ "
-" โ ( i ) or ( I ) increase log section height โ "
-" โ ( j ) or ( J ) toggle log section visibility โ "
-" โ ( a ) or ( A ) close dialog โ "
-" โ ( k ) or ( K ) quit at any time โ "
-" โ โ "
-" โ currently an early work in progress, all and any input appreciated โ "
-" โ https://github.com/mrjackwills/oxker โ "
-" โ โ "
-" โฐโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโฏ "
diff --git a/src/ui/draw_blocks/snapshots/oxker__ui__draw_blocks__help__tests__draw_blocks_help_no_config.snap b/src/ui/draw_blocks/snapshots/oxker__ui__draw_blocks__help__tests__draw_blocks_help_no_config.snap
new file mode 100644
index 0000000..b6ae220
--- /dev/null
+++ b/src/ui/draw_blocks/snapshots/oxker__ui__draw_blocks__help__tests__draw_blocks_help_no_config.snap
@@ -0,0 +1,29 @@
+---
+source: src/ui/draw_blocks/help.rs
+expression: setup.terminal.backend()
+---
+" "
+" โญ 0.00.000 โโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโฎ "
+" โ 88 โ "
+" โ 88 โ "
+" โ ,adPPYba, 8b, ,d8 88 ,d8 ,adPPYba, 8b,dPPYb โ "
+" โ a8" "8a `Y8, ,8P' 88 ,a8" a8P_____88 88P' " โ "
+" โ 8b d8 )888( 8888( 8PP""""""" 88 export location: /test_dir โ "
+" โ "8a, ,a8" ,d8" "8b, 88`"Yba, "8b, ,aa 88 logs timezone: Etc/UTC โ "
+" โ `"YbbdP"' 8P' `Y8 88 `Y8a `"Ybbd8"' 88 โ "
+" โ a work in progress, all and any input appreciated โ "
+" โ A simple tui to view & control docker containers https://github.com/mrjackwills/oxker โ "
+" โ โ "
+" โ Keymap โ "
+" โ q quit c Esc close dialog โ "
+" โ Down Up j k Home End scroll vertically Left Right scroll horizontally โ "
+" โ Control increase scroll speed Enter send docker command โ "
+" โ e exec into a container i container inspect mode โ "
+" โ / F1 filter mode # log search mode โ "
+" โ h toggle this panel f force clear screen and redraw โ "
+" โ - = change log section height \ toggle of section visibility โ "
+" โ 1 ~ 9 sort by header - or click header 0 stop sort โ "
+" โ Tab Back Tab change panel m toggle mouse capture - allows text selection โ "
+" โ s save logs to file โ "
+" โฐโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโฏ "
+" "
diff --git a/src/ui/draw_blocks/snapshots/oxker__ui__draw_blocks__help__tests__draw_blocks_help_no_save.snap b/src/ui/draw_blocks/snapshots/oxker__ui__draw_blocks__help__tests__draw_blocks_help_no_save.snap
new file mode 100644
index 0000000..a1240bf
--- /dev/null
+++ b/src/ui/draw_blocks/snapshots/oxker__ui__draw_blocks__help__tests__draw_blocks_help_no_save.snap
@@ -0,0 +1,29 @@
+---
+source: src/ui/draw_blocks/help.rs
+expression: setup.terminal.backend()
+---
+" "
+" โญ 0.00.000 โโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโฎ "
+" โ 88 โ "
+" โ 88 โ "
+" โ ,adPPYba, 8b, ,d8 88 ,d8 ,adPPYba, 8b,dPPYba โ "
+" โ a8" "8a `Y8, ,8P' 88 ,a8" a8P_____88 88P' "Y โ "
+" โ 8b d8 )888( 8888( 8PP""""""" 88 config location: /home/user/.config/oxker/config.toml โ "
+" โ "8a, ,a8" ,d8" "8b, 88`"Yba, "8b, ,aa 88 logs timezone: Etc/UTC โ "
+" โ `"YbbdP"' 8P' `Y8 88 `Y8a `"Ybbd8"' 88 โ "
+" โ a work in progress, all and any input appreciated โ "
+" โ A simple tui to view & control docker containers https://github.com/mrjackwills/oxker โ "
+" โ โ "
+" โ Keymap โ "
+" โ q quit c Esc close dialog โ "
+" โ Down Up j k Home End scroll vertically Left Right scroll horizontally โ "
+" โ Control increase scroll speed Enter send docker command โ "
+" โ e exec into a container i container inspect mode โ "
+" โ / F1 filter mode # log search mode โ "
+" โ h toggle this panel f force clear screen and redraw โ "
+" โ - = change log section height \ toggle of section visibility โ "
+" โ 1 ~ 9 sort by header - or click header 0 stop sort โ "
+" โ Tab Back Tab change panel m toggle mouse capture - allows text selection โ "
+" โ s save logs to file โ "
+" โฐโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโฏ "
+" "
diff --git a/src/ui/draw_blocks/snapshots/oxker__ui__draw_blocks__help__tests__draw_blocks_help_no_timezone.snap b/src/ui/draw_blocks/snapshots/oxker__ui__draw_blocks__help__tests__draw_blocks_help_no_timezone.snap
new file mode 100644
index 0000000..01aa561
--- /dev/null
+++ b/src/ui/draw_blocks/snapshots/oxker__ui__draw_blocks__help__tests__draw_blocks_help_no_timezone.snap
@@ -0,0 +1,29 @@
+---
+source: src/ui/draw_blocks/help.rs
+expression: setup.terminal.backend()
+---
+" "
+" โญ 0.00.000 โโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโฎ "
+" โ 88 โ "
+" โ 88 โ "
+" โ ,adPPYba, 8b, ,d8 88 ,d8 ,adPPYba, 8b,dPPYba โ "
+" โ a8" "8a `Y8, ,8P' 88 ,a8" a8P_____88 88P' "Y โ "
+" โ 8b d8 )888( 8888( 8PP""""""" 88 config location: /home/user/.config/oxker/config.toml โ "
+" โ "8a, ,a8" ,d8" "8b, 88`"Yba, "8b, ,aa 88 export location: /test_dir โ "
+" โ `"YbbdP"' 8P' `Y8 88 `Y8a `"Ybbd8"' 88 โ "
+" โ a work in progress, all and any input appreciated โ "
+" โ A simple tui to view & control docker containers https://github.com/mrjackwills/oxker โ "
+" โ โ "
+" โ Keymap โ "
+" โ q quit c Esc close dialog โ "
+" โ Down Up j k Home End scroll vertically Left Right scroll horizontally โ "
+" โ Control increase scroll speed Enter send docker command โ "
+" โ e exec into a container i container inspect mode โ "
+" โ / F1 filter mode # log search mode โ "
+" โ h toggle this panel f force clear screen and redraw โ "
+" โ - = change log section height \ toggle of section visibility โ "
+" โ 1 ~ 9 sort by header - or click header 0 stop sort โ "
+" โ Tab Back Tab change panel m toggle mouse capture - allows text selection โ "
+" โ s save logs to file โ "
+" โฐโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโฏ "
+" "
diff --git a/src/ui/draw_blocks/snapshots/oxker__ui__draw_blocks__help__tests__draw_blocks_help_one_and_two_definitions.snap b/src/ui/draw_blocks/snapshots/oxker__ui__draw_blocks__help__tests__draw_blocks_help_one_and_two_definitions.snap
deleted file mode 100644
index 6fcfd2e..0000000
--- a/src/ui/draw_blocks/snapshots/oxker__ui__draw_blocks__help__tests__draw_blocks_help_one_and_two_definitions.snap
+++ /dev/null
@@ -1,54 +0,0 @@
----
-source: src/ui/draw_blocks/help.rs
-expression: setup.terminal.backend()
----
-" โญ 0.00.000 โโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโฎ "
-" โ โ "
-" โ 88 โ "
-" โ 88 โ "
-" โ 88 โ "
-" โ ,adPPYba, 8b, ,d8 88 ,d8 ,adPPYba, 8b,dPPYba, โ "
-" โ a8" "8a `Y8, ,8P' 88 ,a8" a8P_____88 88P' "Y8 โ "
-" โ 8b d8 )888( 8888[ 8PP""""""" 88 โ "
-" โ "8a, ,a8" ,d8" "8b, 88`"Yba, "8b, ,aa 88 โ "
-" โ `"YbbdP"' 8P' `Y8 88 `Y8a `"Ybbd8"' 88 โ "
-" โ โ "
-" โ A simple tui to view & control docker containers โ "
-" โ โ "
-" โ ( t ) select next panel โ "
-" โ ( u ) or ( U ) select previous panel โ "
-" โ ( o ) or ( O ) scroll list down by one โ "
-" โ ( s ) or ( S ) scroll list up by one โ "
-" โ ( p ) scroll list to end โ "
-" โ ( q ) or ( Q ) scroll list to start โ "
-" โ ( h ) horizontal scroll logs right โ "
-" โ ( g ) or ( G ) horizontal scroll logs left โ "
-" โ ( Alt ) increase scroll speed, used in conjunction scroll keys โ "
-" โ ( enter ) send docker container command โ "
-" โ ( d ) exec into a container โ "
-" โ ( f ) force clear the screen & redraw the gui โ "
-" โ ( 5 ) toggle this help information - or click heading โ "
-" โ ( m ) or ( M ) save logs to file โ "
-" โ ( 6 ) or ( # ) toggle mouse capture - if disabled, text on screen can be selected & copied โ "
-" โ ( e ) or ( E ) enter filter mode โ "
-" โ ( 8 ) enter log search mode โ "
-" โ ( 4 ) or ( 5 ) reset container sorting โ "
-" โ ( z ) sort containers by name โ "
-" โ ( 1 ) sort containers by state โ "
-" โ ( 2 ) or ( 7 ) sort containers by status โ "
-" โ ( v ) sort containers by cpu โ "
-" โ ( y ) or ( Y ) sort containers by memory โ "
-" โ ( w ) or ( W ) sort containers by id โ "
-" โ ( x ) sort containers by image โ "
-" โ ( 0 ) or ( 9 ) sort containers by rx โ "
-" โ ( 3 ) sort containers by tx โ "
-" โ ( i ) or ( I ) decrease log section height โ "
-" โ ( j ) increase log section height โ "
-" โ ( k ) or ( K ) toggle log section visibility โ "
-" โ ( a ) or ( A ) close dialog โ "
-" โ ( l ) quit at any time โ "
-" โ โ "
-" โ currently an early work in progress, all and any input appreciated โ "
-" โ https://github.com/mrjackwills/oxker โ "
-" โ โ "
-" โฐโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโฏ "
diff --git a/src/ui/draw_blocks/snapshots/oxker__ui__draw_blocks__help__tests__draw_blocks_help_show_timezone.snap b/src/ui/draw_blocks/snapshots/oxker__ui__draw_blocks__help__tests__draw_blocks_help_show_timezone.snap
deleted file mode 100644
index 6c8b9ef..0000000
--- a/src/ui/draw_blocks/snapshots/oxker__ui__draw_blocks__help__tests__draw_blocks_help_show_timezone.snap
+++ /dev/null
@@ -1,43 +0,0 @@
----
-source: src/ui/draw_blocks/help.rs
-expression: setup.terminal.backend()
----
-" โญ 0.00.000 โโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโฎ "
-" โ โ "
-" โ 88 โ "
-" โ 88 โ "
-" โ 88 โ "
-" โ ,adPPYba, 8b, ,d8 88 ,d8 ,adPPYba, 8b,dPPYba, โ "
-" โ a8" "8a `Y8, ,8P' 88 ,a8" a8P_____88 88P' "Y8 โ "
-" โ 8b d8 )888( 8888[ 8PP""""""" 88 โ "
-" โ "8a, ,a8" ,d8" "8b, 88`"Yba, "8b, ,aa 88 โ "
-" โ `"YbbdP"' 8P' `Y8 88 `Y8a `"Ybbd8"' 88 โ "
-" โ โ "
-" โ A simple tui to view & control docker containers โ "
-" โ โ "
-" โ logs timezone: Asia/Tokyo โ "
-" โ โ "
-" โ ( tab ) or ( shift+tab ) change panels โ "
-" โ ( โ โ ) or ( j k ) or ( Home End ) scroll vertically โ "
-" โ ( โ โ ) horizontal scroll across logs โ "
-" โ ( ctrl ) increase scroll speed, used in conjunction scroll keys โ "
-" โ ( enter ) send docker container command โ "
-" โ ( e ) exec into a container โ "
-" โ ( f ) force clear the screen & redraw the gui โ "
-" โ ( h ) toggle this help information - or click heading โ "
-" โ ( s ) save logs to file โ "
-" โ ( m ) toggle mouse capture - if disabled, text on screen can be selected & copied โ "
-" โ ( F1 ) or ( / ) enter filter mode โ "
-" โ ( # ) enter log search mode โ "
-" โ ( 0 ) stop sort โ "
-" โ ( 1 - 9 ) sort by header - or click header โ "
-" โ ( - = ) change log section height โ "
-" โ ( \ ) toggle log section visibility โ "
-" โ ( esc ) close dialog โ "
-" โ ( q ) quit at any time โ "
-" โ โ "
-" โ currently an early work in progress, all and any input appreciated โ "
-" โ https://github.com/mrjackwills/oxker โ "
-" โ โ "
-" โ โ "
-" โฐโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโฏ "
diff --git a/src/ui/draw_blocks/snapshots/oxker__ui__draw_blocks__inspect__tests__draw_blocks_inspect_custom_color.snap b/src/ui/draw_blocks/snapshots/oxker__ui__draw_blocks__inspect__tests__draw_blocks_inspect_custom_color.snap
new file mode 100644
index 0000000..0c5cf65
--- /dev/null
+++ b/src/ui/draw_blocks/snapshots/oxker__ui__draw_blocks__inspect__tests__draw_blocks_inspect_custom_color.snap
@@ -0,0 +1,54 @@
+---
+source: src/ui/draw_blocks/inspect.rs
+expression: setup.terminal.backend()
+---
+"โญโโโโโโโโโโโโโโโโโโโโโ inspecting: postgres 0bdea642 - c or Esc or i to exit โโโโโโโโโโโโโโโโโโโโโโฎ"
+"โ "Id": "0bdea64212f9c75eb4a1184dd406c2c79a986a7a889a23c85358456cc1bb60c7", โ"
+"โ "Created": "2026-01-23T22:20:19.927967311Z", โ"
+"โ "Path": "docker-entrypoint.sh", โ"
+"โ "Args": [ โ"
+"โ "postgres" โ"
+"โ ], โ"
+"โ "State": { โ"
+"โ "Status": "running", โ"
+"โ "Running": true, โ"
+"โ "Paused": false, โ"
+"โ "Restarting": false, โ"
+"โ "OOMKilled": false, โ"
+"โ "Dead": false, โ"
+"โ "Pid": 782, โ"
+"โ "ExitCode": 0, โ"
+"โ "Error": "", โ"
+"โ "StartedAt": "2026-01-30T08:09:01.574885915Z", โ"
+"โ "FinishedAt": "2026-01-30T08:09:01.180567927Z" โ"
+"โ }, โ"
+"โ "Image": "sha256:aa3668fcbcb5ded731b7d5c27065a4edf545debb7f27bf514c709b1b4e032352", โ"
+"โ "ResolvConfPath": "/var/lib/docker/containers/0bdea64212f9c75eb4a1184dd406c2c79a986a7a889a23c853โ"
+"โ "HostnamePath": "/var/lib/docker/containers/0bdea64212f9c75eb4a1184dd406c2c79a986a7a889a23c85358โ"
+"โ "HostsPath": "/var/lib/docker/containers/0bdea64212f9c75eb4a1184dd406c2c79a986a7a889a23c85358456โ"
+"โ "LogPath": "/var/lib/docker/containers/0bdea64212f9c75eb4a1184dd406c2c79a986a7a889a23c85358456ccโ"
+"โ "Name": "/postgres", โ"
+"โ "RestartCount": 0, โ"
+"โ "Driver": "overlay2", โ"
+"โ "Platform": "linux", โ"
+"โ "MountLabel": "", โ"
+"โ "ProcessLabel": "", โ"
+"โ "AppArmorProfile": "", โ"
+"โ "HostConfig": { โ"
+"โ "CpuShares": 0, โ"
+"โ "Memory": 1073741824, โ"
+"โ "CgroupParent": "", โ"
+"โ "BlkioWeight": 0, โ"
+"โ "CpuPeriod": 0, โ"
+"โ "CpuQuota": 0, โ"
+"โ "CpuRealtimePeriod": 0, โ"
+"โ "CpuRealtimeRuntime": 0, โ"
+"โ "CpusetCpus": "", โ"
+"โ "CpusetMems": "", โ"
+"โ "MemoryReservation": 0, โ"
+"โ "MemorySwap": 2147483648, โ"
+"โ "NanoCpus": 0, โ"
+"โ "OomKillDisable": false, โ"
+"โ "CpuCount": 0, โ"
+"โ "CpuPercent": 0, โ"
+"โฐโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโ 0/158 โ 0/972 โ โโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโฏ"
diff --git a/src/ui/draw_blocks/snapshots/oxker__ui__draw_blocks__inspect__tests__draw_blocks_inspect_custom_keymap_all.snap b/src/ui/draw_blocks/snapshots/oxker__ui__draw_blocks__inspect__tests__draw_blocks_inspect_custom_keymap_all.snap
new file mode 100644
index 0000000..9ab52b8
--- /dev/null
+++ b/src/ui/draw_blocks/snapshots/oxker__ui__draw_blocks__inspect__tests__draw_blocks_inspect_custom_keymap_all.snap
@@ -0,0 +1,54 @@
+---
+source: src/ui/draw_blocks/inspect.rs
+expression: setup.terminal.backend()
+---
+"โญโโโโโโโโโโโโโโโโโโโ inspecting: postgres 0bdea642 - F or Z or 4 or 5 to exit โโโโโโโโโโโโโโโโโโโโโฎ"
+"โ "Id": "0bdea64212f9c75eb4a1184dd406c2c79a986a7a889a23c85358456cc1bb60c7", โ"
+"โ "Created": "2026-01-23T22:20:19.927967311Z", โ"
+"โ "Path": "docker-entrypoint.sh", โ"
+"โ "Args": [ โ"
+"โ "postgres" โ"
+"โ ], โ"
+"โ "State": { โ"
+"โ "Status": "running", โ"
+"โ "Running": true, โ"
+"โ "Paused": false, โ"
+"โ "Restarting": false, โ"
+"โ "OOMKilled": false, โ"
+"โ "Dead": false, โ"
+"โ "Pid": 782, โ"
+"โ "ExitCode": 0, โ"
+"โ "Error": "", โ"
+"โ "StartedAt": "2026-01-30T08:09:01.574885915Z", โ"
+"โ "FinishedAt": "2026-01-30T08:09:01.180567927Z" โ"
+"โ }, โ"
+"โ "Image": "sha256:aa3668fcbcb5ded731b7d5c27065a4edf545debb7f27bf514c709b1b4e032352", โ"
+"โ "ResolvConfPath": "/var/lib/docker/containers/0bdea64212f9c75eb4a1184dd406c2c79a986a7a889a23c853โ"
+"โ "HostnamePath": "/var/lib/docker/containers/0bdea64212f9c75eb4a1184dd406c2c79a986a7a889a23c85358โ"
+"โ "HostsPath": "/var/lib/docker/containers/0bdea64212f9c75eb4a1184dd406c2c79a986a7a889a23c85358456โ"
+"โ "LogPath": "/var/lib/docker/containers/0bdea64212f9c75eb4a1184dd406c2c79a986a7a889a23c85358456ccโ"
+"โ "Name": "/postgres", โ"
+"โ "RestartCount": 0, โ"
+"โ "Driver": "overlay2", โ"
+"โ "Platform": "linux", โ"
+"โ "MountLabel": "", โ"
+"โ "ProcessLabel": "", โ"
+"โ "AppArmorProfile": "", โ"
+"โ "HostConfig": { โ"
+"โ "CpuShares": 0, โ"
+"โ "Memory": 1073741824, โ"
+"โ "CgroupParent": "", โ"
+"โ "BlkioWeight": 0, โ"
+"โ "CpuPeriod": 0, โ"
+"โ "CpuQuota": 0, โ"
+"โ "CpuRealtimePeriod": 0, โ"
+"โ "CpuRealtimeRuntime": 0, โ"
+"โ "CpusetCpus": "", โ"
+"โ "CpusetMems": "", โ"
+"โ "MemoryReservation": 0, โ"
+"โ "MemorySwap": 2147483648, โ"
+"โ "NanoCpus": 0, โ"
+"โ "OomKillDisable": false, โ"
+"โ "CpuCount": 0, โ"
+"โ "CpuPercent": 0, โ"
+"โฐโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโ 0/158 โ 0/972 โ โโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโฏ"
diff --git a/src/ui/draw_blocks/snapshots/oxker__ui__draw_blocks__inspect__tests__draw_blocks_inspect_custom_keymap_clear_one.snap b/src/ui/draw_blocks/snapshots/oxker__ui__draw_blocks__inspect__tests__draw_blocks_inspect_custom_keymap_clear_one.snap
new file mode 100644
index 0000000..ed18a89
--- /dev/null
+++ b/src/ui/draw_blocks/snapshots/oxker__ui__draw_blocks__inspect__tests__draw_blocks_inspect_custom_keymap_clear_one.snap
@@ -0,0 +1,54 @@
+---
+source: src/ui/draw_blocks/inspect.rs
+expression: setup.terminal.backend()
+---
+"โญโโโโโโโโโโโโโโโโโโโโโ inspecting: postgres 0bdea642 - F or Esc or i to exit โโโโโโโโโโโโโโโโโโโโโโฎ"
+"โ "Id": "0bdea64212f9c75eb4a1184dd406c2c79a986a7a889a23c85358456cc1bb60c7", โ"
+"โ "Created": "2026-01-23T22:20:19.927967311Z", โ"
+"โ "Path": "docker-entrypoint.sh", โ"
+"โ "Args": [ โ"
+"โ "postgres" โ"
+"โ ], โ"
+"โ "State": { โ"
+"โ "Status": "running", โ"
+"โ "Running": true, โ"
+"โ "Paused": false, โ"
+"โ "Restarting": false, โ"
+"โ "OOMKilled": false, โ"
+"โ "Dead": false, โ"
+"โ "Pid": 782, โ"
+"โ "ExitCode": 0, โ"
+"โ "Error": "", โ"
+"โ "StartedAt": "2026-01-30T08:09:01.574885915Z", โ"
+"โ "FinishedAt": "2026-01-30T08:09:01.180567927Z" โ"
+"โ }, โ"
+"โ "Image": "sha256:aa3668fcbcb5ded731b7d5c27065a4edf545debb7f27bf514c709b1b4e032352", โ"
+"โ "ResolvConfPath": "/var/lib/docker/containers/0bdea64212f9c75eb4a1184dd406c2c79a986a7a889a23c853โ"
+"โ "HostnamePath": "/var/lib/docker/containers/0bdea64212f9c75eb4a1184dd406c2c79a986a7a889a23c85358โ"
+"โ "HostsPath": "/var/lib/docker/containers/0bdea64212f9c75eb4a1184dd406c2c79a986a7a889a23c85358456โ"
+"โ "LogPath": "/var/lib/docker/containers/0bdea64212f9c75eb4a1184dd406c2c79a986a7a889a23c85358456ccโ"
+"โ "Name": "/postgres", โ"
+"โ "RestartCount": 0, โ"
+"โ "Driver": "overlay2", โ"
+"โ "Platform": "linux", โ"
+"โ "MountLabel": "", โ"
+"โ "ProcessLabel": "", โ"
+"โ "AppArmorProfile": "", โ"
+"โ "HostConfig": { โ"
+"โ "CpuShares": 0, โ"
+"โ "Memory": 1073741824, โ"
+"โ "CgroupParent": "", โ"
+"โ "BlkioWeight": 0, โ"
+"โ "CpuPeriod": 0, โ"
+"โ "CpuQuota": 0, โ"
+"โ "CpuRealtimePeriod": 0, โ"
+"โ "CpuRealtimeRuntime": 0, โ"
+"โ "CpusetCpus": "", โ"
+"โ "CpusetMems": "", โ"
+"โ "MemoryReservation": 0, โ"
+"โ "MemorySwap": 2147483648, โ"
+"โ "NanoCpus": 0, โ"
+"โ "OomKillDisable": false, โ"
+"โ "CpuCount": 0, โ"
+"โ "CpuPercent": 0, โ"
+"โฐโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโ 0/158 โ 0/972 โ โโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโฏ"
diff --git a/src/ui/draw_blocks/snapshots/oxker__ui__draw_blocks__inspect__tests__draw_blocks_inspect_custom_keymap_clear_two.snap b/src/ui/draw_blocks/snapshots/oxker__ui__draw_blocks__inspect__tests__draw_blocks_inspect_custom_keymap_clear_two.snap
new file mode 100644
index 0000000..c4b4d46
--- /dev/null
+++ b/src/ui/draw_blocks/snapshots/oxker__ui__draw_blocks__inspect__tests__draw_blocks_inspect_custom_keymap_clear_two.snap
@@ -0,0 +1,54 @@
+---
+source: src/ui/draw_blocks/inspect.rs
+expression: setup.terminal.backend()
+---
+"โญโโโโโโโโโโโโโโโโโโโโโโ inspecting: postgres 0bdea642 - F or Z or i to exit โโโโโโโโโโโโโโโโโโโโโโโฎ"
+"โ "Id": "0bdea64212f9c75eb4a1184dd406c2c79a986a7a889a23c85358456cc1bb60c7", โ"
+"โ "Created": "2026-01-23T22:20:19.927967311Z", โ"
+"โ "Path": "docker-entrypoint.sh", โ"
+"โ "Args": [ โ"
+"โ "postgres" โ"
+"โ ], โ"
+"โ "State": { โ"
+"โ "Status": "running", โ"
+"โ "Running": true, โ"
+"โ "Paused": false, โ"
+"โ "Restarting": false, โ"
+"โ "OOMKilled": false, โ"
+"โ "Dead": false, โ"
+"โ "Pid": 782, โ"
+"โ "ExitCode": 0, โ"
+"โ "Error": "", โ"
+"โ "StartedAt": "2026-01-30T08:09:01.574885915Z", โ"
+"โ "FinishedAt": "2026-01-30T08:09:01.180567927Z" โ"
+"โ }, โ"
+"โ "Image": "sha256:aa3668fcbcb5ded731b7d5c27065a4edf545debb7f27bf514c709b1b4e032352", โ"
+"โ "ResolvConfPath": "/var/lib/docker/containers/0bdea64212f9c75eb4a1184dd406c2c79a986a7a889a23c853โ"
+"โ "HostnamePath": "/var/lib/docker/containers/0bdea64212f9c75eb4a1184dd406c2c79a986a7a889a23c85358โ"
+"โ "HostsPath": "/var/lib/docker/containers/0bdea64212f9c75eb4a1184dd406c2c79a986a7a889a23c85358456โ"
+"โ "LogPath": "/var/lib/docker/containers/0bdea64212f9c75eb4a1184dd406c2c79a986a7a889a23c85358456ccโ"
+"โ "Name": "/postgres", โ"
+"โ "RestartCount": 0, โ"
+"โ "Driver": "overlay2", โ"
+"โ "Platform": "linux", โ"
+"โ "MountLabel": "", โ"
+"โ "ProcessLabel": "", โ"
+"โ "AppArmorProfile": "", โ"
+"โ "HostConfig": { โ"
+"โ "CpuShares": 0, โ"
+"โ "Memory": 1073741824, โ"
+"โ "CgroupParent": "", โ"
+"โ "BlkioWeight": 0, โ"
+"โ "CpuPeriod": 0, โ"
+"โ "CpuQuota": 0, โ"
+"โ "CpuRealtimePeriod": 0, โ"
+"โ "CpuRealtimeRuntime": 0, โ"
+"โ "CpusetCpus": "", โ"
+"โ "CpusetMems": "", โ"
+"โ "MemoryReservation": 0, โ"
+"โ "MemorySwap": 2147483648, โ"
+"โ "NanoCpus": 0, โ"
+"โ "OomKillDisable": false, โ"
+"โ "CpuCount": 0, โ"
+"โ "CpuPercent": 0, โ"
+"โฐโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโ 0/158 โ 0/972 โ โโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโฏ"
diff --git a/src/ui/draw_blocks/snapshots/oxker__ui__draw_blocks__inspect__tests__draw_blocks_inspect_custom_keymap_inspect_one.snap b/src/ui/draw_blocks/snapshots/oxker__ui__draw_blocks__inspect__tests__draw_blocks_inspect_custom_keymap_inspect_one.snap
new file mode 100644
index 0000000..f1144ec
--- /dev/null
+++ b/src/ui/draw_blocks/snapshots/oxker__ui__draw_blocks__inspect__tests__draw_blocks_inspect_custom_keymap_inspect_one.snap
@@ -0,0 +1,54 @@
+---
+source: src/ui/draw_blocks/inspect.rs
+expression: setup.terminal.backend()
+---
+"โญโโโโโโโโโโโโโโโโโโโโโ inspecting: postgres 0bdea642 - c or Esc or 4 to exit โโโโโโโโโโโโโโโโโโโโโโฎ"
+"โ "Id": "0bdea64212f9c75eb4a1184dd406c2c79a986a7a889a23c85358456cc1bb60c7", โ"
+"โ "Created": "2026-01-23T22:20:19.927967311Z", โ"
+"โ "Path": "docker-entrypoint.sh", โ"
+"โ "Args": [ โ"
+"โ "postgres" โ"
+"โ ], โ"
+"โ "State": { โ"
+"โ "Status": "running", โ"
+"โ "Running": true, โ"
+"โ "Paused": false, โ"
+"โ "Restarting": false, โ"
+"โ "OOMKilled": false, โ"
+"โ "Dead": false, โ"
+"โ "Pid": 782, โ"
+"โ "ExitCode": 0, โ"
+"โ "Error": "", โ"
+"โ "StartedAt": "2026-01-30T08:09:01.574885915Z", โ"
+"โ "FinishedAt": "2026-01-30T08:09:01.180567927Z" โ"
+"โ }, โ"
+"โ "Image": "sha256:aa3668fcbcb5ded731b7d5c27065a4edf545debb7f27bf514c709b1b4e032352", โ"
+"โ "ResolvConfPath": "/var/lib/docker/containers/0bdea64212f9c75eb4a1184dd406c2c79a986a7a889a23c853โ"
+"โ "HostnamePath": "/var/lib/docker/containers/0bdea64212f9c75eb4a1184dd406c2c79a986a7a889a23c85358โ"
+"โ "HostsPath": "/var/lib/docker/containers/0bdea64212f9c75eb4a1184dd406c2c79a986a7a889a23c85358456โ"
+"โ "LogPath": "/var/lib/docker/containers/0bdea64212f9c75eb4a1184dd406c2c79a986a7a889a23c85358456ccโ"
+"โ "Name": "/postgres", โ"
+"โ "RestartCount": 0, โ"
+"โ "Driver": "overlay2", โ"
+"โ "Platform": "linux", โ"
+"โ "MountLabel": "", โ"
+"โ "ProcessLabel": "", โ"
+"โ "AppArmorProfile": "", โ"
+"โ "HostConfig": { โ"
+"โ "CpuShares": 0, โ"
+"โ "Memory": 1073741824, โ"
+"โ "CgroupParent": "", โ"
+"โ "BlkioWeight": 0, โ"
+"โ "CpuPeriod": 0, โ"
+"โ "CpuQuota": 0, โ"
+"โ "CpuRealtimePeriod": 0, โ"
+"โ "CpuRealtimeRuntime": 0, โ"
+"โ "CpusetCpus": "", โ"
+"โ "CpusetMems": "", โ"
+"โ "MemoryReservation": 0, โ"
+"โ "MemorySwap": 2147483648, โ"
+"โ "NanoCpus": 0, โ"
+"โ "OomKillDisable": false, โ"
+"โ "CpuCount": 0, โ"
+"โ "CpuPercent": 0, โ"
+"โฐโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโ 0/158 โ 0/972 โ โโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโฏ"
diff --git a/src/ui/draw_blocks/snapshots/oxker__ui__draw_blocks__inspect__tests__draw_blocks_inspect_custom_keymap_inspect_two.snap b/src/ui/draw_blocks/snapshots/oxker__ui__draw_blocks__inspect__tests__draw_blocks_inspect_custom_keymap_inspect_two.snap
new file mode 100644
index 0000000..e2eb4bc
--- /dev/null
+++ b/src/ui/draw_blocks/snapshots/oxker__ui__draw_blocks__inspect__tests__draw_blocks_inspect_custom_keymap_inspect_two.snap
@@ -0,0 +1,54 @@
+---
+source: src/ui/draw_blocks/inspect.rs
+expression: setup.terminal.backend()
+---
+"โญโโโโโโโโโโโโโโโโโโ inspecting: postgres 0bdea642 - c or Esc or 4 or 5 to exit โโโโโโโโโโโโโโโโโโโโฎ"
+"โ "Id": "0bdea64212f9c75eb4a1184dd406c2c79a986a7a889a23c85358456cc1bb60c7", โ"
+"โ "Created": "2026-01-23T22:20:19.927967311Z", โ"
+"โ "Path": "docker-entrypoint.sh", โ"
+"โ "Args": [ โ"
+"โ "postgres" โ"
+"โ ], โ"
+"โ "State": { โ"
+"โ "Status": "running", โ"
+"โ "Running": true, โ"
+"โ "Paused": false, โ"
+"โ "Restarting": false, โ"
+"โ "OOMKilled": false, โ"
+"โ "Dead": false, โ"
+"โ "Pid": 782, โ"
+"โ "ExitCode": 0, โ"
+"โ "Error": "", โ"
+"โ "StartedAt": "2026-01-30T08:09:01.574885915Z", โ"
+"โ "FinishedAt": "2026-01-30T08:09:01.180567927Z" โ"
+"โ }, โ"
+"โ "Image": "sha256:aa3668fcbcb5ded731b7d5c27065a4edf545debb7f27bf514c709b1b4e032352", โ"
+"โ "ResolvConfPath": "/var/lib/docker/containers/0bdea64212f9c75eb4a1184dd406c2c79a986a7a889a23c853โ"
+"โ "HostnamePath": "/var/lib/docker/containers/0bdea64212f9c75eb4a1184dd406c2c79a986a7a889a23c85358โ"
+"โ "HostsPath": "/var/lib/docker/containers/0bdea64212f9c75eb4a1184dd406c2c79a986a7a889a23c85358456โ"
+"โ "LogPath": "/var/lib/docker/containers/0bdea64212f9c75eb4a1184dd406c2c79a986a7a889a23c85358456ccโ"
+"โ "Name": "/postgres", โ"
+"โ "RestartCount": 0, โ"
+"โ "Driver": "overlay2", โ"
+"โ "Platform": "linux", โ"
+"โ "MountLabel": "", โ"
+"โ "ProcessLabel": "", โ"
+"โ "AppArmorProfile": "", โ"
+"โ "HostConfig": { โ"
+"โ "CpuShares": 0, โ"
+"โ "Memory": 1073741824, โ"
+"โ "CgroupParent": "", โ"
+"โ "BlkioWeight": 0, โ"
+"โ "CpuPeriod": 0, โ"
+"โ "CpuQuota": 0, โ"
+"โ "CpuRealtimePeriod": 0, โ"
+"โ "CpuRealtimeRuntime": 0, โ"
+"โ "CpusetCpus": "", โ"
+"โ "CpusetMems": "", โ"
+"โ "MemoryReservation": 0, โ"
+"โ "MemorySwap": 2147483648, โ"
+"โ "NanoCpus": 0, โ"
+"โ "OomKillDisable": false, โ"
+"โ "CpuCount": 0, โ"
+"โ "CpuPercent": 0, โ"
+"โฐโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโ 0/158 โ 0/972 โ โโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโฏ"
diff --git a/src/ui/draw_blocks/snapshots/oxker__ui__draw_blocks__inspect__tests__draw_blocks_inspect_default_valid.snap b/src/ui/draw_blocks/snapshots/oxker__ui__draw_blocks__inspect__tests__draw_blocks_inspect_default_valid.snap
new file mode 100644
index 0000000..0c5cf65
--- /dev/null
+++ b/src/ui/draw_blocks/snapshots/oxker__ui__draw_blocks__inspect__tests__draw_blocks_inspect_default_valid.snap
@@ -0,0 +1,54 @@
+---
+source: src/ui/draw_blocks/inspect.rs
+expression: setup.terminal.backend()
+---
+"โญโโโโโโโโโโโโโโโโโโโโโ inspecting: postgres 0bdea642 - c or Esc or i to exit โโโโโโโโโโโโโโโโโโโโโโฎ"
+"โ "Id": "0bdea64212f9c75eb4a1184dd406c2c79a986a7a889a23c85358456cc1bb60c7", โ"
+"โ "Created": "2026-01-23T22:20:19.927967311Z", โ"
+"โ "Path": "docker-entrypoint.sh", โ"
+"โ "Args": [ โ"
+"โ "postgres" โ"
+"โ ], โ"
+"โ "State": { โ"
+"โ "Status": "running", โ"
+"โ "Running": true, โ"
+"โ "Paused": false, โ"
+"โ "Restarting": false, โ"
+"โ "OOMKilled": false, โ"
+"โ "Dead": false, โ"
+"โ "Pid": 782, โ"
+"โ "ExitCode": 0, โ"
+"โ "Error": "", โ"
+"โ "StartedAt": "2026-01-30T08:09:01.574885915Z", โ"
+"โ "FinishedAt": "2026-01-30T08:09:01.180567927Z" โ"
+"โ }, โ"
+"โ "Image": "sha256:aa3668fcbcb5ded731b7d5c27065a4edf545debb7f27bf514c709b1b4e032352", โ"
+"โ "ResolvConfPath": "/var/lib/docker/containers/0bdea64212f9c75eb4a1184dd406c2c79a986a7a889a23c853โ"
+"โ "HostnamePath": "/var/lib/docker/containers/0bdea64212f9c75eb4a1184dd406c2c79a986a7a889a23c85358โ"
+"โ "HostsPath": "/var/lib/docker/containers/0bdea64212f9c75eb4a1184dd406c2c79a986a7a889a23c85358456โ"
+"โ "LogPath": "/var/lib/docker/containers/0bdea64212f9c75eb4a1184dd406c2c79a986a7a889a23c85358456ccโ"
+"โ "Name": "/postgres", โ"
+"โ "RestartCount": 0, โ"
+"โ "Driver": "overlay2", โ"
+"โ "Platform": "linux", โ"
+"โ "MountLabel": "", โ"
+"โ "ProcessLabel": "", โ"
+"โ "AppArmorProfile": "", โ"
+"โ "HostConfig": { โ"
+"โ "CpuShares": 0, โ"
+"โ "Memory": 1073741824, โ"
+"โ "CgroupParent": "", โ"
+"โ "BlkioWeight": 0, โ"
+"โ "CpuPeriod": 0, โ"
+"โ "CpuQuota": 0, โ"
+"โ "CpuRealtimePeriod": 0, โ"
+"โ "CpuRealtimeRuntime": 0, โ"
+"โ "CpusetCpus": "", โ"
+"โ "CpusetMems": "", โ"
+"โ "MemoryReservation": 0, โ"
+"โ "MemorySwap": 2147483648, โ"
+"โ "NanoCpus": 0, โ"
+"โ "OomKillDisable": false, โ"
+"โ "CpuCount": 0, โ"
+"โ "CpuPercent": 0, โ"
+"โฐโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโ 0/158 โ 0/972 โ โโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโฏ"
diff --git a/src/ui/draw_blocks/snapshots/oxker__ui__draw_blocks__inspect__tests__draw_blocks_inspect_offset.snap b/src/ui/draw_blocks/snapshots/oxker__ui__draw_blocks__inspect__tests__draw_blocks_inspect_offset.snap
new file mode 100644
index 0000000..503c826
--- /dev/null
+++ b/src/ui/draw_blocks/snapshots/oxker__ui__draw_blocks__inspect__tests__draw_blocks_inspect_offset.snap
@@ -0,0 +1,54 @@
+---
+source: src/ui/draw_blocks/inspect.rs
+expression: setup.terminal.backend()
+---
+"โญโโโโโโโโโโโโโโโโโโโโโ inspecting: postgres 0bdea642 - c or Esc or i to exit โโโโโโโโโโโโโโโโโโโโโโฎ"
+"โrting": false, โ"
+"โlled": false, โ"
+"โ: false, โ"
+"โ 782, โ"
+"โode": 0, โ"
+"โ": "", โ"
+"โedAt": "2026-01-30T08:09:01.574885915Z", โ"
+"โhedAt": "2026-01-30T08:09:01.180567927Z" โ"
+"โ โ"
+"โ "sha256:aa3668fcbcb5ded731b7d5c27065a4edf545debb7f27bf514c709b1b4e032352", โ"
+"โonfPath": "/var/lib/docker/containers/0bdea64212f9c75eb4a1184dd406c2c79a986a7a889a23c85358456cc1bbโ"
+"โePath": "/var/lib/docker/containers/0bdea64212f9c75eb4a1184dd406c2c79a986a7a889a23c85358456cc1bb60โ"
+"โth": "/var/lib/docker/containers/0bdea64212f9c75eb4a1184dd406c2c79a986a7a889a23c85358456cc1bb60c7/โ"
+"โ": "/var/lib/docker/containers/0bdea64212f9c75eb4a1184dd406c2c79a986a7a889a23c85358456cc1bb60c7/0bโ"
+"โ"/postgres", โ"
+"โCount": 0, โ"
+"โ: "overlay2", โ"
+"โm": "linux", โ"
+"โbel": "", โ"
+"โLabel": "", โ"
+"โrProfile": "", โ"
+"โfig": { โ"
+"โares": 0, โ"
+"โy": 1073741824, โ"
+"โpParent": "", โ"
+"โWeight": 0, โ"
+"โriod": 0, โ"
+"โota": 0, โ"
+"โaltimePeriod": 0, โ"
+"โaltimeRuntime": 0, โ"
+"โtCpus": "", โ"
+"โtMems": "", โ"
+"โyReservation": 0, โ"
+"โySwap": 2147483648, โ"
+"โpus": 0, โ"
+"โllDisable": false, โ"
+"โunt": 0, โ"
+"โrcent": 0, โ"
+"โimumIOps": 0, โ"
+"โimumBandwidth": 0, โ"
+"โinerIDFile": "", โ"
+"โnfig": { โ"
+"โe": "json-file", โ"
+"โfig": {} โ"
+"โ โ"
+"โrkMode": "oxker-examaple-net", โ"
+"โindings": {}, โ"
+"โrtPolicy": { โ"
+"โฐโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโ โ 10/158 โ โ 10/972 โ โโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโฏ"
diff --git a/src/ui/draw_blocks/snapshots/oxker__ui__draw_blocks__inspect__tests__draw_blocks_inspect_offset_max.snap b/src/ui/draw_blocks/snapshots/oxker__ui__draw_blocks__inspect__tests__draw_blocks_inspect_offset_max.snap
new file mode 100644
index 0000000..b7e3d72
--- /dev/null
+++ b/src/ui/draw_blocks/snapshots/oxker__ui__draw_blocks__inspect__tests__draw_blocks_inspect_offset_max.snap
@@ -0,0 +1,54 @@
+---
+source: src/ui/draw_blocks/inspect.rs
+expression: setup.terminal.backend()
+---
+"โญโโโโโโโโโโโโโโโโโโโโโ inspecting: postgres 0bdea642 - c or Esc or i to exit โโโโโโโโโโโโโโโโโโโโโโฎ"
+"โ โ"
+"โ โ"
+"โ โ"
+"โ โ"
+"โ โ"
+"โ โ"
+"โ โ"
+"โ โ"
+"โ โ"
+"โ โ"
+"โ โ"
+"โ โ"
+"โ โ"
+"โ โ"
+"โ โ"
+"โ โ"
+"โ โ"
+"โ โ"
+"โ โ"
+"โ โ"
+"โ โ"
+"โ โ"
+"โ โ"
+"โ โ"
+"โ โ"
+"โ โ"
+"โ โ"
+"โ โ"
+"โ โ"
+"โ โ"
+"โ โ"
+"โ โ"
+"โ โ"
+"โ โ"
+"โ โ"
+"โ โ"
+"โ โ"
+"โ โ"
+"โ โ"
+"โ โ"
+"โ โ"
+"โ โ"
+"โ โ"
+"โ โ"
+"โ โ"
+"โ โ"
+"โ โ"
+"โ โ"
+"โฐโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโ โ 158/158 โ 972/972 โโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโฏ"
diff --git a/src/ui/draw_blocks/snapshots/oxker__ui__draw_blocks__tests__draw_blocks_whole_layout.snap b/src/ui/draw_blocks/snapshots/oxker__ui__draw_blocks__tests__draw_blocks_whole_layout.snap
index df648f6..b9fa938 100644
--- a/src/ui/draw_blocks/snapshots/oxker__ui__draw_blocks__tests__draw_blocks_whole_layout.snap
+++ b/src/ui/draw_blocks/snapshots/oxker__ui__draw_blocks__tests__draw_blocks_whole_layout.snap
@@ -25,10 +25,10 @@ expression: setup.terminal.backend()
"โ โ"
"โ โ"
"โฐโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโฏ"
-"โญโโโโโโโโโโโโโโโโโโโโโโโโโ cpu 03.00% โโโโโโโโโโโโโโโโโโโโโโโโโโโฎโญโโโโโโโโโโโโโโโโโโโโโโโ memory 30.00 kB โโโโโโโโโโโโโโโโโโโโโโโโฎโญโโโโโโโโโโ ports โโโโโโโโโโโโฎ"
-"โ10.00%โ โขโขโข โโ100.00 kBโ โขโข โโ ip private publicโ"
-"โ โ โขโข โข โโ โ โขโข โข โโ 8001 โ"
-"โ โ โขโขโข โข โข โโ โ โขโขโข โข โข โโ127.0.0.1 8003 8003โ"
-"โ โโข โขโข โโ โโข โขโข โโ โ"
-"โ โ โโ โ โโ โ"
-"โฐโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโฏโฐโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโฏโฐโโโโโโโโโโโโโโโโโโโโโโโโโโโโโฏ"
+"โญโโโโโโโโโโโโโโ cpu 03.00% โโโโโโโโโโโโโโโโฎโญโโโโโโโโโโโโ memory 30.00 kB โโโโโโโโโโโโโฎโญโโโโโโ rx: 0.00 kb/s tx: 0.00 kb/s โโโโโโโฎ โญโโโโโโโโโโ ports โโโโโโโโโโโโฎ"
+"โ10.00%โ โขโข โโ100.00 kBโ โขโข โโ โโขโขโขโขโขโขโข โ โ ip private publicโ"
+"โ โ โขโขโข โโ โ โขโขโข โโ โ โขโข โ โ 8001 โ"
+"โ โ โขโข โข โโ โ โขโข โข โโ0.00 kb/sโ โขโข โ โ127.0.0.1 8003 8003โ"
+"โ โ โข โขโข โโ โ โข โขโข โโ0.00 kb/sโ โข โ โ โ"
+"โ โโข โข โโ โโข โข โโ โ โข โ โ โ"
+"โฐโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโฏโฐโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโฏโฐโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโฏ โฐโโโโโโโโโโโโโโโโโโโโโโโโโโโโโฏ"
diff --git a/src/ui/draw_blocks/snapshots/oxker__ui__draw_blocks__tests__draw_blocks_whole_layout_delete.snap b/src/ui/draw_blocks/snapshots/oxker__ui__draw_blocks__tests__draw_blocks_whole_layout_delete.snap
index 37af4fd..0f52b1d 100644
--- a/src/ui/draw_blocks/snapshots/oxker__ui__draw_blocks__tests__draw_blocks_whole_layout_delete.snap
+++ b/src/ui/draw_blocks/snapshots/oxker__ui__draw_blocks__tests__draw_blocks_whole_layout_delete.snap
@@ -32,13 +32,13 @@ expression: setup.terminal.backend()
"โ โ"
"โ โ"
"โฐโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโฏ"
-"โญโโโโโโโโโโโโโโโโโโโโโโโโโ cpu 03.00% โโโโโโโโโโโโโโโโโโโโโโโโโโโฎโญโโโโโโโโโโโโโโโโโโโโโโโ memory 30.00 kB โโโโโโโโโโโโโโโโโโโโโโโโฎโญโโโโโโโโโโ ports โโโโโโโโโโโโฎ"
-"โ10.00%โ โขโข โโ100.00 kBโ โขโข โโ ip private publicโ"
-"โ โ โข โข โโ โ โขโข โโ 8001 โ"
-"โ โ โขโข โข โโ โ โขโข โข โโ127.0.0.1 8003 8003โ"
-"โ โ โข โข โโ โ โข โข โโ โ"
-"โ โ โขโข โข โข โโ โ โขโข โข โข โโ โ"
-"โ โโข โขโข โโ โโข โขโข โโ โ"
-"โ โโข โข โโ โโข โข โโ โ"
-"โ โ โโ โ โโ โ"
-"โฐโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโฏโฐโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโฏโฐโโโโโโโโโโโโโโโโโโโโโโโโโโโโโฏ"
+"โญโโโโโโโโโโโโโโ cpu 03.00% โโโโโโโโโโโโโโโโฎโญโโโโโโโโโโโโ memory 30.00 kB โโโโโโโโโโโโโฎโญโโโโโโ rx: 0.00 kb/s tx: 0.00 kb/s โโโโโโโฎ โญโโโโโโโโโโ ports โโโโโโโโโโโโฎ"
+"โ10.00%โ โข โโ100.00 kBโ โข โโ โโขโขโขโขโขโขโข โ โ ip private publicโ"
+"โ โ โขโข โโ โ โขโข โโ โ โขโข โ โ 8001 โ"
+"โ โ โข โข โโ โ โข โข โโ โ โขโข โ โ127.0.0.1 8003 8003โ"
+"โ โ โข โข โโ โ โข โข โโ0.00 kb/sโ โขโข โ โ โ"
+"โ โ โข โข โโ โ โข โข โโ โ โข โ โ โ"
+"โ โ โข โขโข โโ โ โข โขโข โโ0.00 kb/sโ โข โ โ โ"
+"โ โโขโข โข โโ โโขโข โขโข โโ โ โข โ โ โ"
+"โ โ โโ โ โโ โ โข โ โ โ"
+"โฐโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโฏโฐโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโฏโฐโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโฏ โฐโโโโโโโโโโโโโโโโโโโโโโโโโโโโโฏ"
diff --git a/src/ui/draw_blocks/snapshots/oxker__ui__draw_blocks__tests__draw_blocks_whole_layout_error.snap b/src/ui/draw_blocks/snapshots/oxker__ui__draw_blocks__tests__draw_blocks_whole_layout_error.snap
index 49919e8..90db02f 100644
--- a/src/ui/draw_blocks/snapshots/oxker__ui__draw_blocks__tests__draw_blocks_whole_layout_error.snap
+++ b/src/ui/draw_blocks/snapshots/oxker__ui__draw_blocks__tests__draw_blocks_whole_layout_error.snap
@@ -32,13 +32,13 @@ expression: setup.terminal.backend()
"โ โ"
"โ โ"
"โฐโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโฏ"
-"โญโโโโโโโโโโโโโโโโโโโโโโโโโ cpu 03.00% โโโโโโโโโโโโโโโโโโโโโโโโโโโฎโญโโโโโโโโโโโโโโโโโโโโโโโ memory 30.00 kB โโโโโโโโโโโโโโโโโโโโโโโโฎโญโโโโโโโโโโ ports โโโโโโโโโโโโฎ"
-"โ10.00%โ โขโข โโ100.00 kBโ โขโข โโ ip private publicโ"
-"โ โ โข โข โโ โ โขโข โโ 8001 โ"
-"โ โ โขโข โข โโ โ โขโข โข โโ127.0.0.1 8003 8003โ"
-"โ โ โข โข โโ โ โข โข โโ โ"
-"โ โ โขโข โข โข โโ โ โขโข โข โข โโ โ"
-"โ โโข โขโข โโ โโข โขโข โโ โ"
-"โ โโข โข โโ โโข โข โโ โ"
-"โ โ โโ โ โโ โ"
-"โฐโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโฏโฐโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโฏโฐโโโโโโโโโโโโโโโโโโโโโโโโโโโโโฏ"
+"โญโโโโโโโโโโโโโโ cpu 03.00% โโโโโโโโโโโโโโโโฎโญโโโโโโโโโโโโ memory 30.00 kB โโโโโโโโโโโโโฎโญโโโโโโ rx: 0.00 kb/s tx: 0.00 kb/s โโโโโโโฎ โญโโโโโโโโโโ ports โโโโโโโโโโโโฎ"
+"โ10.00%โ โข โโ100.00 kBโ โข โโ โโขโขโขโขโขโขโข โ โ ip private publicโ"
+"โ โ โขโข โโ โ โขโข โโ โ โขโข โ โ 8001 โ"
+"โ โ โข โข โโ โ โข โข โโ โ โขโข โ โ127.0.0.1 8003 8003โ"
+"โ โ โข โข โโ โ โข โข โโ0.00 kb/sโ โขโข โ โ โ"
+"โ โ โข โข โโ โ โข โข โโ โ โข โ โ โ"
+"โ โ โข โขโข โโ โ โข โขโข โโ0.00 kb/sโ โข โ โ โ"
+"โ โโขโข โข โโ โโขโข โขโข โโ โ โข โ โ โ"
+"โ โ โโ โ โโ โ โข โ โ โ"
+"โฐโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโฏโฐโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโฏโฐโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโฏ โฐโโโโโโโโโโโโโโโโโโโโโโโโโโโโโฏ"
diff --git a/src/ui/draw_blocks/snapshots/oxker__ui__draw_blocks__tests__draw_blocks_whole_layout_help_panel.snap b/src/ui/draw_blocks/snapshots/oxker__ui__draw_blocks__tests__draw_blocks_whole_layout_help_panel.snap
index a69c2d8..706c766 100644
--- a/src/ui/draw_blocks/snapshots/oxker__ui__draw_blocks__tests__draw_blocks_whole_layout_help_panel.snap
+++ b/src/ui/draw_blocks/snapshots/oxker__ui__draw_blocks__tests__draw_blocks_whole_layout_help_panel.snap
@@ -4,41 +4,41 @@ expression: setup.terminal.backend()
---
" name state status cpu memory/limit id image โ rx โ tx ( h ) exit help "
"โญ Containers 1/3 โโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโฎโญโโโโโโโโโโโโโโโฎ"
-"โโช container_1 โ running Up 1 hoโญ 0.00.000 โโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโฎ โโโถ pause โ" Hidden by multi-width symbols: [(2, " ")]
-"โ container_2 โ running Up 2 hoโ โ โโ restart โ"
-"โ container_3 โ running Up 3 hoโ 88 โ โโ stop โ"
-"โ โ 88 โ โโ delete โ"
-"โ โ 88 โ โโ โ"
-"โฐโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโ ,adPPYba, 8b, ,d8 88 ,d8 ,adPPYba, 8b,dPPYba, โโโโโโโโโโโโโโโโโโโโโโฏโฐโโโโโโโโโโโโโโโฏ"
-"โญ Logs 3/3 - container_1 - image_1 โโโ a8" "8a `Y8, ,8P' 88 ,a8" a8P_____88 88P' "Y8 โโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโฎ"
-"โ line 1 โ 8b d8 )888( 8888[ 8PP""""""" 88 โ โ"
-"โ line 2 โ "8a, ,a8" ,d8" "8b, 88`"Yba, "8b, ,aa 88 โ โ"
-"โโถ line 3 โ `"YbbdP"' 8P' `Y8 88 `Y8a `"Ybbd8"' 88 โ โ"
-"โ โ โ โ"
-"โ โ A simple tui to view & control docker containers โ โ"
-"โ โ โ โ"
-"โ โ ( tab ) or ( shift+tab ) change panels โ โ"
-"โ โ ( โ โ ) or ( j k ) or ( Home End ) scroll vertically โ โ"
-"โ โ ( โ โ ) horizontal scroll across logs โ โ"
-"โ โ ( ctrl ) increase scroll speed, used in conjunction scroll keys โ โ"
-"โ โ ( enter ) send docker container command โ โ"
-"โ โ ( e ) exec into a container โ โ"
-"โ โ ( f ) force clear the screen & redraw the gui โ โ"
-"โ โ ( h ) toggle this help information - or click heading โ โ"
-"โ โ ( s ) save logs to file โ โ"
-"โ โ ( m ) toggle mouse capture - if disabled, text on screen can be selected & copied โ โ"
-"โ โ ( F1 ) or ( / ) enter filter mode โ โ"
-"โ โ ( # ) enter log search mode โ โ"
-"โ โ ( 0 ) stop sort โ โ"
-"โ โ ( 1 - 9 ) sort by header - or click header โ โ"
-"โฐโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโ ( - = ) change log section height โโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโฏ"
-"โญโโโโโโโโโโโโโโโโโโโโโโโโโ cpu 03.00%โ ( \ ) toggle log section visibility โโโโโโโโฎโญโโโโโโโโโโ ports โโโโโโโโโโโโฎ"
-"โ10.00%โ โขโข โ ( esc ) close dialog โ โโ ip private publicโ"
-"โ โ โข โข โ ( q ) quit at any time โ โโ 8001 โ"
-"โ โ โขโข โข โ โ โโ127.0.0.1 8003 8003โ"
-"โ โ โข โข โ currently an early work in progress, all and any input appreciated โ โโ โ"
-"โ โ โขโข โข โข โ https://github.com/mrjackwills/oxker โ โโ โ"
-"โ โโข โขโข โ โ โโ โ"
-"โ โโข โข โฐโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโฏ โโ โ"
-"โ โ โโ โ โโ โ"
-"โฐโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโฏโฐโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโฏโฐโโโโโโโโโโโโโโโโโโโโโโโโโโโโโฏ"
+"โโช container_1 โ running Up 1 hour 03.00% 30.00 kB / 30.00 kB 1 image_1 0.00 kB 0.00 kB โโโถ pause โ" Hidden by multi-width symbols: [(2, " ")]
+"โ container_2 โ running Up 2 hour 00.00% 0.00 kB / 0.00 kB 2 image_2 0.00 kB 0.00 kB โโ restart โ"
+"โ container_3 โ running Up 3 hour 00.00% 0.00 kB / 0.00 kB 3 image_3 0.00 kB 0.00 kB โโ stop โ"
+"โ โโ delete โ"
+"โ โโ โ"
+"โฐโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโฏโฐโโโโโโโโโโโโโโโฏ"
+"โญ Logs 3/3 - container_โญ 0.00.000 โโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโฎโโโโโโโโโโโโโโโโโโโโโโโฎ"
+"โ line 1 โ 88 โ โ"
+"โ line 2 โ 88 โ โ"
+"โโถ line 3 โ ,adPPYba, 8b, ,d8 88 ,d8 ,adPPYba, 8b,dPPYb โ โ"
+"โ โ a8" "8a `Y8, ,8P' 88 ,a8" a8P_____88 88P' " โ โ"
+"โ โ 8b d8 )888( 8888( 8PP""""""" 88 โ โ"
+"โ โ "8a, ,a8" ,d8" "8b, 88`"Yba, "8b, ,aa 88 โ โ"
+"โ โ `"YbbdP"' 8P' `Y8 88 `Y8a `"Ybbd8"' 88 โ โ"
+"โ โ a work in progress, all and any input appreciated โ โ"
+"โ โ A simple tui to view & control docker containers https://github.com/mrjackwills/oxker โ โ"
+"โ โ โ โ"
+"โ โ Keymap โ โ"
+"โ โ q quit c Esc close dialog โ โ"
+"โ โ Down Up j k Home End scroll vertically Left Right scroll horizontally โ โ"
+"โ โ Control increase scroll speed Enter send docker command โ โ"
+"โ โ e exec into a container i container inspect mode โ โ"
+"โ โ / F1 filter mode # log search mode โ โ"
+"โ โ h toggle this panel f force clear screen and redraw โ โ"
+"โ โ - = change log section height \ toggle of section visibility โ โ"
+"โ โ 1 ~ 9 sort by header - or click header 0 stop sort โ โ"
+"โ โ Tab Back Tab change panel m toggle mouse capture - allows text selection โ โ"
+"โฐโโโโโโโโโโโโโโโโโโโโโโโ s save logs to file โโโโโโโโโโโโโโโโโโโโโโโโฏ"
+"โญโโโโโโโโโโโโโโ cpu 03.โ โโโโโ ports โโโโโโโโโโโโฎ"
+"โ10.00%โ โข โฐโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโฏ ip private publicโ"
+"โ โ โขโข โโ โ โขโข โโ โ โขโข โ โ 8001 โ"
+"โ โ โข โข โโ โ โข โข โโ โ โขโข โ โ127.0.0.1 8003 8003โ"
+"โ โ โข โข โโ โ โข โข โโ0.00 kb/sโ โขโข โ โ โ"
+"โ โ โข โข โโ โ โข โข โโ โ โข โ โ โ"
+"โ โ โข โขโข โโ โ โข โขโข โโ0.00 kb/sโ โข โ โ โ"
+"โ โโขโข โข โโ โโขโข โขโข โโ โ โข โ โ โ"
+"โ โ โโ โ โโ โ โข โ โ โ"
+"โฐโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโฏโฐโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโฏโฐโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโฏ โฐโโโโโโโโโโโโโโโโโโโโโโโโโโโโโฏ"
diff --git a/src/ui/draw_blocks/snapshots/oxker__ui__draw_blocks__tests__draw_blocks_whole_layout_info_box.snap b/src/ui/draw_blocks/snapshots/oxker__ui__draw_blocks__tests__draw_blocks_whole_layout_info_box.snap
index a9abbf8..b12a958 100644
--- a/src/ui/draw_blocks/snapshots/oxker__ui__draw_blocks__tests__draw_blocks_whole_layout_info_box.snap
+++ b/src/ui/draw_blocks/snapshots/oxker__ui__draw_blocks__tests__draw_blocks_whole_layout_info_box.snap
@@ -32,13 +32,13 @@ expression: setup.terminal.backend()
"โ โ"
"โ โ"
"โฐโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโฏ"
-"โญโโโโโโโโโโโโโโโโโโโโโโโโโ cpu 03.00% โโโโโโโโโโโโโโโโโโโโโโโโโโโฎโญโโโโโโโโโโโโโโโโโโโโโโโ memory 30.00 kB โโโโโโโโโโโโโโโโโโโโโโโโฎโญโโโโโโโโโโ ports โโโโโโโโโโโโฎ"
-"โ10.00%โ โขโข โโ100.00 kBโ โขโข โโ ip private publicโ"
-"โ โ โข โข โโ โ โขโข โโ 8001 โ"
-"โ โ โขโข โข โโ โ โขโข โข โโ127.0.0.1 8003 8003โ"
-"โ โ โข โข โโ โ โข โข โโ โ"
-"โ โ โขโข โข โข โโ โ โขโข โข โข โโ โ"
-"โ โโข โขโข โโ โโข โขโข โโ "
-"โ โโข โข โโ โโข โข โโ This is a test "
-"โ โ โโ โ โโ "
-"โฐโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโฏโฐโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโฏโฐโโโโโโโ "
+"โญโโโโโโโโโโโโโโ cpu 03.00% โโโโโโโโโโโโโโโโฎโญโโโโโโโโโโโโ memory 30.00 kB โโโโโโโโโโโโโฎโญโโโโโโ rx: 0.00 kb/s tx: 0.00 kb/s โโโโโโโฎ โญโโโโโโโโโโ ports โโโโโโโโโโโโฎ"
+"โ10.00%โ โข โโ100.00 kBโ โข โโ โโขโขโขโขโขโขโข โ โ ip private publicโ"
+"โ โ โขโข โโ โ โขโข โโ โ โขโข โ โ 8001 โ"
+"โ โ โข โข โโ โ โข โข โโ โ โขโข โ โ127.0.0.1 8003 8003โ"
+"โ โ โข โข โโ โ โข โข โโ0.00 kb/sโ โขโข โ โ โ"
+"โ โ โข โข โโ โ โข โข โโ โ โข โ โ โ"
+"โ โ โข โขโข โโ โ โข โขโข โโ0.00 kb/sโ โข โ โ "
+"โ โโขโข โข โโ โโขโข โขโข โโ โ โข โ โ This is a test "
+"โ โ โโ โ โโ โ โข โ โ "
+"โฐโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโฏโฐโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโฏโฐโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโฏ โฐโโโโโโโ "
diff --git a/src/ui/draw_blocks/snapshots/oxker__ui__draw_blocks__tests__draw_blocks_whole_layout_long_name.snap b/src/ui/draw_blocks/snapshots/oxker__ui__draw_blocks__tests__draw_blocks_whole_layout_long_name.snap
index e0a34fb..e7b9019 100644
--- a/src/ui/draw_blocks/snapshots/oxker__ui__draw_blocks__tests__draw_blocks_whole_layout_long_name.snap
+++ b/src/ui/draw_blocks/snapshots/oxker__ui__draw_blocks__tests__draw_blocks_whole_layout_long_name.snap
@@ -25,10 +25,10 @@ expression: setup.terminal.backend()
"โ โ"
"โ โ"
"โฐโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโฏ"
-"โญโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโ cpu 03.00% โโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโฎโญโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโ memory 30.00 kB โโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโฎโญโโโโโโโโโโ ports โโโโโโโโโโโโฎ"
-"โ10.00%โ โขโขโข โโ100.00 kBโ โขโขโขโข โโ ip private publicโ"
-"โ โ โขโขโข โข โโ โ โขโข โข โโ 8001 โ"
-"โ โ โขโขโข โข โข โโ โ โขโขโข โข โข โโ127.0.0.1 8003 8003โ"
-"โ โโขโข โขโขโข โโ โโขโข โขโข โโ โ"
-"โ โ โโ โ โโ โ"
-"โฐโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโฏโฐโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโฏโฐโโโโโโโโโโโโโโโโโโโโโโโโโโโโโฏ"
+"โญโโโโโโโโโโโโโโโโโโโ cpu 03.00% โโโโโโโโโโโโโโโโโโโโโฎโญโโโโโโโโโโโโโโโโโ memory 30.00 kB โโโโโโโโโโโโโโโโโโฎโญโโโโโโโโโโ rx: 0.00 kb/s tx: 0.00 kb/s โโโโโโโโโโโโฎ โญโโโโโโโโโโ ports โโโโโโโโโโโโฎ"
+"โ10.00%โ โข โโ100.00 kBโ โขโข โโ โโขโขโขโขโขโข โข โ โ ip private publicโ"
+"โ โ โขโขโข โโ โ โขโขโข โโ โ โข โข โ โ 8001 โ"
+"โ โ โขโขโข โข โโ โ โขโข โข โโ0.00 kb/sโ โข โข โ โ127.0.0.1 8003 8003โ"
+"โ โ โข โขโขโข โโ โ โข โขโข โโ0.00 kb/sโ โข โ โ โ"
+"โ โโข โข โโ โโข โข โโ โ โข โ โ โ"
+"โฐโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโฏโฐโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโฏโฐโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโฏ โฐโโโโโโโโโโโโโโโโโโโโโโโโโโโโโฏ"
diff --git a/src/ui/draw_blocks/snapshots/oxker__ui__draw_blocks__tests__draw_blocks_whole_layout_no_logs.snap b/src/ui/draw_blocks/snapshots/oxker__ui__draw_blocks__tests__draw_blocks_whole_layout_no_logs.snap
index fd83747..e0131b5 100644
--- a/src/ui/draw_blocks/snapshots/oxker__ui__draw_blocks__tests__draw_blocks_whole_layout_no_logs.snap
+++ b/src/ui/draw_blocks/snapshots/oxker__ui__draw_blocks__tests__draw_blocks_whole_layout_no_logs.snap
@@ -25,10 +25,10 @@ expression: setup.terminal.backend()
"โ โโ โ"
"โ โโ โ"
"โฐโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโฏโฐโโโโโโโโโโโโโโโฏ"
-"โญโโโโโโโโโโโโโโโโโโโโโโโโโ cpu 03.00% โโโโโโโโโโโโโโโโโโโโโโโโโโโฎโญโโโโโโโโโโโโโโโโโโโโโโโ memory 30.00 kB โโโโโโโโโโโโโโโโโโโโโโโโฎโญโโโโโโโโโโ ports โโโโโโโโโโโโฎ"
-"โ10.00%โ โขโขโข โโ100.00 kBโ โขโข โโ ip private publicโ"
-"โ โ โขโข โข โโ โ โขโข โข โโ 8001 โ"
-"โ โ โขโขโข โข โข โโ โ โขโขโข โข โข โโ127.0.0.1 8003 8003โ"
-"โ โโข โขโข โโ โโข โขโข โโ โ"
-"โ โ โโ โ โโ โ"
-"โฐโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโฏโฐโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโฏโฐโโโโโโโโโโโโโโโโโโโโโโโโโโโโโฏ"
+"โญโโโโโโโโโโโโโโ cpu 03.00% โโโโโโโโโโโโโโโโฎโญโโโโโโโโโโโโ memory 30.00 kB โโโโโโโโโโโโโฎโญโโโโโโ rx: 0.00 kb/s tx: 0.00 kb/s โโโโโโโฎ โญโโโโโโโโโโ ports โโโโโโโโโโโโฎ"
+"โ10.00%โ โขโข โโ100.00 kBโ โขโข โโ โโขโขโขโขโขโขโข โ โ ip private publicโ"
+"โ โ โขโขโข โโ โ โขโขโข โโ โ โขโข โ โ 8001 โ"
+"โ โ โขโข โข โโ โ โขโข โข โโ0.00 kb/sโ โขโข โ โ127.0.0.1 8003 8003โ"
+"โ โ โข โขโข โโ โ โข โขโข โโ0.00 kb/sโ โข โ โ โ"
+"โ โโข โข โโ โโข โข โโ โ โข โ โ โ"
+"โฐโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโฏโฐโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโฏโฐโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโฏ โฐโโโโโโโโโโโโโโโโโโโโโโโโโโโโโฏ"
diff --git a/src/ui/draw_blocks/snapshots/oxker__ui__draw_blocks__tests__draw_blocks_whole_layout_short_height_logs.snap b/src/ui/draw_blocks/snapshots/oxker__ui__draw_blocks__tests__draw_blocks_whole_layout_short_height_logs.snap
index 046a12e..06bb20f 100644
--- a/src/ui/draw_blocks/snapshots/oxker__ui__draw_blocks__tests__draw_blocks_whole_layout_short_height_logs.snap
+++ b/src/ui/draw_blocks/snapshots/oxker__ui__draw_blocks__tests__draw_blocks_whole_layout_short_height_logs.snap
@@ -25,10 +25,10 @@ expression: setup.terminal.backend()
"โ line 2 โ"
"โโถ line 3 โ"
"โฐโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโฏ"
-"โญโโโโโโโโโโโโโโโโโโโโโโโโโ cpu 03.00% โโโโโโโโโโโโโโโโโโโโโโโโโโโฎโญโโโโโโโโโโโโโโโโโโโโโโโ memory 30.00 kB โโโโโโโโโโโโโโโโโโโโโโโโฎโญโโโโโโโโโโ ports โโโโโโโโโโโโฎ"
-"โ10.00%โ โขโขโข โโ100.00 kBโ โขโข โโ ip private publicโ"
-"โ โ โขโข โข โโ โ โขโข โข โโ 8001 โ"
-"โ โ โขโขโข โข โข โโ โ โขโขโข โข โข โโ127.0.0.1 8003 8003โ"
-"โ โโข โขโข โโ โโข โขโข โโ โ"
-"โ โ โโ โ โโ โ"
-"โฐโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโฏโฐโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโฏโฐโโโโโโโโโโโโโโโโโโโโโโโโโโโโโฏ"
+"โญโโโโโโโโโโโโโโ cpu 03.00% โโโโโโโโโโโโโโโโฎโญโโโโโโโโโโโโ memory 30.00 kB โโโโโโโโโโโโโฎโญโโโโโโ rx: 0.00 kb/s tx: 0.00 kb/s โโโโโโโฎ โญโโโโโโโโโโ ports โโโโโโโโโโโโฎ"
+"โ10.00%โ โขโข โโ100.00 kBโ โขโข โโ โโขโขโขโขโขโขโข โ โ ip private publicโ"
+"โ โ โขโขโข โโ โ โขโขโข โโ โ โขโข โ โ 8001 โ"
+"โ โ โขโข โข โโ โ โขโข โข โโ0.00 kb/sโ โขโข โ โ127.0.0.1 8003 8003โ"
+"โ โ โข โขโข โโ โ โข โขโข โโ0.00 kb/sโ โข โ โ โ"
+"โ โโข โข โโ โโข โข โโ โ โข โ โ โ"
+"โฐโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโฏโฐโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโฏโฐโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโฏ โฐโโโโโโโโโโโโโโโโโโโโโโโโโโโโโฏ"
diff --git a/src/ui/draw_blocks/snapshots/oxker__ui__draw_blocks__tests__draw_blocks_whole_layout_with_filter_bar.snap b/src/ui/draw_blocks/snapshots/oxker__ui__draw_blocks__tests__draw_blocks_whole_layout_with_filter_bar.snap
index 4a576be..d3a3751 100644
--- a/src/ui/draw_blocks/snapshots/oxker__ui__draw_blocks__tests__draw_blocks_whole_layout_with_filter_bar.snap
+++ b/src/ui/draw_blocks/snapshots/oxker__ui__draw_blocks__tests__draw_blocks_whole_layout_with_filter_bar.snap
@@ -24,11 +24,11 @@ expression: setup.terminal.backend()
"โ โ"
"โ โ"
"โฐโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโฏ"
-"โญโโโโโโโโโโโโโโโโโโโโโโโโโ cpu 03.00% โโโโโโโโโโโโโโโโโโโโโโโโโโโฎโญโโโโโโโโโโโโโโโโโโโโโโโ memory 30.00 kB โโโโโโโโโโโโโโโโโโโโโโโโฎโญโโโโโโโโโโ ports โโโโโโโโโโโโฎ"
-"โ10.00%โ โขโขโข โโ100.00 kBโ โขโข โโ ip private publicโ"
-"โ โ โขโข โข โโ โ โขโข โข โโ 8001 โ"
-"โ โ โขโขโข โข โข โโ โ โขโขโข โข โข โโ โ"
-"โ โโข โขโข โโ โโข โขโข โโ โ"
-"โ โ โโ โ โโ โ"
-"โฐโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโฏโฐโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโฏโฐโโโโโโโโโโโโโโโโโโโโโโโโโโโโโฏ"
+"โญโโโโโโโโโโโโโโ cpu 03.00% โโโโโโโโโโโโโโโโฎโญโโโโโโโโโโโโ memory 30.00 kB โโโโโโโโโโโโโฎโญโโโโโโ rx: 0.00 kb/s tx: 0.00 kb/s โโโโโโโฎ โญโโโโโโโโโโ ports โโโโโโโโโโโโฎ"
+"โ10.00%โ โขโข โโ100.00 kBโ โขโข โโ โโขโขโขโขโขโขโข โ โ ip private publicโ"
+"โ โ โขโขโข โโ โ โขโขโข โโ โ โขโข โ โ 8001 โ"
+"โ โ โขโข โข โโ โ โขโข โข โโ0.00 kb/sโ โขโข โ โ โ"
+"โ โ โข โขโข โโ โ โข โขโข โโ0.00 kb/sโ โข โ โ โ"
+"โ โโข โข โโ โโข โข โโ โ โข โ โ โ"
+"โฐโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโฏโฐโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโฏโฐโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโฏ โฐโโโโโโโโโโโโโโโโโโโโโโโโโโโโโฏ"
" Esc clear โ by โ Name Image Status All filter term: r_1 "
diff --git a/src/ui/gui_state.rs b/src/ui/gui_state.rs
index 9b598c4..46ad5f1 100644
--- a/src/ui/gui_state.rs
+++ b/src/ui/gui_state.rs
@@ -9,7 +9,7 @@ use tokio::task::JoinHandle;
use uuid::Uuid;
use crate::{
- app_data::{AppData, ContainerId, Header},
+ app_data::{AppData, ContainerId, Header, ScrollDirection},
exec::ExecMode,
};
@@ -160,19 +160,26 @@ const FRAMES_LEN: u8 = 9;
/// The application gui state can be in multiple of these four states at the same time
/// Various functions (e.g input handler), operate differently depending upon current Status
-#[derive(Debug, Clone, Copy, Hash, PartialEq, Eq)]
+#[derive(Debug, Clone, Hash, PartialEq, Eq)]
pub enum Status {
DeleteConfirm,
- DockerConnect,
+ DockerConnect(Option),
Error,
Exec,
Filter,
Help,
Init,
+ Inspect,
Logs,
SearchLogs,
}
+#[derive(Debug, Default, Copy, Clone, Hash, PartialEq, Eq)]
+pub struct ScrollOffset {
+ pub x: usize,
+ pub y: usize,
+}
+
/// Global gui_state, stored in an Arc
#[derive(Debug)]
pub struct GuiState {
@@ -190,6 +197,8 @@ pub struct GuiState {
selected_panel: SelectablePanel,
screen_width: u16,
show_logs: bool,
+ inspect_offset: ScrollOffset,
+ inspect_offset_max: ScrollOffset,
status: HashSet,
pub info_box_text: Option<(String, Instant)>,
}
@@ -203,6 +212,8 @@ impl GuiState {
intersect_heading: HashMap::new(),
intersect_help: None,
intersect_panel: HashMap::new(),
+ inspect_offset: ScrollOffset::default(),
+ inspect_offset_max: ScrollOffset::default(),
loading_handle: None,
loading_index: 0,
loading_set: HashSet::new(),
@@ -235,6 +246,50 @@ impl GuiState {
}
}
+ pub fn set_inspect_offset(&mut self, sd: &ScrollDirection) {
+ match sd {
+ ScrollDirection::Up => self.inspect_offset.y = self.inspect_offset.y.saturating_sub(1),
+ ScrollDirection::Down => {
+ self.inspect_offset.y = self
+ .inspect_offset
+ .y
+ .saturating_add(1)
+ .min(self.inspect_offset_max.y)
+ }
+ ScrollDirection::Left => {
+ self.inspect_offset.x = self.inspect_offset.x.saturating_sub(1)
+ }
+ ScrollDirection::Right => {
+ self.inspect_offset.x = self
+ .inspect_offset
+ .x
+ .saturating_add(1)
+ .min(self.inspect_offset_max.x)
+ }
+ }
+ self.rerender.update_draw();
+ }
+
+ pub fn get_inspect_offset(&self) -> ScrollOffset {
+ self.inspect_offset
+ }
+
+ pub fn set_inspect_offset_max(&mut self, offset: ScrollOffset) {
+ self.inspect_offset_max = offset
+ }
+
+ pub fn set_inspect_offset_y_to_max(&mut self) {
+ self.inspect_offset.y = self.inspect_offset_max.y;
+ self.rerender.update_draw();
+ }
+
+ pub fn clear_inspect_offset(&mut self) {
+ self.inspect_offset.x = 0;
+ self.inspect_offset.y = 0;
+ self.inspect_offset_max = ScrollOffset::default();
+ self.rerender.update_draw();
+ }
+
/// Set the screen width, used for offset char calculations
pub const fn set_screen_width(&mut self, width: u16) {
self.screen_width = width;
diff --git a/src/ui/mod.rs b/src/ui/mod.rs
index bb7a458..096191c 100644
--- a/src/ui/mod.rs
+++ b/src/ui/mod.rs
@@ -30,12 +30,11 @@ pub use self::color_match::*;
pub use self::gui_state::{DeleteButton, GuiState, SelectablePanel, Status};
use crate::{
app_data::{
- AppData, Columns, ContainerId, ContainerPorts, CpuTuple, FilterBy, Header, LogSearch,
- MemTuple, SortedOrder, State,
+ AppData, ChartsData, Columns, ContainerId, ContainerPorts, FilterBy, Header, LogSearch,
+ SortedOrder, State,
},
app_error::AppError,
config::{AppColors, Keymap},
- exec::TerminalSize,
input_handler::InputMessages,
};
@@ -132,12 +131,12 @@ impl Ui {
}
/// Draw the the error message ui, for 5 seconds, with a countdown
- fn err_loop(&mut self) -> Result<(), AppError> {
+ async fn err_loop(&mut self, host: Option) -> Result<(), AppError> {
let mut seconds = 5;
let colors = self.app_data.lock().config.app_colors;
let keymap = self.app_data.lock().config.keymap.clone();
let mut redraw = true;
- loop {
+ while self.is_running.load(Ordering::SeqCst) {
if self.now.elapsed() >= std::time::Duration::from_secs(1) {
seconds -= 1;
self.now = Instant::now();
@@ -155,6 +154,7 @@ impl Ui {
colors,
&AppError::DockerConnect,
f,
+ host.clone(),
&keymap,
Some(seconds),
);
@@ -163,8 +163,18 @@ impl Ui {
{
return Err(AppError::Terminal);
}
+ if crossterm::event::poll(POLL_RATE).unwrap_or(false)
+ && let Ok(event) = event::read()
+ && let Event::Key(key) = event
+ && key.kind == event::KeyEventKind::Press
+ {
+ self.input_tx
+ .send(InputMessages::ButtonPress((key.code, key.modifiers)))
+ .await
+ .ok();
+ }
redraw = false;
- std::thread::sleep(POLL_RATE);
+ // std::thread::sleep(POLL_RATE);
}
Ok(())
}
@@ -183,7 +193,8 @@ impl Ui {
if let Some(mode) = exec_mode {
self.reset_terminal().ok();
self.terminal.clear().ok();
- if let Err(e) = mode.run(TerminalSize::new(&self.terminal)).await {
+
+ if let Err(e) = mode.run(self.terminal.size().ok()).await {
self.app_data
.lock()
.set_error(e, &self.gui_state, Status::Error);
@@ -237,32 +248,32 @@ impl Ui {
}
}
- if crossterm::event::poll(POLL_RATE).unwrap_or(false) {
- if let Ok(event) = event::read() {
- if let Event::Key(key) = event {
- if key.kind == event::KeyEventKind::Press {
+ if crossterm::event::poll(POLL_RATE).unwrap_or(false)
+ && let Ok(event) = event::read()
+ {
+ if let Event::Key(key) = event {
+ if key.kind == event::KeyEventKind::Press {
+ self.input_tx
+ .send(InputMessages::ButtonPress((key.code, key.modifiers)))
+ .await
+ .ok();
+ }
+ } else if let Event::Mouse(m) = event {
+ match m.kind {
+ event::MouseEventKind::Down(_)
+ | event::MouseEventKind::ScrollDown
+ | event::MouseEventKind::ScrollUp => {
self.input_tx
- .send(InputMessages::ButtonPress((key.code, key.modifiers)))
+ .send(InputMessages::MouseEvent((m, m.modifiers)))
.await
.ok();
}
- } else if let Event::Mouse(m) = event {
- match m.kind {
- event::MouseEventKind::Down(_)
- | event::MouseEventKind::ScrollDown
- | event::MouseEventKind::ScrollUp => {
- self.input_tx
- .send(InputMessages::MouseEvent((m, m.modifiers)))
- .await
- .ok();
- }
- _ => (),
- }
- } else if let Event::Resize(width, _) = event {
- self.gui_state.lock().clear_area_map();
- self.terminal.autoresize().ok();
- self.gui_state.lock().set_screen_width(width);
+ _ => (),
}
+ } else if let Event::Resize(width, _) = event {
+ self.gui_state.lock().clear_area_map();
+ self.terminal.autoresize().ok();
+ self.gui_state.lock().set_screen_width(width);
}
}
self.check_clear();
@@ -273,8 +284,11 @@ impl Ui {
/// Draw either the Error, or main oxker ui, to the terminal
async fn draw_ui(&mut self) -> Result<(), AppError> {
let status = self.gui_state.lock().get_status();
- if status.contains(&Status::DockerConnect) {
- self.err_loop()?;
+ if let Some(Status::DockerConnect(msg)) = status
+ .iter()
+ .find(|s| matches!(s, Status::DockerConnect(_)))
+ {
+ self.err_loop(msg.clone()).await?;
} else {
self.gui_loop().await?;
}
@@ -287,7 +301,7 @@ impl Ui {
#[derive(Debug, Clone)]
#[allow(clippy::struct_excessive_bools)]
pub struct FrameData {
- chart_data: Option<(CpuTuple, MemTuple)>,
+ chart_data: Option,
color_logs: bool,
columns: Columns,
container_title: String,
@@ -355,114 +369,122 @@ fn draw_frame(
let contains_filter = fd.status.contains(&Status::Filter);
let contains_search_logs = fd.status.contains(&Status::SearchLogs);
- let whole_layout = Layout::default()
- .direction(Direction::Vertical)
- .constraints(if contains_filter || contains_search_logs {
- vec![Constraint::Max(1), Constraint::Min(1), Constraint::Max(1)]
- } else {
- vec![Constraint::Max(1), Constraint::Min(1)]
- })
- .split(f.area());
+ let contains_inspect = fd.status.contains(&Status::Inspect);
- draw_blocks::headers::draw(whole_layout[0], colors, f, fd, gui_state, keymap);
+ let inspect_data = app_data.lock().get_inspect_data();
+ if contains_inspect && let Some(inspect_data) = inspect_data {
+ draw_blocks::inspect::draw(f, colors, inspect_data, gui_state, keymap);
+ } else {
+ let whole_layout = Layout::default()
+ .direction(Direction::Vertical)
+ .constraints(if contains_filter || contains_search_logs {
+ vec![Constraint::Max(1), Constraint::Min(1), Constraint::Max(1)]
+ } else {
+ vec![Constraint::Max(1), Constraint::Min(1)]
+ })
+ .split(f.area());
- if let Some(rect) = whole_layout.get(2) {
- if contains_filter {
- draw_blocks::filter::draw(*rect, colors, f, fd);
- } else {
- draw_blocks::search_logs::draw(*rect, colors, f, fd, keymap);
+ draw_blocks::headers::draw(whole_layout[0], colors, f, fd, gui_state, keymap);
+
+ if let Some(rect) = whole_layout.get(2) {
+ if contains_filter {
+ draw_blocks::filter::draw(*rect, colors, f, fd);
+ } else {
+ draw_blocks::search_logs::draw(*rect, colors, f, fd, keymap);
+ }
}
- }
- let upper_main = Layout::default()
- .direction(Direction::Vertical)
- .constraints(if fd.has_containers {
- vec![Constraint::Percentage(75), Constraint::Percentage(25)]
- } else {
- vec![Constraint::Percentage(100), Constraint::Percentage(0)]
- })
- .split(whole_layout[1]);
+ let upper_main = Layout::default()
+ .direction(Direction::Vertical)
+ .constraints(if fd.has_containers {
+ vec![Constraint::Percentage(75), Constraint::Percentage(25)]
+ } else {
+ vec![Constraint::Percentage(100), Constraint::Percentage(0)]
+ })
+ .split(whole_layout[1]);
- let containers_logs_section = Layout::default()
- .direction(Direction::Vertical)
- .constraints(if fd.show_logs {
- vec![Constraint::Min(6), Constraint::Percentage(fd.log_height)]
- } else {
- vec![Constraint::Percentage(100)]
- })
- .split(upper_main[0]);
+ let containers_logs_section = Layout::default()
+ .direction(Direction::Vertical)
+ .constraints(if fd.show_logs {
+ vec![Constraint::Min(6), Constraint::Percentage(fd.log_height)]
+ } else {
+ vec![Constraint::Percentage(100)]
+ })
+ .split(upper_main[0]);
- // Containers + docker commands
- let containers_commands = Layout::default()
- .direction(Direction::Horizontal)
- .constraints(if fd.has_containers {
- vec![Constraint::Percentage(90), Constraint::Percentage(10)]
- } else {
- vec![Constraint::Percentage(100)]
- })
- .split(containers_logs_section[0]);
-
- draw_blocks::containers::draw(app_data, containers_commands[0], colors, f, fd, gui_state);
-
- if fd.show_logs {
- draw_blocks::logs::draw(
- app_data,
- containers_logs_section[1],
- colors,
- f,
- fd,
- gui_state,
- );
- }
-
- if let Some(id) = fd.delete_confirm.as_ref() {
- app_data.lock().get_container_name_by_id(id).map_or_else(
- || {
- // If a container is deleted outside of oxker but whilst the Delete Confirm dialog is open, it can get caught in kind of a dead lock situation
- // so if in that unique situation, just clear the delete_container id
- gui_state.lock().set_delete_container(None);
- },
- |name| {
- draw_blocks::delete_confirm::draw(colors, f, gui_state, keymap, name);
- },
- );
- }
-
- // only draw commands + charts if there are containers
- if let Some(rect) = containers_commands.get(1) {
- draw_blocks::commands::draw(app_data, *rect, colors, f, fd, gui_state);
-
- // Can calculate the max string length here, and then use that to keep the ports section as small as possible (+4 for some padding + border)
- let ports_len =
- u16::try_from(fd.port_max_lens.0 + fd.port_max_lens.1 + fd.port_max_lens.2 + 2)
- .unwrap_or(26);
-
- let lower = Layout::default()
+ // Containers + docker commands
+ let containers_commands = Layout::default()
.direction(Direction::Horizontal)
- .constraints([Constraint::Min(1), Constraint::Max(ports_len)])
- .split(upper_main[1]);
+ .constraints(if fd.has_containers {
+ vec![Constraint::Percentage(90), Constraint::Percentage(10)]
+ } else {
+ vec![Constraint::Percentage(100)]
+ })
+ .split(containers_logs_section[0]);
- draw_blocks::charts::draw(lower[0], colors, f, fd);
- draw_blocks::ports::draw(lower[1], colors, f, fd);
+ draw_blocks::containers::draw(app_data, containers_commands[0], colors, f, fd, gui_state);
+
+ if fd.show_logs {
+ draw_blocks::logs::draw(
+ app_data,
+ containers_logs_section[1],
+ colors,
+ f,
+ fd,
+ gui_state,
+ );
+ }
+
+ if let Some(id) = fd.delete_confirm.as_ref() {
+ app_data.lock().get_container_name_by_id(id).map_or_else(
+ || {
+ // If a container is deleted outside of oxker but whilst the Delete Confirm dialog is open, it can get caught in kind of a dead lock situation
+ // so if in that unique situation, just clear the delete_container id
+ gui_state.lock().set_delete_container(None);
+ },
+ |name| {
+ draw_blocks::delete_confirm::draw(colors, f, gui_state, keymap, name);
+ },
+ );
+ }
+
+ // only draw commands + charts if there are containers
+ if let Some(rect) = containers_commands.get(1) {
+ draw_blocks::commands::draw(app_data, *rect, colors, f, fd, gui_state);
+
+ // Can calculate the max string length here, and then use that to keep the ports section as small as possible (+4 for some padding + border)
+ let ports_len =
+ u16::try_from(fd.port_max_lens.0 + fd.port_max_lens.1 + fd.port_max_lens.2 + 2)
+ .unwrap_or(26);
+
+ let lower = Layout::default()
+ .direction(Direction::Horizontal)
+ .constraints([Constraint::Min(1), Constraint::Max(ports_len)])
+ .split(upper_main[1]);
+
+ let charts_rect = Layout::default()
+ .direction(Direction::Horizontal)
+ .constraints([Constraint::Percentage(66), Constraint::Percentage(33)])
+ .split(lower[0]);
+
+ draw_blocks::chart_cpu_mem::draw(charts_rect[0], colors, f, fd);
+ draw_blocks::chart_bandwidth::draw(charts_rect[1], colors, f, fd);
+
+ draw_blocks::ports::draw(lower[1], colors, f, fd);
+ }
+
+ // Check if error, and show popup if so
+ if fd.status.contains(&Status::Help) {
+ let config = app_data.lock().config.clone();
+ draw_blocks::help::draw(&config, f);
+ }
}
if let Some((text, instant)) = fd.info_text.as_ref() {
draw_blocks::info::draw(colors, f, gui_state, instant, text.to_owned());
}
- // Check if error, and show popup if so
- if fd.status.contains(&Status::Help) {
- let tz = app_data.lock().config.timezone.clone();
- draw_blocks::help::draw(
- colors,
- f,
- keymap,
- app_data.lock().config.show_timestamp,
- tz.as_ref(),
- );
- }
-
if let Some(error) = fd.has_error.as_ref() {
- draw_blocks::error::draw(colors, error, f, keymap, None);
+ draw_blocks::error::draw(colors, error, f, None, keymap, None);
}
}
+