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

feat: place image name in logs panel title

Browse Source
This commit is contained in:
Jack Wills
2024-08-01 19:24:42 +00:00
parent 7a517db9f7
commit 12f24357a6
3 changed files with 41 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.github/screenshot_01.png
BIN
View File
Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 41 KiB

After

Width:  |  Height:  |  Size: 41 KiB

src/app_data/mod.rs
+22 -22
View File
@@ -590,8 +590,8 @@ impl AppData {
/// Logs related methods /// Logs related methods
/// Get the title for log panel for selected container, will be either /// Get the title for log panel for selected container, will be either
/// 1) "logs x/x - container_name" where container_name is 32 chars max /// 1) "logs x/x - container_name - container_image"
/// 2) "logs - container_name" when no logs found, again 32 chars max /// 2) "logs - container_name - container_image" when no logs found
/// 3) "" no container currently selected - aka no containers on system /// 3) "" no container currently selected - aka no containers on system
pub fn get_log_title(&self) -> String { pub fn get_log_title(&self) -> String {
self.get_selected_container() self.get_selected_container()
@@ -602,7 +602,7 @@ impl AppData {
} else { } else {
format!("{logs_len} ") format!("{logs_len} ")
}; };
format!("{}- {}", prefix, ci.name.get()) format!("{}- {} - {}", prefix, ci.name.get(), ci.image.get())
}) })
} }
@@ -1824,18 +1824,18 @@ mod tests {
// No logs // No logs
app_data.containers.start(); app_data.containers.start();
let result = app_data.get_log_title(); let result = app_data.get_log_title();
assert_eq!(result, " - container_1"); assert_eq!(result, " - container_1 - image_1");
// On last line of logs // On last line of logs
let logs = (1..=3).map(|i| format!("{i}")).collect::<Vec<_>>(); let logs = (1..=3).map(|i| format!("{i}")).collect::<Vec<_>>();
app_data.update_log_by_id(logs, &ids[0]); app_data.update_log_by_id(logs, &ids[0]);
let result = app_data.get_log_title(); let result = app_data.get_log_title();
assert_eq!(result, " 3/3 - container_1"); assert_eq!(result, " 3/3 - container_1 - image_1");
// Change log state to no longer be at the end // Change log state to no longer be at the end
app_data.log_previous(); app_data.log_previous();
let result = app_data.get_log_title(); let result = app_data.get_log_title();
assert_eq!(result, " 2/3 - container_1"); assert_eq!(result, " 2/3 - container_1 - image_1");
} }
#[test] #[test]
@@ -1851,23 +1851,23 @@ mod tests {
app_data.containers_start(); app_data.containers_start();
let result = app_data.get_log_title(); let result = app_data.get_log_title();
assert_eq!(result, " - container_1"); assert_eq!(result, " - container_1 - image_1");
// change container // change container
app_data.containers_next(); app_data.containers_next();
let result = app_data.get_log_title(); let result = app_data.get_log_title();
assert_eq!(result, " - container_2"); assert_eq!(result, " - container_2 - image_2");
// On last line of logs // On last line of logs
let logs = (1..=3).map(|i| format!("{i}")).collect::<Vec<_>>(); let logs = (1..=3).map(|i| format!("{i}")).collect::<Vec<_>>();
app_data.update_log_by_id(logs, &ids[1]); app_data.update_log_by_id(logs, &ids[1]);
let result = app_data.get_log_title(); let result = app_data.get_log_title();
assert_eq!(result, " 3/3 - container_2"); assert_eq!(result, " 3/3 - container_2 - image_2");
// Change log state to no longer be at the end // Change log state to no longer be at the end
app_data.log_previous(); app_data.log_previous();
let result = app_data.get_log_title(); let result = app_data.get_log_title();
assert_eq!(result, " 2/3 - container_2"); assert_eq!(result, " 2/3 - container_2 - image_2" );
} }
#[test] #[test]
@@ -1895,7 +1895,7 @@ mod tests {
assert_eq!(result.len(), 3); assert_eq!(result.len(), 3);
let result = app_data.get_log_title(); let result = app_data.get_log_title();
assert_eq!(result, " 3/3 - container_1"); assert_eq!(result, " 3/3 - container_1 - image_1");
} }
#[test] #[test]
@@ -1915,7 +1915,7 @@ mod tests {
assert_eq!(result.unwrap().offset(), 0); assert_eq!(result.unwrap().offset(), 0);
let result = app_data.get_log_title(); let result = app_data.get_log_title();
assert_eq!(result, " 1/3 - container_1"); assert_eq!(result, " 1/3 - container_1 - image_1");
} }
#[test] #[test]
@@ -1935,7 +1935,7 @@ mod tests {
assert_eq!(result.unwrap().offset(), 0); assert_eq!(result.unwrap().offset(), 0);
let result = app_data.get_log_title(); let result = app_data.get_log_title();
assert_eq!(result, " 1/3 - container_1"); assert_eq!(result, " 1/3 - container_1 - image_1");
app_data.log_end(); app_data.log_end();
let result = app_data.get_log_state(); let result = app_data.get_log_state();
@@ -1944,7 +1944,7 @@ mod tests {
assert_eq!(result.unwrap().offset(), 0); assert_eq!(result.unwrap().offset(), 0);
let result = app_data.get_log_title(); let result = app_data.get_log_title();
assert_eq!(result, " 3/3 - container_1"); assert_eq!(result, " 3/3 - container_1 - image_1");
} }
#[test] #[test]
@@ -1965,7 +1965,7 @@ mod tests {
assert_eq!(result.unwrap().offset(), 0); assert_eq!(result.unwrap().offset(), 0);
let result = app_data.get_log_title(); let result = app_data.get_log_title();
assert_eq!(result, " 1/3 - container_1"); assert_eq!(result, " 1/3 - container_1 - image_1");
app_data.log_next(); app_data.log_next();
@@ -1975,7 +1975,7 @@ mod tests {
assert_eq!(result.unwrap().offset(), 0); assert_eq!(result.unwrap().offset(), 0);
let result = app_data.get_log_title(); let result = app_data.get_log_title();
assert_eq!(result, " 2/3 - container_1"); assert_eq!(result, " 2/3 - container_1 - image_1");
app_data.log_next(); app_data.log_next();
let result = app_data.get_log_state(); let result = app_data.get_log_state();
@@ -1984,7 +1984,7 @@ mod tests {
assert_eq!(result.unwrap().offset(), 0); assert_eq!(result.unwrap().offset(), 0);
let result = app_data.get_log_title(); let result = app_data.get_log_title();
assert_eq!(result, " 3/3 - container_1"); assert_eq!(result, " 3/3 - container_1 - image_1");
app_data.log_next(); app_data.log_next();
let result = app_data.get_log_state(); let result = app_data.get_log_state();
@@ -1993,7 +1993,7 @@ mod tests {
assert_eq!(result.unwrap().offset(), 0); assert_eq!(result.unwrap().offset(), 0);
let result = app_data.get_log_title(); let result = app_data.get_log_title();
assert_eq!(result, " 3/3 - container_1"); assert_eq!(result, " 3/3 - container_1 - image_1");
} }
#[test] #[test]
@@ -2014,7 +2014,7 @@ mod tests {
assert_eq!(result.unwrap().offset(), 0); assert_eq!(result.unwrap().offset(), 0);
let result = app_data.get_log_title(); let result = app_data.get_log_title();
assert_eq!(result, " 3/3 - container_1"); assert_eq!(result, " 3/3 - container_1 - image_1");
app_data.log_previous(); app_data.log_previous();
@@ -2023,7 +2023,7 @@ mod tests {
assert_eq!(result.as_ref().unwrap().selected(), Some(1)); assert_eq!(result.as_ref().unwrap().selected(), Some(1));
assert_eq!(result.unwrap().offset(), 0); assert_eq!(result.unwrap().offset(), 0);
let result = app_data.get_log_title(); let result = app_data.get_log_title();
assert_eq!(result, " 2/3 - container_1"); assert_eq!(result, " 2/3 - container_1 - image_1");
app_data.log_previous(); app_data.log_previous();
let result = app_data.get_log_state(); let result = app_data.get_log_state();
@@ -2031,7 +2031,7 @@ mod tests {
assert_eq!(result.as_ref().unwrap().selected(), Some(0)); assert_eq!(result.as_ref().unwrap().selected(), Some(0));
assert_eq!(result.unwrap().offset(), 0); assert_eq!(result.unwrap().offset(), 0);
let result = app_data.get_log_title(); let result = app_data.get_log_title();
assert_eq!(result, " 1/3 - container_1"); assert_eq!(result, " 1/3 - container_1 - image_1");
app_data.log_previous(); app_data.log_previous();
let result = app_data.get_log_state(); let result = app_data.get_log_state();
@@ -2039,7 +2039,7 @@ mod tests {
assert_eq!(result.as_ref().unwrap().selected(), Some(0)); assert_eq!(result.as_ref().unwrap().selected(), Some(0));
assert_eq!(result.unwrap().offset(), 0); assert_eq!(result.unwrap().offset(), 0);
let result = app_data.get_log_title(); let result = app_data.get_log_title();
assert_eq!(result, " 1/3 - container_1"); assert_eq!(result, " 1/3 - container_1 - image_1");
} }
// ********** // // ********** //
src/ui/draw_blocks.rs
+19 -19
View File
@@ -1934,18 +1934,18 @@ mod tests {
#[test] #[test]
/// Parsing logs, spinner visible, and then animates by one frame /// Parsing logs, spinner visible, and then animates by one frame
fn test_draw_blocks_logs_parsing() { fn test_draw_blocks_logs_parsing() {
let (w, h) = (25, 6); let (w, h) = (32, 6);
let mut setup = test_setup(w, h, true, true); let mut setup = test_setup(w, h, true, true);
let uuid = Uuid::new_v4(); let uuid = Uuid::new_v4();
setup.gui_state.lock().next_loading(uuid); setup.gui_state.lock().next_loading(uuid);
let expected = [ let expected = [
"╭ Logs - container_1 ───╮", "╭ Logs - container_1 - image_1 ╮",
"│ parsing logs ⠙ │", "│ parsing logs ⠙ │",
"│ │", "│ │",
"│ │", "│ │",
"│ │", "│ │",
"╰───────────────────────╯", "╰──────────────────────────────╯",
]; ];
let mut fd = FrameData::from((setup.app_data.lock(), setup.gui_state.lock())); let mut fd = FrameData::from((setup.app_data.lock(), setup.gui_state.lock()));
@@ -1969,13 +1969,13 @@ mod tests {
// animation moved by one frame // animation moved by one frame
setup.gui_state.lock().next_loading(uuid); setup.gui_state.lock().next_loading(uuid);
let expected = [ let expected = [
"╭ Logs - container_1 ───╮", "╭ Logs - container_1 - image_1 ╮",
"│ parsing logs ⠹ │", "│ parsing logs ⠹ │",
"│ │", "│ │",
"│ │", "│ │",
"│ │", "│ │",
"╰───────────────────────╯", "╰──────────────────────────────╯",
]; ];
let mut fd = FrameData::from((setup.app_data.lock(), setup.gui_state.lock())); let mut fd = FrameData::from((setup.app_data.lock(), setup.gui_state.lock()));
@@ -2081,7 +2081,7 @@ mod tests {
insert_logs(&setup); insert_logs(&setup);
let expected = [ let expected = [
"╭ Logs 3/3 - a_long_container_name_for_the_purposes_of_this_test ──────────────╮", "╭ Logs 3/3 - a_long_container_name_for_the_purposes_of_this_test - a_long_image╮",
"│ line 1 │", "│ line 1 │",
"│ line 2 │", "│ line 2 │",
"│▶ line 3 │", "│▶ line 3 │",
@@ -3333,7 +3333,7 @@ mod tests {
"│ ││ │", "│ ││ │",
"│ ││ │", "│ ││ │",
"╰──────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────╯╰──────────────╯", "╰──────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────╯╰──────────────╯",
"╭ Logs 3/3 - container_1 ──────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────╮", "╭ Logs 3/3 - container_1 - image_1 ────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────╮",
"│ line 1 │", "│ line 1 │",
"│ line 2 │", "│ line 2 │",
"│▶ line 3 │", "│▶ line 3 │",
@@ -3397,7 +3397,7 @@ mod tests {
"│ ││ │", "│ ││ │",
"│ ││ │", "│ ││ │",
"╰──────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────╯╰──────────────╯", "╰──────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────╯╰──────────────╯",
"╭ Logs 3/3 - container_1 ──────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────╮", "╭ Logs 3/3 - container_1 - image_1 ────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────╮",
"│ line 1 │", "│ line 1 │",
"│ line 2 │", "│ line 2 │",
"│▶ line 3 │", "│▶ line 3 │",
@@ -3449,7 +3449,7 @@ mod tests {
"│ ││ stop │", "│ ││ stop │",
"│ ││ delete │", "│ ││ delete │",
"╰──────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────╯╰──────────────╯", "╰──────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────╯╰──────────────╯",
"╭ Logs 3/3 - container_1 ──────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────╮", "╭ Logs 3/3 - container_1 - image_1 ────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────╮",
"│ line 1 │", "│ line 1 │",
"│ line 2 │", "│ line 2 │",
"│▶ line 3 │", "│▶ line 3 │",
@@ -3519,7 +3519,7 @@ mod tests {
"│ ││ │", "│ ││ │",
"│ ││ │", "│ ││ │",
"╰─────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────╯╰─────────────────╯", "╰─────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────╯╰─────────────────╯",
"╭ Logs 3/3 - a_long_container_name_for_the_purposes_of_this_test ────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────╮", "╭ Logs 3/3 - a_long_container_name_for_the_purposes_of_this_test - a_long_image_name_for_the_purposes_of_this_test ──────────────────────────────────────────────────────────────────────────╮",
"│ line 1 │", "│ line 1 │",
"│ line 2 │", "│ line 2 │",
"│▶ line 3 │", "│▶ line 3 │",