Skip to content

Commit

Permalink
feat: align memory columns correctly, closes #20
Browse files Browse the repository at this point in the history 
use kB as minimum bytestats unit, screenshot updated
  • Loading branch information
@mrjackwills
mrjackwills committed Jan 14, 2023
1 parent 0350293 commit bd7dfcd
Show file tree
Hide file tree
Showing 5 changed files with 47 additions and 66 deletions.
Binary file modified .github/screenshot_01.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
23 changes: 11 additions & 12 deletions src/app_data/container_state.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -343,8 +343,7 @@ impl fmt::Display for ByteStats {
let p = match as_f64 {
x if x >= ONE_GB => format!("{y:.2} GB", y = as_f64 / ONE_GB),
x if x >= ONE_MB => format!("{y:.2} MB", y = as_f64 / ONE_MB),
x if x >= ONE_KB => format!("{y:.2} kB", y = as_f64 / ONE_KB),
_ => format!("{} B", self.0),
_ => format!("{y:.2} kB", y = as_f64 / ONE_KB),
};
write!(f, "{p:>x$}", x = f.width().unwrap_or(1))
}
Expand Down Expand Up @@ -463,15 +462,15 @@ impl ContainerItem {
/// Container information panel headings + widths, for nice pretty formatting
#[derive(Debug, Clone, Copy)]
pub struct Columns {
pub state: (Header, usize),
pub status: (Header, usize),
pub cpu: (Header, usize),
pub mem: (Header, usize),
pub id: (Header, usize),
pub name: (Header, usize),
pub image: (Header, usize),
pub net_rx: (Header, usize),
pub net_tx: (Header, usize),
pub state: (Header, u8),
pub status: (Header, u8),
pub cpu: (Header, u8),
pub mem: (Header, u8, u8),
pub id: (Header, u8),
pub name: (Header, u8),
pub image: (Header, u8),
pub net_rx: (Header, u8),
pub net_tx: (Header, u8),
}

impl Columns {
Expand All @@ -482,7 +481,7 @@ impl Columns {
status: (Header::Status, 16),
// 7 to allow for "100.00%"
cpu: (Header::Cpu, 7),
mem: (Header::Memory, 12),
mem: (Header::Memory, 6, 6),
id: (Header::Id, 8),
name: (Header::Name, 4),
image: (Header::Image, 5),
Expand Down
16 changes: 8 additions & 8 deletions src/app_data/mod.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -364,7 +364,7 @@ impl AppData {
/// So can display nicely and evenly
pub fn get_width(&self) -> Columns {
let mut output = Columns::new();
let count = |x: &String| x.chars().count();
let count = |x: &String| u8::try_from(x.chars().count()).unwrap_or(12);

// Should probably find a refactor here somewhere
for container in &self.containers.items {
Expand All @@ -375,27 +375,27 @@ impl AppData {
.unwrap_or(&CpuStats::default())
.to_string(),
);
let mem_count = count(&format!(
"{} / {}",
container.mem_stats.back().unwrap_or(&ByteStats::default()),
container.mem_limit
));

let rx_count = count(&container.rx.to_string());
let tx_count = count(&container.tx.to_string());
let image_count = count(&container.image);
let name_count = count(&container.name);
let state_count = count(&container.state.to_string());
let status_count = count(&container.status);
let mem_current_count = count(&container.mem_stats.back().unwrap_or(&ByteStats::default()).to_string());
let mem_limit_count= count(&container.mem_limit.to_string());

if cpu_count > output.cpu.1 {
output.cpu.1 = cpu_count;
};
if image_count > output.image.1 {
output.image.1 = image_count;
};
if mem_count > output.mem.1 {
output.mem.1 = mem_count;
if mem_current_count > output.mem.1 {
output.mem.1 = mem_current_count;
};
if mem_limit_count > output.mem.2 {
output.mem.2 = mem_limit_count;
};
if name_count > output.name.1 {
output.name.1 = name_count;
Expand Down
42 changes: 12 additions & 30 deletions src/main.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -40,61 +40,43 @@ async fn main() {
let app_data = Arc::new(Mutex::new(AppData::default(args)));
let gui_state = Arc::new(Mutex::new(GuiState::default()));
let is_running = Arc::new(AtomicBool::new(true));

let docker_app_data = Arc::clone(&app_data);
let docker_gui_state = Arc::clone(&gui_state);

let (docker_sx, docker_rx) = tokio::sync::mpsc::channel(16);
let (input_sx, input_rx) = tokio::sync::mpsc::channel(16);

// Create docker daemon handler, and only spawn up the docker data handler if ping returns non-error
if let Ok(docker) = Docker::connect_with_socket_defaults() {
if docker.ping().await.is_ok() {
let docker = Arc::new(docker);
let app_data = Arc::clone(&app_data);
let gui_state = Arc::clone(&gui_state);
let is_running = Arc::clone(&is_running);
tokio::spawn(DockerData::init(
docker_app_data,
docker,
docker_gui_state,
docker_rx,
is_running,
app_data, docker, gui_state, docker_rx, is_running,
));
} else {
app_data.lock().set_error(AppError::DockerConnect);
docker_gui_state.lock().status_push(Status::DockerConnect);
gui_state.lock().status_push(Status::DockerConnect);
}
} else {
app_data.lock().set_error(AppError::DockerConnect);
docker_gui_state.lock().status_push(Status::DockerConnect);
gui_state.lock().status_push(Status::DockerConnect);
}
let input_app_data = Arc::clone(&app_data);

let (input_sx, input_rx) = tokio::sync::mpsc::channel(16);

let input_is_running = Arc::clone(&is_running);
let input_app_data = Arc::clone(&app_data);
let input_gui_state = Arc::clone(&gui_state);
let input_docker_sender = docker_sx.clone();

let input_is_running = Arc::clone(&is_running);
// Spawn input handling into own tokio thread
tokio::spawn(input_handler::InputHandler::init(
input_app_data,
input_rx,
input_docker_sender,
docker_sx.clone(),
input_gui_state,
input_is_running,
));

if args.gui {
let update_duration = std::time::Duration::from_millis(u64::from(args.docker_interval));
create_ui(
app_data,
input_sx,
is_running,
gui_state,
docker_sx,
update_duration,
)
.await
.unwrap_or(());
create_ui(app_data, input_sx, is_running, gui_state, docker_sx)
.await
.unwrap_or(());
} else {
// Debug mode for testing, mostly pointless, doesn't take terminal nor draw gui
// TODO this needs to be improved to display something actually useful
Expand Down
32 changes: 16 additions & 16 deletions src/ui/draw_blocks.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -136,57 +136,57 @@ pub fn containers<B: Backend>(
let state_style = Style::default().fg(i.state.get_color());
let blue = Style::default().fg(Color::Blue);

let mems = format!(
"{:>1} / {:>1}",
i.mem_stats.back().unwrap_or(&ByteStats::default()),
i.mem_limit
);
// let mems = format!(
// "{:>1} / {:>1}",
// i.mem_stats.back().unwrap_or(&ByteStats::default()),
// i.mem_limit
// );

let lines = Spans::from(vec![
Span::styled(
format!("{:<width$}", i.state.to_string(), width = widths.state.1),
format!("{:<width$}", i.state.to_string(), width = widths.state.1.into()),
state_style,
),
Span::styled(
format!("{MARGIN}{:>width$}", i.status, width = &widths.status.1),
format!("{MARGIN}{:>width$}", i.status, width = &widths.status.1.into()),
state_style,
),
Span::styled(
format!(
"{}{:>width$}",
MARGIN,
i.cpu_stats.back().unwrap_or(&CpuStats::default()),
width = &widths.cpu.1
width = &widths.cpu.1.into()
),
state_style,
),
Span::styled(
format!("{MARGIN}{mems:>width$}", width = &widths.mem.1),
format!("{MARGIN}{:>width_current$} / {:>width_limit$}", i.mem_stats.back().unwrap_or(&ByteStats::default()), i.mem_limit, width_current = &widths.mem.1.into(), width_limit = &widths.mem.2.into()),
state_style,
),
Span::styled(
format!(
"{}{:>width$}",
MARGIN,
i.id.get().chars().take(8).collect::<String>(),
width = &widths.id.1
width = &widths.id.1.into()
),
blue,
),
Span::styled(
format!("{MARGIN}{:>width$}", i.name, width = widths.name.1),
format!("{MARGIN}{:>width$}", i.name, width = widths.name.1.into()),
blue,
),
Span::styled(
format!("{MARGIN}{:>width$}", i.image, width = widths.image.1),
format!("{MARGIN}{:>width$}", i.image, width = widths.image.1.into()),
blue,
),
Span::styled(
format!("{MARGIN}{:>width$}", i.rx, width = widths.net_rx.1),
format!("{MARGIN}{:>width$}", i.rx, width = widths.net_rx.1.into()),
Style::default().fg(Color::Rgb(255, 233, 193)),
),
Span::styled(
format!("{MARGIN}{:>width$}", i.tx, width = widths.net_tx.1),
format!("{MARGIN}{:>width$}", i.tx, width = widths.net_tx.1.into()),
Style::default().fg(Color::Rgb(205, 140, 140)),
),
]);
Expand Down Expand Up @@ -415,7 +415,7 @@ pub fn heading_bar<B: Backend>(
(Header::State, columns.state.1),
(Header::Status, columns.status.1),
(Header::Cpu, columns.cpu.1),
(Header::Memory, columns.mem.1),
(Header::Memory, columns.mem.1 + columns.mem.2 + 3),
(Header::Id, columns.id.1),
(Header::Name, columns.name.1),
(Header::Image, columns.image.1),
Expand All @@ -426,7 +426,7 @@ pub fn heading_bar<B: Backend>(
let header_data = header_meta
.iter()
.map(|i| {
let header_block = gen_header(&i.0, i.1);
let header_block = gen_header(&i.0, i.1.into());
(header_block.0, i.0, Constraint::Max(header_block.1))
})
.collect::<Vec<_>>();
Expand Down

0 comments on commit bd7dfcd

Please sign in to comment.