forward filters (ugly)
This commit is contained in:
parent
1f6679f57f
commit
de51666742
8 changed files with 167 additions and 97 deletions
|
|
@ -1,4 +1,4 @@
|
|||
use std::{collections::HashMap, iter, mem, sync::Arc};
|
||||
use std::{collections::HashMap, fs::File, io::Write, iter, mem, sync::Arc};
|
||||
|
||||
use crate::tui::{
|
||||
filter::Filter,
|
||||
|
|
@ -8,7 +8,7 @@ use crate::tui::{
|
|||
view::LogView,
|
||||
},
|
||||
model::LogEntry,
|
||||
processing::{IntoLogStream, LogStream},
|
||||
processing::{FilterList, IntoLogStream, LogStream},
|
||||
};
|
||||
use tui_widget_list::ListState;
|
||||
|
||||
|
|
@ -56,82 +56,95 @@ impl LogViewer {
|
|||
}
|
||||
|
||||
pub fn filtered_root_stream(&self) -> Box<dyn LogStream> {
|
||||
let mut curr = self.root_stream.clone();
|
||||
for filter in self.filters.get() {
|
||||
curr = Box::new(curr.filter(Arc::clone(filter)));
|
||||
}
|
||||
|
||||
curr
|
||||
self.root_stream.with_filters(self.filters.get())
|
||||
}
|
||||
|
||||
fn update_filters(&mut self) {
|
||||
fn update_filters(&mut self, old_filters: &FilterList) {
|
||||
self.cache.clear();
|
||||
let offsets_list: Vec<_> = self
|
||||
.stack
|
||||
.iter()
|
||||
.map(|i| (i.selected(), i.selection_offset))
|
||||
.map(|i| (i.selected(old_filters), i.selection_offset))
|
||||
.chain(iter::once((
|
||||
self.curr.selected(),
|
||||
self.curr.selected(old_filters),
|
||||
self.curr.selection_offset,
|
||||
)))
|
||||
.collect();
|
||||
|
||||
fn find_elem_in_stream(
|
||||
stream: &dyn LogStream,
|
||||
elem: &Arc<LogEntry>,
|
||||
) -> Option<Box<dyn LogStream>> {
|
||||
let mut temp_stream = stream.clone();
|
||||
let mut max = 100usize;
|
||||
while let Some((curr, _)) = temp_stream.next() {
|
||||
if Arc::ptr_eq(&curr, elem) {
|
||||
return Some(temp_stream);
|
||||
let mut log = File::options()
|
||||
.create(true)
|
||||
.append(true)
|
||||
.open("./log")
|
||||
.unwrap();
|
||||
|
||||
writeln!(&mut log, "active filters: {:?}", self.filters.get()).unwrap();
|
||||
|
||||
writeln!(
|
||||
&mut log,
|
||||
"{:?}",
|
||||
offsets_list.iter().map(|i| i.1).collect::<Vec<_>>()
|
||||
)
|
||||
.unwrap();
|
||||
|
||||
let find_elem_in_stream =
|
||||
|stream: &dyn LogStream, elem: &Arc<LogEntry>| -> Option<Box<dyn LogStream>> {
|
||||
let mut temp_stream = stream.clone();
|
||||
while let Some((curr, _)) = temp_stream.next(self.filters.get()) {
|
||||
if Arc::ptr_eq(&curr, elem) {
|
||||
return Some(temp_stream);
|
||||
}
|
||||
}
|
||||
|
||||
if max == 0 {
|
||||
break;
|
||||
}
|
||||
max -= 1;
|
||||
}
|
||||
|
||||
None
|
||||
}
|
||||
None
|
||||
};
|
||||
|
||||
let mut current_stream = self.filtered_root_stream();
|
||||
let mut new_stack = Vec::<LogView>::new();
|
||||
let mut missing = false;
|
||||
|
||||
'outer: for (elem, old_offset) in offsets_list {
|
||||
let Some((elem, _)) = elem else {
|
||||
for (elem, old_offset) in offsets_list {
|
||||
let Some((elem, inline_depth)) = elem else {
|
||||
writeln!(&mut log, "no elem").unwrap();
|
||||
break;
|
||||
};
|
||||
|
||||
// If the value we're looking for is removed by the filter,
|
||||
// we'll have a hard time finding it so quit
|
||||
// if filter.removes(&elem) {
|
||||
// break;
|
||||
// }
|
||||
writeln!(
|
||||
&mut log,
|
||||
"reconstruction {:?} prev at {old_offset:?}",
|
||||
elem.message_or_name()
|
||||
)
|
||||
.unwrap();
|
||||
|
||||
// find the nearest stream in which this element can be found
|
||||
let mut curr = current_stream.as_ref();
|
||||
let mut parents = new_stack.iter().rev();
|
||||
let mut found_in_toplevel = true;
|
||||
let mut stream = loop {
|
||||
writeln!(&mut log, "find in stream").unwrap();
|
||||
if let Some(stream) = find_elem_in_stream(curr, &elem) {
|
||||
writeln!(&mut log, "found (toplevel={found_in_toplevel})").unwrap();
|
||||
break stream;
|
||||
}
|
||||
found_in_toplevel = false;
|
||||
|
||||
if let Some(parent) = parents.next() {
|
||||
writeln!(&mut log, "searching parent").unwrap();
|
||||
curr = parent.iter.as_ref();
|
||||
continue;
|
||||
}
|
||||
|
||||
break 'outer;
|
||||
writeln!(&mut log, "no more parents").unwrap();
|
||||
missing = true;
|
||||
|
||||
// TODO: better guess at how far down we need to go
|
||||
// now its just 0
|
||||
|
||||
break current_stream;
|
||||
};
|
||||
|
||||
let offset = if found_in_toplevel {
|
||||
let mut offset = 0;
|
||||
for _ in 0..old_offset {
|
||||
if stream.prev().is_none() {
|
||||
if stream.prev(self.filters.get()).is_none() {
|
||||
break;
|
||||
}
|
||||
offset += 1;
|
||||
|
|
@ -142,29 +155,60 @@ impl LogViewer {
|
|||
0
|
||||
};
|
||||
|
||||
current_stream = stream.clone();
|
||||
writeln!(&mut log, "new offset: {offset:?}").unwrap();
|
||||
|
||||
let nested_stream = elem.from_start(inline_depth);
|
||||
new_stack.push(LogView {
|
||||
iter: stream,
|
||||
selection_offset: offset,
|
||||
});
|
||||
|
||||
// If we found a missing entry, don't try deeper entries,
|
||||
// they won't exist
|
||||
if missing {
|
||||
break;
|
||||
} else if let Some(nested_stream) = nested_stream {
|
||||
current_stream = nested_stream.with_filters(self.filters.get());
|
||||
} else {
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
writeln!(
|
||||
&mut log,
|
||||
"{:?}",
|
||||
new_stack
|
||||
.iter()
|
||||
.map(|i| (
|
||||
i.iter
|
||||
.clone()
|
||||
.next(self.filters.get())
|
||||
.map(|i| i.0.message_or_name()),
|
||||
i.selection_offset
|
||||
))
|
||||
.collect::<Vec<_>>()
|
||||
)
|
||||
.unwrap();
|
||||
|
||||
// Take the top of the stack as `curr`, unless
|
||||
// the new stack is empty, then just reset the current view.
|
||||
if let Some(curr) = new_stack.pop() {
|
||||
writeln!(&mut log, "popped new curr off stack").unwrap();
|
||||
self.curr = curr;
|
||||
} else {
|
||||
writeln!(&mut log, "reconstructing root, somehow").unwrap();
|
||||
self.curr = LogView {
|
||||
iter: self.filtered_root_stream().clone(),
|
||||
selection_offset: 0,
|
||||
selection_offset: self.stack.first().unwrap_or(&self.curr).selection_offset,
|
||||
};
|
||||
}
|
||||
self.stack = new_stack;
|
||||
}
|
||||
|
||||
pub fn add_filter(&mut self, filter: Arc<Filter>) {
|
||||
let old_filters = self.filters.clone();
|
||||
self.filters.push(Arc::clone(&filter));
|
||||
self.update_filters();
|
||||
self.update_filters(old_filters.get());
|
||||
}
|
||||
|
||||
pub fn update_num_items(&mut self, num_visible_items: usize) {
|
||||
|
|
@ -172,7 +216,7 @@ impl LogViewer {
|
|||
if self.curr.selection_offset == 0 {
|
||||
break;
|
||||
}
|
||||
self.curr.iter.next();
|
||||
self.curr.iter.next(self.filters.get());
|
||||
self.curr.selection_offset -= 1;
|
||||
}
|
||||
self.last_height = num_visible_items;
|
||||
|
|
@ -204,7 +248,7 @@ impl LogViewer {
|
|||
let mut temp_iter = self.curr.iter.clone();
|
||||
let mut res = Vec::new();
|
||||
for _ in 0..max {
|
||||
let Some(i) = temp_iter.next() else {
|
||||
let Some(i) = temp_iter.next(self.filters.get()) else {
|
||||
break;
|
||||
};
|
||||
res.push(i);
|
||||
|
|
@ -242,7 +286,7 @@ impl LogViewer {
|
|||
}
|
||||
|
||||
pub fn selected(&self) -> Option<(Arc<LogEntry>, usize)> {
|
||||
self.curr.selected()
|
||||
self.curr.selected(self.filters.get())
|
||||
}
|
||||
|
||||
pub fn prev(&mut self) {
|
||||
|
|
@ -253,7 +297,7 @@ impl LogViewer {
|
|||
}
|
||||
_ => {
|
||||
if self.curr.selection_offset == 0 {
|
||||
let _ = self.curr.iter.prev();
|
||||
let _ = self.curr.iter.prev(self.filters.get());
|
||||
} else {
|
||||
self.curr.selection_offset -= 1;
|
||||
}
|
||||
|
|
@ -283,7 +327,7 @@ impl LogViewer {
|
|||
pub fn page_up(&mut self) {
|
||||
for _ in 0..self.last_height {
|
||||
if self.curr.selection_offset == 0 {
|
||||
let _ = self.curr.iter.prev();
|
||||
let _ = self.curr.iter.prev(self.filters.get());
|
||||
} else {
|
||||
self.curr.selection_offset -= 1;
|
||||
}
|
||||
|
|
@ -299,7 +343,7 @@ impl LogViewer {
|
|||
}
|
||||
_ => {
|
||||
self.curr.selection_offset = 0;
|
||||
while self.curr.iter.prev().is_some() {}
|
||||
while self.curr.iter.prev(self.filters.get()).is_some() {}
|
||||
self.input_state = InputState::None;
|
||||
}
|
||||
}
|
||||
|
|
@ -318,13 +362,15 @@ impl LogViewer {
|
|||
}
|
||||
|
||||
pub fn undo(&mut self) {
|
||||
let old_filters = self.filters.clone();
|
||||
self.filters.undo();
|
||||
self.update_filters();
|
||||
self.update_filters(old_filters.get());
|
||||
}
|
||||
|
||||
pub fn redo(&mut self) {
|
||||
let old_filters = self.filters.clone();
|
||||
self.filters.redo();
|
||||
self.update_filters();
|
||||
self.update_filters(old_filters.get());
|
||||
}
|
||||
|
||||
pub fn enter(&mut self) {
|
||||
|
|
@ -333,21 +379,24 @@ impl LogViewer {
|
|||
let Some((s, _)) = self.selected() else {
|
||||
return;
|
||||
};
|
||||
let Some(i) = s.from_start(0) else {
|
||||
let Some(i) = s.from_start(0).map(|i| i.with_filters(self.filters.get())) else {
|
||||
return;
|
||||
};
|
||||
|
||||
if i.clone().next().is_none() {
|
||||
if i.clone().next(self.filters.get()).is_none() {
|
||||
return;
|
||||
}
|
||||
if i.clone().next().is_some_and(|(i, _)| i.is_return()) {
|
||||
if i.clone()
|
||||
.next(self.filters.get())
|
||||
.is_some_and(|(i, _)| i.is_return())
|
||||
{
|
||||
return;
|
||||
}
|
||||
|
||||
self.stack.push(mem::replace(
|
||||
&mut self.curr,
|
||||
LogView {
|
||||
iter: Box::new(i),
|
||||
iter: i,
|
||||
selection_offset: 0,
|
||||
},
|
||||
));
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue