Merge pull request #111 from fioletoven/feature/init-containers

fioletoven · web-flow · commit a36e5c097bc7 · 2026-02-10T22:19:09.000+01:00
Add init containers to combined logs
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,6 +1,6 @@
 # Change Log
 
-## WIP
+## 0.4.1 - 2026-02-10
 
 ### Features
 
@@ -9,7 +9,7 @@
 ### Bug fixes
 
 - do not wait on CRDs for OOB resources
-- fix double click select behaviour
+- fix double click behaviour for word select
 
 ### Compatibility
 
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -10,7 +10,7 @@ members = [
 ]
 
 [workspace.package]
-version = "0.4.0"
+version = "0.4.1"
 edition = "2024"
 rust-version = "1.88"
 license = "MIT"
diff --git a/README.md b/README.md
@@ -34,15 +34,14 @@ The following features are currently supported:
 - View a list of Kubernetes resources.
 - Create, read, update and delete Kubernetes resources.
 - View events for the highlighted resource.
-- View logs for the highlighted container.
+- View logs for the highlighted pod or container.
 - Open a shell session in the highlighted container.
 - Enable port forwarding for the highlighted container.
 
 ### Planned
 
 The following features are planned for future development:
 
-- View combined logs for all containers in a pod.
 - Describe Kubernetes resources.
 
 ## Default Key Bindings
@@ -59,6 +58,7 @@ The following features are planned for future development:
 | Go back to namespaces; clear filter       | `ESC`           | Also clears input in the filter widget                      |
 | Navigate to the involved object           | `i`             | Works only for `events` kind                                |
 | Open / switch to the edit mode            | `i`             | Press `Esc` to exit, then `Esc` for save dialog             |
+| Open right mouse button menu              | `m`             | Navigate using `↑` or `↓`                                   |
 | Quit the application                      | `CTRL` + `c`    |                                                             |
 | Reverse selection                         | `CTRL` + ` `    | (`CTRL` + `SPACE`)                                          |
 | Select resource                           | ` `             | (`SPACE`)                                                   |
@@ -68,7 +68,7 @@ The following features are planned for future development:
 | Show events for the highlighted resource  | `e`             |                                                             |
 | Show filter / search input                | `/`             | Filter operators: and `&`, or `\|`, negation `!`, `(`, `)`  |
 | Show footer messages history pane         | `h`             | Also works left mouse button click on the footer            |
-| Show logs for the highlighted container   | `l`             | Press `p` to display previous logs for the container        |
+| Show logs for the pod or container        | `l`             | Press `p` to display previous logs                          |
 | Show namespaces selector                  | `←`             | To select `all` quickly press `←` again                     |
 | Show resources selector                   | `→`             | To select the first item quickly press `→` again            |
 | Show YAML for the highlighted resource    | `y`             |                                                             |
diff --git a/assets/themes/dark.yaml b/assets/themes/dark.yaml
@@ -50,11 +50,12 @@ colors:
     disconnected: white:light_red
     previous: text:no_bg
   footer:
-    text: fg_dark:black:bg_dark
+    text: fg_dark:#A4A6B8:bg_dark
     trail: blue:yellow:bg_dark
     info: light_green:bg_dark
     error: light_red:bg_dark
-    hint: fg_light:bg_light
+    details: fg_light:bg_light
+    hint: black:yellow:bg_dark
   filter: *filter
   search: *filter
   command_palette: *filter
diff --git a/assets/themes/light.yaml b/assets/themes/light.yaml
@@ -22,6 +22,7 @@ palette:
   light_cyan: LightCyan
   select_yellow: '#D9C49B'
   select_light: '#E9E9E9'
+  hint: '#A4A6B8'
 
 # style anchors
 filter: &filter
@@ -49,11 +50,12 @@ colors:
     disconnected: white:light_red
     previous: text_light:no_bg
   footer:
-    text: fg_dark:#A4A6B8:bg_dark
+    text: fg_dark:hint:bg_dark
     trail: light_blue:yellow:bg_dark
     info: light_green:bg_dark
     error: light_red:bg_dark
-    hint: fg_light:bg_light
+    details: fg_light:bg_light
+    hint: hint:yellow:bg_dark
   filter: *filter
   search: *filter
   command_palette: *filter
diff --git a/b4n-config/themes/theme.rs b/b4n-config/themes/theme.rs
@@ -46,6 +46,7 @@ pub struct FooterColors {
     pub trail: TextColors,
     pub info: TextColors,
     pub error: TextColors,
+    pub details: TextColors,
     pub hint: TextColors,
 }
 
@@ -56,7 +57,8 @@ impl Default for FooterColors {
             trail: TextColors::dim(Color::Blue, Color::Yellow, Color::DarkGray),
             info: TextColors::bg(Color::LightGreen, Color::DarkGray),
             error: TextColors::bg(Color::LightRed, Color::DarkGray),
-            hint: TextColors::bg(Color::DarkGray, Color::Gray),
+            details: TextColors::bg(Color::DarkGray, Color::Gray),
+            hint: TextColors::dim(Color::Black, Color::Yellow, Color::DarkGray),
         }
     }
 }
diff --git a/b4n-tui/utils.rs b/b4n-tui/utils.rs
@@ -1,10 +1,12 @@
 use anyhow::Result;
+use b4n_config::themes::TextColors;
 use crossterm::ExecutableCommand;
 use crossterm::cursor::SetCursorStyle;
 use crossterm::terminal::{LeaveAlternateScreen, disable_raw_mode};
 use ratatui_core::layout::{Constraint, Direction, Flex, Layout, Rect};
 use ratatui_core::style::{Color, Style};
 use ratatui_core::terminal::Frame;
+use ratatui_core::text::{Line, Span};
 use ratatui_widgets::block::Block;
 use ratatui_widgets::clear::Clear;
 use std::io::stdout;
@@ -58,6 +60,22 @@ pub fn get_proportional_width(area_width: u16, width: u16, use_proportion: bool)
     area_width.min(width).saturating_sub(2)
 }
 
