mirrors/envision
0
0
Fork 0
mirror of https://gitlab.com/gabmus/envision.git synced 2025-08-03 14:49:04 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

feat: rename debug level to log level; connect log level dropdown

Browse source
This commit is contained in:
Gabriele Musco 2023-06-24 00:48:52 +02:00
commit c32e8a4c19
No known key found for this signature in database
GPG key ID: 1068D795C80E51DE
1 changed files with 57 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

83
src/ui/debug_view.rs
View file

@ -1,10 +1,11 @@
use expect_dialog::ExpectDialog;
use gtk::prelude::*; use gtk::prelude::*;
use relm4::prelude::*; use relm4::prelude::*;
use relm4::{ComponentSender, SimpleComponent}; use relm4::{ComponentSender, SimpleComponent};
use relm4_icons::icon_name; use relm4_icons::icon_name;
#[derive(Debug)] #[derive(Debug, PartialEq, Eq, Clone, Copy)]
pub enum DebugLevel { pub enum LogLevel {
Trace, Trace,
Debug, Debug,
Info, Info,
@ -12,7 +13,7 @@ pub enum DebugLevel {
Error, Error,
} }
impl DebugLevel { impl LogLevel {
pub fn from_string(s: String) -> Self { pub fn from_string(s: String) -> Self {
match s.to_lowercase().as_str() { match s.to_lowercase().as_str() {
"trace" => Self::Trace, "trace" => Self::Trace,
@ -23,26 +24,38 @@ impl DebugLevel {
_ => Self::Debug, _ => Self::Debug,
} }
} }
pub fn to_string(&self) -> &str {
match self {
LogLevel::Trace => "Trace",
LogLevel::Debug => "Debug",
LogLevel::Info => "Info",
LogLevel::Warning => "Warning",
LogLevel::Error => "Error",
}
}
} }
pub const DEBUG_LEVEL_STRINGS: [&str; 5] = ["Trace", "Debug", "Info", "Warning", "Error"]; pub const DEBUG_LEVEL_STRINGS: [&str; 5] = ["Trace", "Debug", "Info", "Warning", "Error"];
pub const DEBUG_LEVEL_VALS: [LogLevel; 5] = [
LogLevel::Trace,
LogLevel::Debug,
LogLevel::Info,
LogLevel::Warning,
LogLevel::Error,
];
#[derive(Debug)] #[derive(Debug)]
pub enum DebugViewMsg { pub enum DebugViewMsg {
DebugLevelChanged(DebugLevel),
SearchTermChanged(String),
LogUpdated(Vec<String>), LogUpdated(Vec<String>),
EnableDebugViewChanged(bool), EnableDebugViewChanged(bool),
FilterLog,
} }
#[tracker::track] #[tracker::track]
pub struct DebugView { pub struct DebugView {
#[tracker::do_not_track] #[tracker::do_not_track]
pub debug_level: DebugLevel, pub log: Vec<String>,
#[tracker::do_not_track]
pub search_term: String,
#[tracker::do_not_track]
pub log: String,
#[tracker::do_not_track] #[tracker::do_not_track]
pub textbuf: gtk::TextBuffer, pub textbuf: gtk::TextBuffer,
#[tracker::do_not_track] #[tracker::do_not_track]
@ -51,6 +64,8 @@ pub struct DebugView {
pub searchbar: Option<gtk::SearchBar>, pub searchbar: Option<gtk::SearchBar>,
#[tracker::do_not_track] #[tracker::do_not_track]
pub search_entry: Option<gtk::SearchEntry>, pub search_entry: Option<gtk::SearchEntry>,
#[tracker::do_not_track]
pub dropdown: Option<gtk::DropDown>,
pub enable_debug_view: bool, pub enable_debug_view: bool,
} }
@ -85,8 +100,7 @@ impl SimpleComponent for DebugView {
set_icon_name: icon_name::LOUPE, set_icon_name: icon_name::LOUPE,
set_tooltip_text: Some("Filter Log"), set_tooltip_text: Some("Filter Log"),
}, },
pack_start: log_level_dropdown = &gtk::DropDown::from_strings(&DEBUG_LEVEL_STRINGS) { pack_start: log_level_dropdown = &gtk::DropDown::from_strings(&DEBUG_LEVEL_STRINGS),
},
}, },
}, },
#[name(searchbar)] #[name(searchbar)]
@ -97,6 +111,9 @@ impl SimpleComponent for DebugView {
#[wrap(Some)] #[wrap(Some)]
set_child: search_entry = &gtk::SearchEntry { set_child: search_entry = &gtk::SearchEntry {
set_hexpand: true, set_hexpand: true,
connect_changed[sender] => move |_| {
sender.input(Self::Input::FilterLog);
}
}, },
connect_entry: &search_entry, connect_entry: &search_entry,
}, },
@ -119,24 +136,25 @@ impl SimpleComponent for DebugView {
self.reset(); self.reset();
match message { match message {
Self::Input::DebugLevelChanged(level) => {} Self::Input::FilterLog => {
Self::Input::SearchTermChanged(term) => {}
Self::Input::LogUpdated(n_log) => {
let searchbar = self.searchbar.as_ref().unwrap().clone(); let searchbar = self.searchbar.as_ref().unwrap().clone();
let search_entry = self.search_entry.as_ref().unwrap().clone(); let search_entry = self.search_entry.as_ref().unwrap().clone();
let mut search_text: String = search_entry.text().into(); let search_text = search_entry.text().to_string().trim().to_lowercase();
search_text = search_text.trim().to_lowercase(); // TODO: add log level filtering
let log_level = DEBUG_LEVEL_VALS
.get(self.dropdown.as_ref().unwrap().selected() as usize)
.unwrap_or(&LogLevel::Debug)
.clone();
println!("log level: {}", log_level.to_string());
if searchbar.is_search_mode() && !search_text.is_empty() { if searchbar.is_search_mode() && !search_text.is_empty() {
self.log = n_log self.log = self
.log
.iter() .iter()
.filter(|row| row.to_lowercase().contains(&search_text)) .filter(|row| row.to_lowercase().contains(&search_text))
.map(|s| s.to_string()) .map(|s| s.to_string())
.collect::<Vec<String>>() .collect::<Vec<String>>();
.concat();
} else {
self.log = n_log.concat();
} }
self.textbuf.set_text(&self.log); self.textbuf.set_text(&self.log.concat());
let textbuf = self.textbuf.clone(); let textbuf = self.textbuf.clone();
let textview = self.textview.as_ref().unwrap().clone(); let textview = self.textview.as_ref().unwrap().clone();
gtk::glib::idle_add_local_once(move || { gtk::glib::idle_add_local_once(move || {
@ -144,6 +162,10 @@ impl SimpleComponent for DebugView {
textview.scroll_mark_onscreen(&end_mark); textview.scroll_mark_onscreen(&end_mark);
}); });
} }
Self::Input::LogUpdated(n_log) => {
self.log = n_log;
sender.input(Self::Input::FilterLog);
}
Self::Input::EnableDebugViewChanged(val) => self.set_enable_debug_view(val), Self::Input::EnableDebugViewChanged(val) => self.set_enable_debug_view(val),
} }
} }
@ -155,20 +177,29 @@ impl SimpleComponent for DebugView {
) -> ComponentParts<Self> { ) -> ComponentParts<Self> {
let mut model = Self { let mut model = Self {
tracker: 0, tracker: 0,
debug_level: DebugLevel::Debug, log: vec![],
search_term: "".into(),
log: "".into(),
textbuf: gtk::TextBuffer::builder().build(), textbuf: gtk::TextBuffer::builder().build(),
textview: None, textview: None,
enable_debug_view: init.enable_debug_view, enable_debug_view: init.enable_debug_view,
searchbar: None, searchbar: None,
search_entry: None, search_entry: None,
dropdown: None,
}; };
let widgets = view_output!(); let widgets = view_output!();
model.searchbar = Some(widgets.searchbar.clone()); model.searchbar = Some(widgets.searchbar.clone());
model.search_entry = Some(widgets.search_entry.clone()); model.search_entry = Some(widgets.search_entry.clone());
model.textview = Some(widgets.textview.clone()); model.textview = Some(widgets.textview.clone());
model.dropdown = Some(widgets.log_level_dropdown.clone());
{
let dd_sender = sender.clone();
widgets
.log_level_dropdown
.connect_selected_notify(move |dd| {
dd_sender.input(Self::Input::FilterLog);
});
}
ComponentParts { model, widgets } ComponentParts { model, widgets }
} }