help overview and input rework
This commit is contained in:
parent
a6d501977c
commit
f733c65bcf
3 changed files with 275 additions and 214 deletions
364
src/tui/mod.rs
364
src/tui/mod.rs
|
|
@ -3,6 +3,7 @@ use ratatui_themes::{Theme, ThemeName};
|
|||
use std::{
|
||||
fs::{self, DirEntry},
|
||||
io,
|
||||
ops::ControlFlow,
|
||||
path::{Path, PathBuf},
|
||||
process::exit,
|
||||
rc::Rc,
|
||||
|
|
@ -11,7 +12,7 @@ use tui_widget_list::{ListBuilder, ListView};
|
|||
|
||||
use crate::tui::{
|
||||
filter::{FilterKind, WipMatcher},
|
||||
log_viewer::LogViewer,
|
||||
log_viewer::{InputState, InputTarget, LogViewer},
|
||||
};
|
||||
use crate::tui::{
|
||||
filter::{FilterSelection, WipFilter},
|
||||
|
|
@ -20,7 +21,7 @@ use crate::tui::{
|
|||
use ratatui::{
|
||||
DefaultTerminal,
|
||||
buffer::Buffer,
|
||||
crossterm::event::{self, Event, KeyCode, KeyModifiers},
|
||||
crossterm::event::{self, Event, KeyCode, KeyEvent, KeyModifiers},
|
||||
layout::{Constraint, HorizontalAlignment, Layout, Rect},
|
||||
style::Style,
|
||||
text::{Line, Text},
|
||||
|
|
@ -58,6 +59,7 @@ enum Tab {
|
|||
filter: WipFilter,
|
||||
},
|
||||
Empty,
|
||||
Help,
|
||||
}
|
||||
|
||||
impl Tab {
|
||||
|
|
@ -68,31 +70,33 @@ impl Tab {
|
|||
(Tab::LogViewer(_), Some(path)) => format!("logs of {}", path.display()),
|
||||
(Tab::LogViewer(_), None) => "logs".to_string(),
|
||||
(Tab::CreateFilter { .. }, _) => "create filter".to_string(),
|
||||
(Tab::Help, _) => "help".to_string(),
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
fn initialize_filter(lv: &mut LogViewer, kind: Option<FilterKind>) -> WipFilter {
|
||||
let matcher = if lv.footer_selected {
|
||||
let footer_fields = lv.footer_fields();
|
||||
let (key, value) = footer_fields
|
||||
.get(lv.footer_list.selected.unwrap_or(0))
|
||||
.map_or((None, None), |(k, v)| (Some(k), Some(v)));
|
||||
Some(WipMatcher::Field {
|
||||
name: key.cloned(),
|
||||
value: value.cloned(),
|
||||
})
|
||||
} else {
|
||||
Some(WipMatcher::Specific {
|
||||
hash: lv.selected().map(|(i, _)| i.hash()),
|
||||
})
|
||||
};
|
||||
todo!()
|
||||
// let matcher = if lv.fields_selected {
|
||||
// let footer_fields = lv.footer_fields();
|
||||
// let (key, value) = footer_fields
|
||||
// .get(lv.footer_list.selected.unwrap_or(0))
|
||||
// .map_or((None, None), |(k, v)| (Some(k), Some(v)));
|
||||
// Some(WipMatcher::Field {
|
||||
// name: key.cloned(),
|
||||
// value: value.cloned(),
|
||||
// })
|
||||
// } else {
|
||||
// Some(WipMatcher::Specific {
|
||||
// hash: lv.selected().map(|(i, _)| i.hash()),
|
||||
// })
|
||||
// };
|
||||
|
||||
WipFilter {
|
||||
matcher,
|
||||
kind,
|
||||
selection: filter::FilterSelection::Kind,
|
||||
}
|
||||
// WipFilter {
|
||||
// matcher,
|
||||
// kind,
|
||||
// selection: filter::FilterSelection::Kind,
|
||||
// }
|
||||
}
|
||||
|
||||
struct App {
|
||||
|
|
@ -166,6 +170,92 @@ impl App {
|
|||
self.tabs.last_mut().unwrap()
|
||||
}
|
||||
|
||||
fn handle_current_tab_keycode(&mut self, key: KeyEvent) {
|
||||
match self.tabs.last_mut().unwrap() {
|
||||
Tab::Help => {}
|
||||
Tab::Empty => {}
|
||||
Tab::FileChooser {
|
||||
files,
|
||||
state,
|
||||
last_height,
|
||||
} => match key.code {
|
||||
KeyCode::Char('j') | KeyCode::Down => state.select_next(),
|
||||
KeyCode::Char('k') | KeyCode::Up => state.select_previous(),
|
||||
KeyCode::PageUp => state.scroll_up_by(*last_height as u16),
|
||||
KeyCode::PageDown => state.scroll_down_by(*last_height as u16),
|
||||
KeyCode::Char('G') | KeyCode::Home => state.select_first(),
|
||||
KeyCode::Char('g') | KeyCode::End => state.select_last(),
|
||||
KeyCode::Enter => {
|
||||
if let Some(selected) = state.selected()
|
||||
&& let Some(selected) = files.get(selected)
|
||||
{
|
||||
match LogfileReader::new(&selected.path()) {
|
||||
Ok(i) => {
|
||||
self.current_file = Some(i.clone());
|
||||
self.replace_tab(Tab::LogViewer(LogViewer::new(i.iter())));
|
||||
}
|
||||
Err(_) => {
|
||||
panic!()
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
_ => {}
|
||||
},
|
||||
Tab::LogViewer(lv) => match key.code {
|
||||
KeyCode::Char('j') | KeyCode::Down => lv.next(),
|
||||
KeyCode::Char('k') | KeyCode::Up => lv.prev(),
|
||||
KeyCode::PageUp => lv.page_up(),
|
||||
KeyCode::PageDown => lv.page_down(),
|
||||
KeyCode::Char('G') | KeyCode::Home => lv.home(),
|
||||
KeyCode::Char('g') | KeyCode::End => todo!(),
|
||||
KeyCode::Backspace | KeyCode::Left => lv.back(),
|
||||
KeyCode::Right => lv.enter(),
|
||||
KeyCode::Enter => lv.enter(),
|
||||
KeyCode::Char('f') => {
|
||||
lv.input_state.target(InputTarget::Fields);
|
||||
}
|
||||
_ => {}
|
||||
},
|
||||
Tab::CreateFilter { filter } => todo!(),
|
||||
}
|
||||
}
|
||||
|
||||
fn handle_generic_keycode(
|
||||
&mut self,
|
||||
key: KeyEvent,
|
||||
terminal: &mut DefaultTerminal,
|
||||
) -> ControlFlow<()> {
|
||||
let num_tabs = self.tabs.len();
|
||||
match key.code {
|
||||
KeyCode::Char('q') => return ControlFlow::Break(()),
|
||||
KeyCode::Char('c') if key.modifiers.contains(KeyModifiers::CONTROL) => {
|
||||
return ControlFlow::Break(());
|
||||
}
|
||||
KeyCode::Char('z') if key.modifiers.contains(KeyModifiers::CONTROL) => {
|
||||
ratatui::restore();
|
||||
let self_pid = nix::unistd::getpid();
|
||||
let _ = nix::sys::signal::kill(self_pid, nix::sys::signal::SIGTSTP);
|
||||
*terminal = ratatui::init();
|
||||
}
|
||||
KeyCode::Char('?') => {
|
||||
if matches!(self.current_tab(), Tab::Help) {
|
||||
self.pop_tab();
|
||||
} else {
|
||||
self.push_tab(Tab::Help);
|
||||
}
|
||||
}
|
||||
KeyCode::Esc if num_tabs > 1 => {
|
||||
self.pop_tab();
|
||||
}
|
||||
_ => {
|
||||
self.handle_current_tab_keycode(key);
|
||||
}
|
||||
}
|
||||
|
||||
ControlFlow::Continue(())
|
||||
}
|
||||
|
||||
fn run(mut self, mut terminal: DefaultTerminal) -> io::Result<()> {
|
||||
loop {
|
||||
terminal.draw(|frame| frame.render_widget(&mut self, frame.area()))?;
|
||||
|
|
@ -173,147 +263,48 @@ impl App {
|
|||
if let Event::Key(key) = event::read()? {
|
||||
// to initialize, but we then do get manually for borrow reasons
|
||||
self.current_tab();
|
||||
let num_tabs = self.tabs.len();
|
||||
match (key.code, self.tabs.last_mut().unwrap()) {
|
||||
(KeyCode::Char('q'), _) => return Ok(()),
|
||||
(KeyCode::Char('c'), _) if key.modifiers.contains(KeyModifiers::CONTROL) => {
|
||||
return Ok(());
|
||||
}
|
||||
(KeyCode::Char('z'), _) if key.modifiers.contains(KeyModifiers::CONTROL) => {
|
||||
ratatui::restore();
|
||||
let self_pid = nix::unistd::getpid();
|
||||
let _ = nix::sys::signal::kill(self_pid, nix::sys::signal::SIGTSTP);
|
||||
terminal = ratatui::init();
|
||||
}
|
||||
(KeyCode::Esc, _) if num_tabs > 1 => {
|
||||
self.pop_tab();
|
||||
}
|
||||
(KeyCode::Char('j') | KeyCode::Down, tab) => match tab {
|
||||
Tab::FileChooser { state, .. } => state.select_next(),
|
||||
Tab::LogViewer(lv) => lv.next(),
|
||||
Tab::Empty => {}
|
||||
Tab::CreateFilter { filter } => {
|
||||
filter.selection.next();
|
||||
}
|
||||
},
|
||||
(KeyCode::Char('k') | KeyCode::Up, tab) => match tab {
|
||||
Tab::FileChooser { state, .. } => state.select_previous(),
|
||||
Tab::LogViewer(lv) => {
|
||||
lv.prev();
|
||||
}
|
||||
Tab::Empty => {}
|
||||
Tab::CreateFilter { filter } => {
|
||||
filter.selection.prev();
|
||||
}
|
||||
},
|
||||
(KeyCode::PageDown, tab) => match tab {
|
||||
Tab::FileChooser {
|
||||
state, last_height, ..
|
||||
} => state.scroll_down_by(*last_height as u16),
|
||||
Tab::LogViewer(lv) => {
|
||||
lv.page_down();
|
||||
}
|
||||
Tab::Empty => {}
|
||||
Tab::CreateFilter { .. } => {}
|
||||
},
|
||||
(KeyCode::PageUp, tab) => match tab {
|
||||
Tab::FileChooser {
|
||||
state, last_height, ..
|
||||
} => state.scroll_up_by(*last_height as u16),
|
||||
Tab::LogViewer(lv) => {
|
||||
lv.page_up();
|
||||
}
|
||||
Tab::Empty => {}
|
||||
Tab::CreateFilter { .. } => {}
|
||||
},
|
||||
(KeyCode::Char('G') | KeyCode::Home, tab) => match tab {
|
||||
Tab::FileChooser { state, .. } => state.select_first(),
|
||||
Tab::LogViewer(lv) => {
|
||||
lv.home();
|
||||
}
|
||||
Tab::Empty => {}
|
||||
Tab::CreateFilter { .. } => {}
|
||||
},
|
||||
(KeyCode::Char('g') | KeyCode::End, tab) => match tab {
|
||||
Tab::FileChooser { state, .. } => state.select_last(),
|
||||
Tab::LogViewer(_) => {}
|
||||
Tab::Empty => {}
|
||||
Tab::CreateFilter { .. } => {}
|
||||
},
|
||||
(KeyCode::Backspace | KeyCode::Left | KeyCode::Esc, Tab::LogViewer(lv)) => {
|
||||
lv.back();
|
||||
}
|
||||
(KeyCode::Backspace, Tab::CreateFilter { filter }) => {
|
||||
filter.clear();
|
||||
}
|
||||
(KeyCode::Right, Tab::CreateFilter { filter }) => {
|
||||
filter.right();
|
||||
}
|
||||
(KeyCode::Left, Tab::CreateFilter { filter }) => {
|
||||
filter.left();
|
||||
}
|
||||
(KeyCode::Right, Tab::LogViewer(lv)) => lv.enter(),
|
||||
(KeyCode::Tab, Tab::LogViewer(lv)) => {
|
||||
lv.switch_focus();
|
||||
}
|
||||
(KeyCode::Char('r'), Tab::LogViewer(lv)) => {
|
||||
let filter = initialize_filter(lv, Some(FilterKind::Remove));
|
||||
self.push_tab(Tab::CreateFilter { filter });
|
||||
}
|
||||
(KeyCode::Char('i'), Tab::LogViewer(lv)) => {
|
||||
let filter = initialize_filter(lv, Some(FilterKind::Inline));
|
||||
self.push_tab(Tab::CreateFilter { filter });
|
||||
}
|
||||
(KeyCode::Enter, tab) => match tab {
|
||||
Tab::FileChooser { files, state, .. } => {
|
||||
if let Some(selected) = state.selected()
|
||||
&& let Some(selected) = files.get(selected)
|
||||
{
|
||||
match LogfileReader::new(&selected.path()) {
|
||||
Ok(i) => {
|
||||
self.current_file = Some(i.clone());
|
||||
self.replace_tab(Tab::LogViewer(LogViewer::new(i.iter())));
|
||||
}
|
||||
Err(_) => {
|
||||
panic!()
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
Tab::LogViewer(lv) => {
|
||||
if lv.footer_selected {
|
||||
let filter = initialize_filter(lv, None);
|
||||
self.push_tab(Tab::CreateFilter { filter });
|
||||
} else {
|
||||
lv.enter()
|
||||
}
|
||||
}
|
||||
Tab::Empty => {}
|
||||
Tab::CreateFilter { filter } => {
|
||||
if let FilterSelection::Confirm = filter.selection {
|
||||
let filter_clone = filter.clone();
|
||||
if let Some(lv) = self.tabs.iter_mut().rev().find_map(|i| {
|
||||
if let Tab::LogViewer(lv) = i {
|
||||
Some(lv)
|
||||
} else {
|
||||
None
|
||||
}
|
||||
}) && let Some(filter) = filter_clone.validate()
|
||||
{
|
||||
lv.add_filter(Rc::new(filter));
|
||||
self.pop_tab();
|
||||
|
||||
if let Tab::LogViewer(lv) = self.current_tab() {
|
||||
lv.footer_selected = false;
|
||||
}
|
||||
}
|
||||
} else {
|
||||
filter.selection.next();
|
||||
}
|
||||
}
|
||||
},
|
||||
_ => {}
|
||||
// always active
|
||||
if self.handle_generic_keycode(key, &mut terminal).is_break() {
|
||||
break Ok(());
|
||||
}
|
||||
|
||||
// match (key.code, self.tabs.last_mut().unwrap()) {
|
||||
// (KeyCode::Tab, Tab::LogViewer(lv)) => {
|
||||
// lv.switch_focus();
|
||||
// }
|
||||
// (KeyCode::Char('r'), Tab::LogViewer(lv)) => {
|
||||
// let filter = initialize_filter(lv, Some(FilterKind::Remove));
|
||||
// self.push_tab(Tab::CreateFilter { filter });
|
||||
// }
|
||||
// (KeyCode::Char('i'), Tab::LogViewer(lv)) => {
|
||||
// let filter = initialize_filter(lv, Some(FilterKind::Inline));
|
||||
// self.push_tab(Tab::CreateFilter { filter });
|
||||
// }
|
||||
|
||||
// if let FilterSelection::Confirm = filter.selection {
|
||||
// let filter_clone = filter.clone();
|
||||
// if let Some(lv) = self.tabs.iter_mut().rev().find_map(|i| {
|
||||
// if let Tab::LogViewer(lv) = i {
|
||||
// Some(lv)
|
||||
// } else {
|
||||
// None
|
||||
// }
|
||||
// }) && let Some(filter) = filter_clone.validate()
|
||||
// {
|
||||
// lv.add_filter(Rc::new(filter));
|
||||
// self.pop_tab();
|
||||
|
||||
// if let Tab::LogViewer(lv) = self.current_tab() {
|
||||
// lv.footer_selected = false;
|
||||
// }
|
||||
// }
|
||||
// } else {
|
||||
// filter.selection.next();
|
||||
// }
|
||||
// },
|
||||
// _ => {}
|
||||
// }
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -351,8 +342,13 @@ impl Widget for &mut App {
|
|||
.areas(popup_area);
|
||||
|
||||
let (footer_focused, header_focused) = match self.current_tab() {
|
||||
Tab::Help => (false, false),
|
||||
Tab::FileChooser { .. } => (false, true),
|
||||
Tab::LogViewer(lv) => (lv.footer_selected, !lv.footer_selected),
|
||||
Tab::LogViewer(lv) => {
|
||||
let target_fields =
|
||||
matches!(lv.input_state, InputState::Target(InputTarget::Fields));
|
||||
(target_fields, !target_fields)
|
||||
}
|
||||
Tab::Empty => (false, false),
|
||||
Tab::CreateFilter { .. } => (false, false),
|
||||
};
|
||||
|
|
@ -496,6 +492,52 @@ impl Widget for &mut App {
|
|||
StatefulWidget::render(list, footer_area, buf, &mut lv.footer_list);
|
||||
}
|
||||
Tab::Empty => {}
|
||||
Tab::Help => {
|
||||
Clear.render(popup_area, buf);
|
||||
let popup_area = {
|
||||
let block = Block::bordered()
|
||||
.title_top("help")
|
||||
.style(default)
|
||||
.padding(Padding::symmetric(3, 1))
|
||||
.border_style(border_selected);
|
||||
let inner = block.inner(popup_area);
|
||||
block.render(popup_area, buf);
|
||||
inner
|
||||
};
|
||||
|
||||
Paragraph::new(
|
||||
"
|
||||
Generic:
|
||||
? show help
|
||||
<esc> cancel focus or close tab
|
||||
u undo
|
||||
r redo
|
||||
pgdwn&pgup move page
|
||||
down&up move single
|
||||
j&k move single
|
||||
Home/G move to start
|
||||
|
||||
<- / backspace / h exit nested view
|
||||
-> / enter / l enter nested view
|
||||
|
||||
───────────────────────────────────────────────────────
|
||||
targeting logs:
|
||||
|
||||
f fields
|
||||
p prefix
|
||||
r regex
|
||||
c current
|
||||
s surrounding element
|
||||
|
||||
───────────────────────────────────────────────────────
|
||||
perform action on selected target:
|
||||
|
||||
d delete
|
||||
i inline
|
||||
",
|
||||
)
|
||||
.render(popup_area, buf);
|
||||
}
|
||||
Tab::CreateFilter { filter } => {
|
||||
Clear.render(popup_area, buf);
|
||||
let popup_area = {
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue