Skip to content

Commit

Permalink
Don't crash if fail to read file.
Browse files Browse the repository at this point in the history 
Also, various visual cleanup.
  • Loading branch information
@jarruda
jarruda committed Jun 13, 2024
1 parent 8837dc7 commit e9b1c87
Show file tree
Hide file tree
Showing 3 changed files with 70 additions and 54 deletions.
4 changes: 2 additions & 2 deletions src/app/filtered_log_entries_tab.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,14 +5,14 @@ use std::{
};

use egui::Ui;
use grep::searcher::{sinks::Lossy, Searcher};
use grep::searcher::{Searcher, sinks::Lossy};
use grep_regex::RegexMatcherBuilder;
use log::error;

use super::{
log_entries_table::LogEntriesTable,
log_file_reader::{LineNumber, LogFileReader},
log_view::{LogViewTabTrait, LogViewerState},
log_view::{LogViewerState, LogViewTabTrait},
};

#[derive(Debug)]
Expand Down
31 changes: 20 additions & 11 deletions src/app/log_entries_table.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,12 +21,9 @@ impl<'a> LogEntriesTable<'a> {
image_source: ImageSource<'_>,
hover_text: &str,
) -> Response {
ui.add_sized(
Vec2::new(14.0, 14.0),
Button::image(image_source).frame(false),
)
.on_hover_cursor(CursorIcon::PointingHand)
.on_hover_text(hover_text)
ui.add_sized(Vec2::new(18.0, 18.0), Button::image(image_source))
.on_hover_cursor(CursorIcon::PointingHand)
.on_hover_text(hover_text)
}

