[filters] add level filter

Author: tstack

NEWS.md

@@ -3,10 +3,12 @@
 
 Features:
 * The Filter configuration panel in the TUI now supports
-  editing the minimum/maximum times for the current
-  view.  Previously, only the `:hide-lines-before` and
+  editing the minimum log level and minimum/maximum
+  times for the current view.  Previously, only the
+  `:set-min-log-level`, `:hide-lines-before`, and
   `:hide-lines-after` commands could be used to set the
-  values.  Pressing `m` will create/set the minimum
+  values.  Pressing `l` will create/set the log level.
+  Pressing `m` will create/set the minimum
   time and pressing `Shift` + `M` will create/set the
   maximum time.  Live preview has also been added to
   show which lines will be filtered out when the min/max

src/base/ansi_scrubber.hh

@@ -48,6 +48,7 @@
 
 #define ANSI_BOLD(msg)      ANSI_BOLD_START msg ANSI_NORM
 #define ANSI_UNDERLINE(msg) ANSI_UNDERLINE_START msg ANSI_NORM
+#define ANSI_HOTKEY(key)    ANSI_CSI "1;4m" key ANSI_NORM
 
 #define ANSI_ROLE(msg)        ANSI_CSI "%dO" msg ANSI_NORM
 #define ANSI_ROLE_FMT(msg)    ANSI_CSI "{}O" msg ANSI_NORM

src/db_sub_source.cc

@@ -43,6 +43,7 @@
 #include "base/types.hh"
 #include "config.h"
 #include "hist_source_T.hh"
+#include "log_level.hh"
 #include "scn/scan.h"
 #include "yajlpp/json_ptr.hh"
 #include "yajlpp/yajlpp_def.hh"

src/filter_status_source.cc

@@ -36,21 +36,22 @@
 #include "filter_sub_source.hh"
 #include "lnav.hh"
 
-static constexpr auto TOGGLE_MSG = "Press " ANSI_BOLD("TAB") " to edit "_frag;
-static constexpr auto EXIT_MSG = "Press " ANSI_BOLD("ESC") " to exit "_frag;
+static constexpr auto TOGGLE_MSG = "Press " ANSI_HOTKEY("TAB") " to edit "_frag;
+static constexpr auto EXIT_MSG = "Press " ANSI_HOTKEY("ESC") " to exit "_frag;
 
 static constexpr auto CREATE_HELP
-    = ANSI_BOLD("i") "/" ANSI_BOLD("o") ": Create in/out";
-static constexpr auto CREATE_EXPR_HELP = "  " ANSI_BOLD("e") ": Edit SQL expr";
+    = "Create: " ANSI_HOTKEY("i") "n/" ANSI_HOTKEY("o") "ut";
+static constexpr auto CREATE_EXPR_HELP = "  SQL " ANSI_HOTKEY("e") "xpr";
+static constexpr auto CREATE_LEVEL_HELP = "  " ANSI_HOTKEY("l") "evel";
 static constexpr auto MIN_MAX_TIME_HELP
-    = ANSI_BOLD("m") "/" ANSI_BOLD("M") ": Set min/max time";
-static constexpr auto ENABLE_HELP = ANSI_BOLD("SPC") ": ";
-static constexpr auto EDIT_HELP = ANSI_BOLD("ENTER") ": Edit";
-static constexpr auto TOGGLE_HELP = ANSI_BOLD("t") ": To ";
-static constexpr auto DELETE_HELP = ANSI_BOLD("D") ": Delete";
-static constexpr auto FILTERING_HELP = ANSI_BOLD("f") ": ";
-static constexpr auto JUMP_HELP = ANSI_BOLD("ENTER") ": Jump To";
-static constexpr auto CLOSE_HELP = ANSI_BOLD("X") ": Close";
+    = "  " ANSI_HOTKEY("m") "in/" ANSI_HOTKEY("M") "ax time";
+static constexpr auto ENABLE_HELP = ANSI_HOTKEY("SPC") ": ";
+static constexpr auto EDIT_HELP = ANSI_HOTKEY("ENTER") ": Edit";
+static constexpr auto TOGGLE_HELP = ANSI_HOTKEY("t") ": To ";
+static constexpr auto DELETE_HELP = ANSI_HOTKEY("D") ": Delete";
+static constexpr auto FILTERING_HELP = ANSI_HOTKEY("f") ": ";
+static constexpr auto JUMP_HELP = ANSI_HOTKEY("ENTER") ": Jump To";
+static constexpr auto CLOSE_HELP = ANSI_HOTKEY("X") ": Close";
 static constexpr auto FOCUS_DETAILS_HELP
     = ANSI_BOLD("CTRL-]") ": Focus on details view";
 
@@ -305,14 +306,17 @@ filter_help_status_source::statusview_fields()
             auto rows = fss->rows_for(tc);
             if (rows.empty()) {
                 this->fss_help.set_value(
-                    "  %s%s  %s",
+                    "  %s%s%s%s",
                     CREATE_HELP,
                     lss != nullptr ? CREATE_EXPR_HELP : "",
+                    lss != nullptr ? CREATE_LEVEL_HELP : "",
                     ttt != nullptr ? MIN_MAX_TIME_HELP : "");
             } else {
                 auto& row = rows[sel.value()];
                 auto* tfr = dynamic_cast<filter_sub_source::text_filter_row*>(
                     row.get());
+                auto* tir = dynamic_cast<filter_sub_source::time_filter_row*>(
+                    row.get());
                 if (editor->fss_editing) {
                     if (tfr != nullptr) {
                         auto& tf = tfr->tfr_filter;
@@ -333,17 +337,23 @@ filter_help_status_source::statusview_fields()
                                 "out:",
                                 lang);
                         }
-                    } else {
+                    } else if (tir != nullptr) {
                         this->fss_help.set_value(
                             "                           "
                             "Enter timestamp:");
+                    } else {
+                        this->fss_help.set_value(
+                            "                           "
+                            "Enter level:");
                     }
                 } else if (tfr != nullptr) {
                     auto& tf = tfr->tfr_filter;
                     this->fss_help.set_value(
-                        "  %s%s  %s%s  %s  %s%s  %s  %s%s",
+                        "  %s%s%s%s  %s%s  %s  %s%s  %s  %s%s",
                         CREATE_HELP,
                         lss != nullptr ? CREATE_EXPR_HELP : "",
+                        lss != nullptr ? CREATE_LEVEL_HELP : "",
+                        ttt != nullptr ? MIN_MAX_TIME_HELP : "",
                         ENABLE_HELP,
                         tf->is_enabled() ? "Disable" : "Enable ",
                         EDIT_HELP,
@@ -356,9 +366,11 @@ filter_help_status_source::statusview_fields()
                                                : "Enable Filtering");
                 } else {
                     this->fss_help.set_value(
-                        "  %s%s  %s  %s  %s%s",
+                        "  %s%s%s%s  %s  %s  %s%s",
                         CREATE_HELP,
                         lss != nullptr ? CREATE_EXPR_HELP : "",
+                        lss != nullptr ? CREATE_LEVEL_HELP : "",
+                        ttt != nullptr ? MIN_MAX_TIME_HELP : "",
                         EDIT_HELP,
                         DELETE_HELP,
                         FILTERING_HELP,

src/filter_sub_source.cc

@@ -36,11 +36,13 @@
 #include "base/attr_line.builder.hh"
 #include "base/auto_mem.hh"
 #include "base/func_util.hh"
+#include "base/itertools.hh"
 #include "base/opt_util.hh"
 #include "base/relative_time.hh"
 #include "base/text_format_enum.hh"
 #include "cmd.parser.hh"
 #include "config.h"
+#include "itertools.similar.hh"
 #include "lnav.hh"
 #include "lnav.prompt.hh"
 #include "readline_highlighters.hh"
@@ -158,6 +160,25 @@ filter_sub_source::list_input_handle_key(listview_curses& lv, const ncinput& ch)
             }
             return true;
         }
+        case 'l': {
+            auto* top_view = *lnav_data.ld_view_stack.top();
+            auto* tss = top_view->get_sub_source();
+            if (tss->get_min_log_level() == LEVEL_UNKNOWN) {
+                tss->set_min_log_level(LEVEL_TRACE);
+            }
+            const auto& [index, row]
+                = this->find_row<level_filter_row>(top_view);
+            lv.set_selection(index);
+            lv.reload_data();
+            this->fss_editing = true;
+            this->tss_view->set_enabled(false);
+            row->prime_text_input(top_view, *this->fss_editor, *this);
+            this->fss_editor->set_y(lv.get_y_for_selection());
+            this->fss_editor->set_visible(true);
+            this->fss_editor->focus();
+            this->tss_view->reload_data();
+            return true;
+        }
         case 'm': {
             auto* top_view = *lnav_data.ld_view_stack.top();
             auto* ttt = dynamic_cast<text_time_translator*>(
@@ -186,11 +207,10 @@ filter_sub_source::list_input_handle_key(listview_curses& lv, const ncinput& ch)
                     ttt->ttt_preview_min_time = this->fss_min_time;
                 }
 
-                lv.set_selection(0_vl);
+                const auto& [index, row]
+                    = this->find_row<min_time_filter_row>(top_view);
+                lv.set_selection(index);
                 lv.reload_data();
-
-                auto rows = this->rows_for(top_view);
-                auto& row = rows[0];
                 this->fss_editing = true;
                 this->tss_view->set_enabled(false);
                 row->prime_text_input(top_view, *this->fss_editor, *this);
@@ -230,12 +250,10 @@ filter_sub_source::list_input_handle_key(listview_curses& lv, const ncinput& ch)
                     ttt->ttt_preview_max_time = this->fss_max_time;
                 }
 
-                auto new_sel = ttt->get_min_row_time() ? 1_vl : 0_vl;
-                lv.set_selection(new_sel);
+                const auto& [index, row]
+                    = this->find_row<level_filter_row>(top_view);
+                lv.set_selection(index);
                 lv.reload_data();
-
-                auto rows = this->rows_for(top_view);
-                auto& row = rows[new_sel];
                 this->fss_editing = true;
                 this->tss_view->set_enabled(false);
                 row->prime_text_input(top_view, *this->fss_editor, *this);
@@ -670,6 +688,103 @@ filter_sub_source::min_time_filter_row::ti_abort(textview_curses* top_view,
     tss->text_filters_changed();
 }
 
+void
+filter_sub_source::level_filter_row::value_for(const render_state& rs,
+                                               attr_line_t& al)
+{
+    auto lev = rs.rs_top_view->get_sub_source()->get_min_log_level();
+
+    al.append("  ").append("Level"_table_header).append("  ");
+    if (rs.rs_editing) {
+        al.append(fmt::format(FMT_STRING("{:>9}"), "-"),
+                  VC_ROLE.value(role_t::VCR_NUMBER));
+    } else {
+        al.append(
+            fmt::format(
+                FMT_STRING("{:>9}"),
+                rs.rs_top_view->get_sub_source()->tss_level_filtered_count),
+            VC_ROLE.value(role_t::VCR_NUMBER));
+    }
+    al.append(" hits ")
+        .append("|", VC_GRAPHIC.value(NCACS_VLINE))
+        .append(" ")
+        .append(level_names[lev]);
+}
+
+bool
+filter_sub_source::level_filter_row::handle_key(textview_curses* top_view,
+                                                const ncinput& ch)
+{
+    switch (ch.eff_text[0]) {
+        case 'D':
+            top_view->get_sub_source()->set_min_log_level(LEVEL_UNKNOWN);
+            return true;
+    }
+    return false;
+}
+
+bool
+filter_sub_source::level_filter_row::prime_text_input(textview_curses* top_view,
+                                                      textinput_curses& ti,
+                                                      filter_sub_source& parent)
+{
+    auto* tss = top_view->get_sub_source();
+    auto lev = tss->get_min_log_level();
+    parent.fss_curr_level = lev;
+    tss->set_min_log_level(LEVEL_TRACE);
+    tss->text_filters_changed();
+    ti.set_content(level_names[lev].to_string());
+    ti.tc_selection
+        = ti.clamp_selection(textinput_curses::selected_range::from_mouse(
+            textinput_curses::input_point::home(),
+            textinput_curses::input_point::end()));
+    return true;
+}
+
+void
+filter_sub_source::level_filter_row::ti_change(textview_curses* top_view,
+                                               textinput_curses& rc)
+{
+    auto lev = rc.get_content();
+    top_view->get_sub_source()->tss_preview_min_log_level
+        = string2level(lev.c_str(), lev.size(), false);
+    this->ti_completion_request(
+        top_view, rc, completion_request_type_t::partial);
+}
+
+void
+filter_sub_source::level_filter_row::ti_completion_request(
+    textview_curses* top_view,
+    textinput_curses& tc,
+    completion_request_type_t crt)
+{
+    auto lev = tc.get_content();
+    auto poss = level_names | lnav::itertools::similar_to(lev)
+        | lnav::itertools::map([](const auto& elem) {
+                    return attr_line_t().append(elem).with_attr_for_all(
+                        lnav::prompt::SUBST_TEXT.value(elem.to_string()));
+                });
+    tc.open_popup_for_completion(0, poss);
+}
+
+void
+filter_sub_source::level_filter_row::ti_perform(textview_curses* top_view,
+                                                textinput_curses& tc,
+                                                filter_sub_source& parent)
+{
+    auto lev = tc.get_content();
+    auto new_level = string2level(lev.c_str(), lev.size(), false);
+    top_view->get_sub_source()->set_min_log_level(new_level);
+}
+
+void
+filter_sub_source::level_filter_row::ti_abort(textview_curses* top_view,
+                                              textinput_curses& tc,
+                                              filter_sub_source& parent)
+{
+    top_view->get_sub_source()->set_min_log_level(parent.fss_curr_level);
+}
+
 bool
 filter_sub_source::time_filter_row::prime_text_input(textview_curses* top_view,
                                                      textinput_curses& ti,
@@ -1227,6 +1342,10 @@ filter_sub_source::rows_for(textview_curses* tc) const
         }
     }
 
+    if (tss->get_min_log_level() != LEVEL_UNKNOWN) {
+        retval.emplace_back(std::make_unique<level_filter_row>());
+    }
+
     auto& fs = tss->get_filters();
     for (auto& tf : fs) {
         retval.emplace_back(std::make_unique<text_filter_row>(tf));