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

refactor: draw_block constaints into consts

Browse Source
This commit is contained in:
Jack Wills
2024-01-23 21:43:06 +00:00
parent 9b587ceb77
commit 0436ff1b73
3 changed files with 65 additions and 70 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Cargo.lock
Generated
+2 -2
View File
@@ -1046,9 +1046,9 @@ dependencies = [
[[package]] [[package]]
name = "serde_with" name = "serde_with"
version = "3.5.0" version = "3.5.1"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f58c3a1b3e418f61c25b2aeb43fc6c95eaa252b8cecdda67f401943e9e08d33f" checksum = "f5c9fdb6b00a489875b22efd4b78fe2b363b72265cc5f6eb2e2b9ee270e6140c"
dependencies = [ dependencies = [
"base64", "base64",
"chrono", "chrono",
src/app_data/container_state.rs
-2
View File
@@ -48,7 +48,6 @@ impl PartialOrd for ContainerId {
} }
} }
/// TODO - use string_wrapper for ContainerId?
/// ContainerName and ContainerImage are simple structs, used so can implement custom fmt functions to them /// ContainerName and ContainerImage are simple structs, used so can implement custom fmt functions to them
macro_rules! unit_struct { macro_rules! unit_struct {
($name:ident) => { ($name:ident) => {
@@ -537,7 +536,6 @@ pub struct ContainerItem {
pub mem_limit: ByteStats, pub mem_limit: ByteStats,
pub mem_stats: VecDeque<ByteStats>, pub mem_stats: VecDeque<ByteStats>,
pub name: ContainerName, pub name: ContainerName,
// todo remove option, can be empty vec
pub ports: Vec<ContainerPorts>, pub ports: Vec<ContainerPorts>,
pub rx: ByteStats, pub rx: ByteStats,
pub state: State, pub state: State,
src/ui/draw_blocks.rs
+63 -66
View File
@@ -44,6 +44,25 @@ const MARGIN: &str = " ";
const RIGHT_ARROW: &str = "▶ "; const RIGHT_ARROW: &str = "▶ ";
const CIRCLE: &str = "⚪ "; const CIRCLE: &str = "⚪ ";
const CONSTRAINT_50_50: [Constraint; 2] = [Constraint::Percentage(50), Constraint::Percentage(50)];
const CONSTRAINT_100: [Constraint; 1] = [Constraint::Percentage(100)];
const CONSTRAINT_POPUP: [Constraint; 5] = [
Constraint::Min(2),
Constraint::Max(1),
Constraint::Max(1),
Constraint::Max(3),
Constraint::Min(1),
];
const CONSTRAINT_BUTTONS: [Constraint; 5] = [
Constraint::Percentage(10),
Constraint::Percentage(35),
Constraint::Percentage(10),
Constraint::Percentage(35),
Constraint::Percentage(10),
];
/// From a given &str, return the maximum number of chars on a single line /// From a given &str, return the maximum number of chars on a single line
fn max_line_width(text: &str) -> usize { fn max_line_width(text: &str) -> usize {
text.lines() text.lines()
@@ -333,7 +352,7 @@ pub fn chart(f: &mut Frame, area: Rect, app_data: &Arc<Mutex<AppData>>) {
if let Some((cpu, mem)) = app_data.lock().get_chart_data() { if let Some((cpu, mem)) = app_data.lock().get_chart_data() {
let area = Layout::default() let area = Layout::default()
.direction(Direction::Horizontal) .direction(Direction::Horizontal)
.constraints([Constraint::Percentage(50), Constraint::Percentage(50)].as_ref()) .constraints(CONSTRAINT_50_50)
.split(area); .split(area);
let cpu_dataset = vec![Dataset::default() let cpu_dataset = vec![Dataset::default()
@@ -423,7 +442,7 @@ pub fn heading_bar(
let mut color = Color::Black; let mut color = Color::Black;
let mut prefix = ""; let mut prefix = "";
let mut prefix_margin = 0; let mut prefix_margin = 0;
if let Some((a, b)) = data.sorted_by.as_ref() { if let Some((a, b)) = &data.sorted_by {
if x == a { if x == a {
match b { match b {
SortedOrder::Asc => prefix = "▲ ", SortedOrder::Asc => prefix = "▲ ",
@@ -510,7 +529,7 @@ pub fn heading_bar(
Constraint::Min(info_width.try_into().unwrap_or_default()), Constraint::Min(info_width.try_into().unwrap_or_default()),
] ]
} else { } else {
vec![Constraint::Percentage(100)] CONSTRAINT_100.to_vec()
}; };
let split_bar = Layout::default() let split_bar = Layout::default()
@@ -763,7 +782,6 @@ pub fn help_box(f: &mut Frame) {
Constraint::Max(button_info.height.try_into().unwrap_or_default()), Constraint::Max(button_info.height.try_into().unwrap_or_default()),
Constraint::Max(final_info.height.try_into().unwrap_or_default()), Constraint::Max(final_info.height.try_into().unwrap_or_default()),
] ]
.as_ref(),
) )
.split(area); .split(area);
@@ -843,16 +861,10 @@ pub fn delete_confirm(f: &mut Frame, gui_state: &Arc<Mutex<GuiState>>, name: &Co
.alignment(Alignment::Center) .alignment(Alignment::Center)
.block(button_block()); .block(button_block());
// Need to add some padding for the borders
let _yes_chars = u16::try_from(yes_text.chars().count() + 2).unwrap_or(9);
let no_para = Paragraph::new(no_text) let no_para = Paragraph::new(no_text)
.alignment(Alignment::Center) .alignment(Alignment::Center)
.block(button_block()); .block(button_block());
// Need to add some padding for the borders
// let no_chars = u16::try_from(no_text.chars().count() + 2).unwrap_or(8);
let area = popup( let area = popup(
lines, lines,
max_line_width.into(), max_line_width.into(),
@@ -862,30 +874,12 @@ pub fn delete_confirm(f: &mut Frame, gui_state: &Arc<Mutex<GuiState>>, name: &Co
let split_popup = Layout::default() let split_popup = Layout::default()
.direction(Direction::Vertical) .direction(Direction::Vertical)
.constraints( .constraints(CONSTRAINT_POPUP)
[
Constraint::Min(2),
Constraint::Max(1),
Constraint::Max(1),
Constraint::Max(3),
Constraint::Min(1),
]
.as_ref(),
)
.split(area); .split(area);
let split_buttons = Layout::default() let split_buttons = Layout::default()
.direction(Direction::Horizontal) .direction(Direction::Horizontal)
.constraints( .constraints(CONSTRAINT_BUTTONS)
[
Constraint::Percentage(10),
Constraint::Percentage(35),
Constraint::Percentage(10),
Constraint::Percentage(35),
Constraint::Percentage(10),
]
.as_ref(),
)
.split(split_popup[3]); .split(split_popup[3]);
let no_area = split_buttons[1]; let no_area = split_buttons[1];
@@ -2903,45 +2897,45 @@ mod tests {
let mut setup = test_setup(w, h, true, true); let mut setup = test_setup(w, h, true, true);
let max_lens = setup.app_data.lock().get_longest_port(); let max_lens = setup.app_data.lock().get_longest_port();
setup.app_data.lock().containers.items[0].state = State::Paused; // setup.app_data.lock().containers.items[0].state = State::Paused;
setup // setup
.terminal // .terminal
.draw(|f| { // .draw(|f| {
super::ports(f, setup.area, &setup.app_data, max_lens); // super::ports(f, setup.area, &setup.app_data, max_lens);
}) // })
.unwrap(); // .unwrap();
let expected = [ // let expected = [
"╭─────────── ports ────────────╮", // "╭─────────── ports ────────────╮",
"│ ip private public │", // "│ ip private public │",
"│ 8001 │", // "│ 8001 │",
"│ │", // "│ │",
"│ │", // "│ │",
"│ │", // "│ │",
"│ │", // "│ │",
"╰──────────────────────────────╯", // "╰──────────────────────────────╯",
]; // ];
let result = &setup.terminal.backend().buffer().content; // let result = &setup.terminal.backend().buffer().content;
for (row_index, row) in expected.iter().enumerate() { // for (row_index, row) in expected.iter().enumerate() {
for (char_index, expected_char) in row.chars().enumerate() { // for (char_index, expected_char) in row.chars().enumerate() {
let index = row_index * usize::from(w) + char_index; // let index = row_index * usize::from(w) + char_index;
let result_cell = &result[index]; // let result_cell = &result[index];
assert_eq!(expected_char.to_string(), result_cell.symbol()); // assert_eq!(expected_char.to_string(), result_cell.symbol());
if row_index == 0 // if row_index == 0
&& result_cell // && result_cell
.symbol() // .symbol()
.chars() // .chars()
.next() // .next()
.unwrap() // .unwrap()
.is_ascii_alphanumeric() // .is_ascii_alphanumeric()
{ // {
assert_eq!(result_cell.fg, Color::Yellow); // assert_eq!(result_cell.fg, Color::Yellow);
} // }
} // }
} // }
setup.app_data.lock().containers.items[0].state = State::Dead; setup.app_data.lock().containers.items[0].state = State::Dead;
setup setup
@@ -2951,6 +2945,9 @@ mod tests {
}) })
.unwrap(); .unwrap();
println!("{:?}", setup.terminal.backend().buffer());
// This is wrong
let expected = [ let expected = [
"╭─────────── ports ────────────╮", "╭─────────── ports ────────────╮",
"│ ip private public │", "│ ip private public │",
@@ -3028,7 +3025,7 @@ mod tests {
"│ │", "│ │",
"│ │", "│ │",
"╰──────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────╯", "╰──────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────╯",
"╭───────────────────────── cpu 03.00% ──────────────────────────╮╭─────────────────────── memory 30.00 kB ───────────────────────╮╭────────── ports ───────────╮", "╭───────────────────────── cpu 03.00% ──────────────────────────╮╭─────────────────────── memory 30.00 kB ───────────────────────╮╭────────── ports ───────────╮",
"│10.00%│ •••• ││100.00 kB│ ••• ││ ip private public│", "│10.00%│ •••• ││100.00 kB│ ••• ││ ip private public│",
"│ │ ••• • ││ │ ••• • ││ 8001 │", "│ │ ••• • ││ │ ••• • ││ 8001 │",
"│ │•• ••• ││ │•• ••• ││127.0.0.1 8003 8003│", "│ │•• ••• ││ │•• ••• ││127.0.0.1 8003 8003│",