pub fn new() -> Self {
Expand Down Expand Up @@ -67,8 +64,10 @@ impl<'a> LogEntriesTable<'a> {
.max_scroll_height(f32::INFINITY)
.cell_layout(egui::Layout::left_to_right(egui::Align::Center))
.striped(true)
.auto_shrink(false)
.min_scrolled_height(0.0)
.sense(egui::Sense::click());

let mut col_iter = viewer_state.displayed_columns.iter().peekable();
while let Some(col_key) = col_iter.next() {
let is_last_col = col_iter.peek().is_none();
Expand Down Expand Up @@ -96,7 +95,7 @@ impl<'a> LogEntriesTable<'a> {
}

table_builder
.header(18.0, |mut row| {
.header(24.0, |mut row| {
let columns_displayed_count = viewer_state.displayed_columns.len();
let mut columns_to_remove: Vec<String> = vec![];
for displayed_column in &viewer_state.displayed_columns {
Expand Down Expand Up @@ -155,7 +154,19 @@ impl<'a> LogEntriesTable<'a> {
row: &mut TableRow<'_, '_>,
line_num: LineNumber,
) -> Option<()> {
let log_line = log_file_reader.read_line(line_num)?;
let log_line_opt = log_file_reader.read_line(line_num);

if log_line_opt.is_none() {
row.col(|ui| {
ui.label(
RichText::new("⚠ Failed to read from log file.")
.color(ui.visuals().warn_fg_color),
);
});
return None;
}

let log_line = log_line_opt.unwrap();

match LogFileReader::parse_logline(&log_line) {
Some(log_entry) => {
Expand Down Expand Up @@ -194,8 +205,6 @@ impl<'a> LogEntriesTable<'a> {
}
}
None => {
row.col(|_| {});
row.col(|_| {});
row.col(|ui| {
ui.label(
RichText::new(log_line.trim())
Expand Down
89 changes: 48 additions & 41 deletions src/app/log_entry_context_tab.rs
View file
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
use egui::{
include_image, Button, Color32, CursorIcon, ImageSource, Response, RichText, Sense, Vec2,
Button, Color32, CursorIcon, ImageSource, include_image, Response, RichText, Sense, Vec2,
};
use egui_extras::{Column, TableBuilder};
use egui_toast::ToastKind;

use super::{
log_file_reader::LogFileReader,
log_view::{LogViewTabTrait, LogViewerState},
log_view::{LogViewerState, LogViewTabTrait},
};

pub struct LogEntryContextTab {}
Expand All @@ -21,12 +21,9 @@ impl LogEntryContextTab {
image_source: ImageSource<'_>,
hover_text: &str,
) -> Response {
ui.add_sized(
Vec2::new(14.0, 14.0),
Button::image(image_source).frame(false),
)
.on_hover_cursor(CursorIcon::PointingHand)
.on_hover_text(hover_text)
ui.add_sized(Vec2::new(18.0, 18.0), Button::image(image_source))
.on_hover_text(hover_text)
.on_hover_cursor(CursorIcon::PointingHand)
}
}

Expand All @@ -52,10 +49,16 @@ impl LogViewTabTrait for LogEntryContextTab {
return;
}

let row_height_padding = 6.0;
let row_content_height = 14.0;

let log_entry = read_log_entry.unwrap();

TableBuilder::new(ui)
.striped(true)
.min_scrolled_height(0.0)
.max_scroll_height(f32::INFINITY)
.auto_shrink(false)
.sense(Sense::hover())
.cell_layout(egui::Layout::left_to_right(egui::Align::Center))
.column(Column::auto())
Expand All @@ -67,45 +70,49 @@ impl LogViewTabTrait for LogEntryContextTab {
let key_str = entry.0;
let value_str = entry.1.to_string();
let line_count = value_str.chars().filter(|c| *c == '\n').count() + 1;
body.row((line_count as f32) * 16.0, |mut row| {
row.col(|ui| {
let column_is_shown =
viewer_state.displayed_columns.iter().any(|s| s == key_str);
if !column_is_shown {
let add_icon =
include_image!("../../assets/icons8-add-48-white.png");
if Self::add_tool_button(ui, add_icon, "Add Column").clicked() {
viewer_state.displayed_columns.push(key_str.to_string());
body.row(
(line_count as f32) * row_content_height + row_height_padding,
|mut row| {
row.col(|ui| {
let column_is_shown =
viewer_state.displayed_columns.iter().any(|s| s == key_str);
if !column_is_shown {
let add_icon =
include_image!("../../assets/icons8-add-48-white.png");
if Self::add_tool_button(ui, add_icon, "Add Column").clicked() {
viewer_state.displayed_columns.push(key_str.to_string());

viewer_state.add_toast(
ToastKind::Info,
format!("Added column '{}'", key_str).into(),
2.0,
);
}
}
});
row.col(|ui| {
ui.label(RichText::new(key_str).color(Color32::WHITE).monospace());
});
row.col(|ui| {
let copy_icon =
include_image!("../../assets/icons8-copy-48-white.png");
if Self::add_tool_button(ui, copy_icon, "Copy Value").clicked() {
ui.output_mut(|o| {
o.copied_text = value_str.clone();
});

viewer_state.add_toast(
ToastKind::Info,
format!("Added column '{}'", key_str).into(),
"Copied value to clipboard.".into(),
2.0,
);
}
}
});
row.col(|ui| {
ui.label(RichText::new(key_str).color(Color32::WHITE).monospace());
});
row.col(|ui| {
let copy_icon = include_image!("../../assets/icons8-copy-48-white.png");
if Self::add_tool_button(ui, copy_icon, "Copy Value").clicked() {
ui.output_mut(|o| {
o.copied_text = value_str.clone();
});

viewer_state.add_toast(
ToastKind::Info,
"Copied value to clipboard.".into(),
2.0,
);
}
});
row.col(|ui| {
ui.label(RichText::new(value_str.trim()).monospace());
});
});
});
row.col(|ui| {
ui.label(RichText::new(value_str.trim()).monospace());
});
},
);
}
});
}
Expand Down

0 comments on commit e9b1c87

Please sign in to comment.