+/// Gets [`Line`] from string slice colored using specified [`TextColors`].
+pub fn get_styled_line(line: &str, color: TextColors) -> Line<'_> {
+    Line::from(get_styled_spans(line, color))
+}
+
+/// Gets [`Span`]s from string slice colored using specified [`TextColors`].
+pub fn get_styled_spans(line: &str, color: TextColors) -> Vec<Span<'_>> {
+    line.split('␝')
+        .enumerate()
+        .map(|(idx, element)| {
+            let fg = if idx % 2 == 0 { color.fg } else { color.dim };
+            Span::styled(element, Style::default().fg(fg).bg(color.bg))
+        })
+        .collect::<Vec<_>>()
+}
+
 /// Sets panic hook that additionally leaves alternate screen mode on panic.
 pub fn init_panic_hook() {
     let original_hook = take_hook();
diff --git a/b4n-tui/widgets/footer.rs b/b4n-tui/widgets/footer.rs
@@ -10,10 +10,12 @@ use std::collections::VecDeque;
 use std::{rc::Rc, time::Instant};
 use tokio::sync::mpsc::{self, UnboundedReceiver};
 
+use crate::utils::{get_styled_line, get_styled_spans};
 use crate::widgets::history::{BottomPane, MessageItem};
 use crate::{ResponseEvent, Responsive, TuiEvent};
 
-const FOOTER_APP_VERSION: &str = concat!(" b4n v", env!("CARGO_PKG_VERSION"), " ");
+const FOOTER_APP_VERSION: &str = concat!(" b4n ␝v␝", env!("CARGO_PKG_VERSION"), " ");
+const FOOTER_APP_VERSION_LEN: usize = FOOTER_APP_VERSION.len() - 4;
 const MESSAGE_HISTORY_SIZE: usize = 20;
 
 /// Footer widget.
@@ -154,8 +156,8 @@ impl Footer {
             .split(area);
 
         if draw_hint && let Some(hint) = &self.hint {
-            let style = Style::new().fg(colors.footer.text.dim).bg(colors.footer.text.bg);
-            frame.render_widget(Paragraph::new(Line::styled(hint, style)), layout[1]);
+            let line = get_styled_line(hint, colors.footer.hint);
+            frame.render_widget(Paragraph::new(line), layout[1]);
         } else {
             frame.render_widget(Block::new().style(&colors.footer.text), layout[1]);
         }
@@ -174,7 +176,7 @@ impl Footer {
     fn get_hint_length(&self) -> u16 {
         self.hint
             .as_deref()
-            .map(|h| h.chars().count())
+            .map(|h| h.chars().filter(|ch| *ch != '␝').count())
             .and_then(|l| u16::try_from(l).ok())
             .unwrap_or_default()
     }
@@ -295,11 +297,11 @@ impl Footer {
         let width = usize::from(width);
         let mut rendered = 0;
         let mut spans = Vec::with_capacity(10);
-        let mut total = FOOTER_APP_VERSION.len();
+        let mut total = FOOTER_APP_VERSION_LEN;
 
         spans.push(Span::styled("", Style::new().fg(colors.footer.text.bg).bg(colors.text.bg)));
         spans.push(Span::styled(" ", &colors.footer.text));
-        spans.push(Span::styled(FOOTER_APP_VERSION, &colors.footer.text));
+        spans.extend(get_styled_spans(FOOTER_APP_VERSION, colors.footer.text));
 
         if self.show_trail && !self.trail.is_empty() {
             spans.push(Span::styled("  ", &colors.footer.text));
diff --git a/b4n-tui/widgets/history/bottom_pane.rs b/b4n-tui/widgets/history/bottom_pane.rs
@@ -69,11 +69,11 @@ impl BottomPane {
         self.area = layout[1].union(layout[2]);
 
         if show_hint {
-            let block = get_block(theme.colors.footer.hint.bg, theme.colors.text.bg);
+            let block = get_block(theme.colors.footer.details.bg, theme.colors.text.bg);
             let inner_area = block.inner(layout[1]).inner(Margin::new(1, 0));
             frame.render_widget(Clear, layout[1]);
             frame.render_widget(block, layout[1]);
-            frame.render_widget(Paragraph::new(hint_lines).fg(theme.colors.footer.hint.fg), inner_area);
+            frame.render_widget(Paragraph::new(hint_lines).fg(theme.colors.footer.details.fg), inner_area);
         }
 
         let block = get_block(theme.colors.footer.text.bg, theme.colors.text.bg);
diff --git a/b4n/core/app.rs b/b4n/core/app.rs
@@ -210,8 +210,8 @@ impl App {
             ResponseEvent::DeleteResources(policy, force, detach) => self.views_manager.delete_resources(policy, force, detach),
             ResponseEvent::NewYaml(resource, is_full) => self.request_yaml_template(resource, is_full),
             ResponseEvent::ViewYaml(resource, decode, edit) => self.request_yaml(resource, decode, edit),
-            ResponseEvent::ViewLogs(resource, containers) => self.views_manager.show_logs(resource, containers, false),
-            ResponseEvent::ViewPreviousLogs(resource, containers) => self.views_manager.show_logs(resource, containers, true),
+            ResponseEvent::ViewLogs(resource, containers) => self.views_manager.show_logs(&resource, containers, false),
+            ResponseEvent::ViewPreviousLogs(resource, containers) => self.views_manager.show_logs(&resource, containers, true),
             ResponseEvent::OpenShell(container) => self.views_manager.open_shell(container),
             ResponseEvent::ShowPortForwards => self.views_manager.show_port_forwards(),
             ResponseEvent::PortForward(resource, to, from, address) => self.port_forward(resource, to, from, &address),
diff --git a/b4n/core/managers/views.rs b/b4n/core/managers/views.rs
@@ -386,7 +386,7 @@ impl ViewsManager {
     }
 
     /// Shows logs for the specified container or multiple containers if `containers` are provided.
-    pub fn show_logs(&mut self, resource: ResourceRef, containers: Option<Vec<String>>, previous: bool) {
+    pub fn show_logs(&mut self, resource: &ResourceRef, containers: Option<Vec<String>>, previous: bool) {
         let worker = self.worker.borrow();
         let Some(client) = worker.kubernetes_client() else {
             return;
@@ -531,5 +531,5 @@ impl ViewsManager {
 
 fn set_command_palette_hint(footer_tx: &NotificationSink, app_data: &SharedAppData) {
     let command_palette_key = app_data.get_key_name(KeyCommand::CommandPaletteOpen).to_ascii_uppercase();
-    footer_tx.show_hint(format!(" Press {command_palette_key} to open command palette"));
+    footer_tx.show_hint(format!(" Press ␝{command_palette_key}␝ to open command palette"));
 }
diff --git a/b4n/kube/resources/data/pod.rs b/b4n/kube/resources/data/pod.rs
@@ -63,7 +63,7 @@ pub fn data(object: &DynamicObject, statistics: &Statistics) -> ResourceData {
         is_completed,
         is_ready: !is_terminating && is_ready,
         is_terminating,
-        tags: get_containers(&spec["containers"]),
+        tags: get_containers(&spec["containers"], &spec["initContainers"]),
     }
 }
 
@@ -117,6 +117,15 @@ pub fn update_statistics(items: IterMut<'_, Item<ResourceItem, ResourceFilterCon
     }
 }
 
+/// Returns `true` if this pod has one container.
+pub fn has_one_container(data: Option<&ResourceData>) -> bool {
+    if let Some(data) = data {
+        data.extra_values.len() > 1 && data.extra_values[1].raw_text().is_some_and(|t| t.ends_with("/1"))
+    } else {
+        false
+    }
+}
+
 fn get_restarts(containers: &[Value]) -> i64 {
     containers
         .iter()
@@ -145,8 +154,12 @@ fn get_first_waiting_reason(containers: &[Value]) -> Option<String> {
     None
 }
 
-fn get_containers(containers: &Value) -> Box<[String]> {
-    if let Some(names) = get_containers_names(containers) {
+fn get_containers(containers: &Value, init_containers: &Value) -> Box<[String]> {
+    if let Some(mut names) = get_containers_names(containers) {
+        if let Some(mut init) = get_containers_names(init_containers) {
+            names.append(&mut init);
+        }
+
         names.into_boxed_slice()
     } else {
         Box::default()
@@ -158,7 +171,7 @@ fn get_containers_names(containers: &Value) -> Option<Vec<String>> {
         containers
             .as_array()?
             .iter()
-            .flat_map(|i| i["name"].as_str())
+            .filter_map(|i| i["name"].as_str())
             .map(String::from)
             .collect(),
     )
diff --git a/b4n/ui/views/logs/content.rs b/b4n/ui/views/logs/content.rs
@@ -149,7 +149,7 @@ impl LogsContent {
             let idx = self.container_colors.get(container).copied().unwrap_or(0) % self.colors.containers.len().max(1);
             let container_colors = self.colors.containers.get(idx).unwrap_or(log_colors);
             result.push((container_colors.into(), container.to_owned()));
-            result.push((log_colors.into(), ": ".to_owned()));
+            result.push(((&self.colors.string).into(), ": ".to_owned()));
         }
 
         result.push((log_colors.into(), line.message.clone()));
diff --git a/b4n/ui/views/logs/line.rs b/b4n/ui/views/logs/line.rs
@@ -3,6 +3,7 @@ use std::fmt::{Display, Write};
 
 use crate::ui::presentation::ContentPosition;
 
+/// Represents one log line.
 pub struct LogLine {
     pub datetime: Timestamp,
     pub container: Option<String>,
@@ -73,7 +74,7 @@ impl LogLine {
     pub fn get_text(&self, prefix: Option<impl Display>, prefix_len: usize) -> String {
         let mut result = String::with_capacity(self.width() + if prefix.is_some() { prefix_len } else { 0 });
         if let Some(prefix) = prefix {
-            write!(result, "{}", prefix).unwrap();
+            write!(result, "{prefix}").unwrap();
         }
 
         if let Some(container) = &self.container {
diff --git a/b4n/ui/views/logs/view.rs b/b4n/ui/views/logs/view.rs
@@ -176,7 +176,7 @@ impl LogsView {
     }
 
     fn get_offset(&self) -> Option<Position> {
-        if self.logs.content().is_some_and(|c| c.show_timestamps()) {
+        if self.logs.content().is_some_and(LogsContent::show_timestamps) {
             Some(Position::new(TIMESTAMP_TEXT_LENGTH as u16, 0))
         } else {
             None
diff --git a/b4n/ui/views/resources/table.rs b/b4n/ui/views/resources/table.rs
diff --git a/b4n/ui/views/yaml/view.rs b/b4n/ui/views/yaml/view.rs

Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,7 @@ members = [`
`10`	`10`	`]`
`11`	`11`
`12`	`12`	`[workspace.package]`
`13`		`-version = "0.4.0"`
	`13`	`+version = "0.4.1"`
`14`	`14`	`edition = "2024"`
`15`	`15`	`rust-version = "1.88"`
`16`	`16`	`license = "MIT"`
Original file line number	Diff line number	Diff line change
`@@ -46,6 +46,7 @@ pub struct FooterColors {`
`46`	`46`	`pub trail: TextColors,`
`47`	`47`	`pub info: TextColors,`
`48`	`48`	`pub error: TextColors,`
	`49`	`+ pub details: TextColors,`
`49`	`50`	`pub hint: TextColors,`
`50`	`51`	`}`
`51`	`52`
`@@ -56,7 +57,8 @@ impl Default for FooterColors {`
`56`	`57`	`trail: TextColors::dim(Color::Blue, Color::Yellow, Color::DarkGray),`
`57`	`58`	`info: TextColors::bg(Color::LightGreen, Color::DarkGray),`
`58`	`59`	`error: TextColors::bg(Color::LightRed, Color::DarkGray),`
`59`		`- hint: TextColors::bg(Color::DarkGray, Color::Gray),`
	`60`	`+ details: TextColors::bg(Color::DarkGray, Color::Gray),`
	`61`	`+ hint: TextColors::dim(Color::Black, Color::Yellow, Color::DarkGray),`
`60`	`62`	`}`
`61`	`63`	`}`
`62`	`64`	`}`