[stdin] dump stdin content if less than terminal height or marked

Author: tstack

NEWS.md

@@ -64,6 +64,13 @@ Features:
   to get/set the sticky state via SQL.  Sticky headers
   and user bookmarks are saved and restored across
   sessions for both log and text views.
+* In pager mode (activated by the `-q` flag), the input
+  will always be written to the terminal if it is
+  smaller than the height.  Previously, if the input
+  took awhile to generate, nothing would be written.
+  Also, when the input is larger than the terminal
+  height, any marked lines will be written to the
+  terminal.
 * Introducing "Log-Oriented Debugging", a collection of
   features to streamline mapping log messages back to
   the source code that generated them.  For example,
@@ -96,6 +103,10 @@ Features:
     breakpoints have been added, you can press `F7`/`F8`
     to move to the previous/next log message that
     matches a breakpoint.
+  - If the log format specifies source file/line fields,
+    the first character of the source file will be
+    underlined and can be clicked to open the source
+    file at the given log message.
 * The `all_opids` and `all_thread_ids` virtual tables
   have been added to make it simple to discover all of
   the operations and threads across all log files.  The

docs/source/usage.rst

@@ -235,8 +235,8 @@ to modify lnav's behavior to make it more amenable for this purpose:
 With this option, lnav will:
 
 * Not save the piped content after exiting.
-* Print the content to the screen if it is less than the height of the
-  terminal.
+* Print any marked lines to the screen OR all lines if the total
+  height is less than the terminal height.
 
 Searching
 ---------

src/bookmarks.hh

@@ -138,6 +138,11 @@ public:
         return retval;
     }
 
+    bool contains(LineType vl)
+    {
+        return this->bv_tree.find(vl) != this->bv_tree.end();
+    }
+
     std::pair<iterator, iterator> equal_range(LineType start, LineType stop)
     {
         auto lb = this->bv_tree.lower_bound(start);

src/cmds.scripting.cc

@@ -255,7 +255,7 @@ com_eval(exec_context& ec, std::string cmdline, std::vector<std::string>& args)
         log_debug("Expanded command to evaluate: %s", expanded_cmd.c_str());
 
         if (expanded_cmd.empty()) {
-            return ec.make_error("empty result after evaluation");
+            return Ok(retval);
         }
 
         if (ec.ec_dry_run) {

src/lnav.cc

@@ -4443,14 +4443,33 @@ SELECT tbl_name FROM sqlite_master WHERE sql LIKE 'CREATE VIRTUAL TABLE%'
             } else {
                 init_session();
 
-                guard_termios gt(STDIN_FILENO);
-                lnav_log_orig_termios = gt.get_termios();
+                {
+                    guard_termios gt(STDIN_FILENO);
+                    lnav_log_orig_termios = gt.get_termios();
+
+                    looper();
 
-                looper();
+                    dup2(STDOUT_FILENO, STDERR_FILENO);
 
-                dup2(STDOUT_FILENO, STDERR_FILENO);
+                    signal(SIGINT, SIG_DFL);
+                }
 
-                signal(SIGINT, SIG_DFL);
+                if (stdin_url && verbosity == verbosity_t::quiet) {
+                    auto& tc = lnav_data.ld_views[LNV_TEXT];
+                    auto& bv = tc.get_bookmarks()[&textview_curses::BM_USER];
+                    tc.tc_mark_style = std::nullopt;
+                    bool is_short = tc.get_inner_height() < term_size.ws_row - 3;
+                    if (is_short || !bv.empty()) {
+                        for (auto vl = 0_vl; vl < tc.get_inner_height(); ++vl) {
+                            if (!is_short && !bv.contains(vl)) {
+                                continue;
+                            }
+                            std::vector<attr_line_t> rows(1);
+                            tc.listview_value_for_rows(tc, vl, rows);
+                            write_line_to(stdout, rows[0]);
+                        }
+                    }
+                }
             }
 
             log_info("exiting main loop");

src/logfile_sub_source.cc

@@ -843,7 +843,7 @@ logfile_sub_source::text_attrs_for_line(textview_curses& lv,
         this->lss_token_al.al_attrs.emplace_back(lr,
                                                  VC_COMMAND.value(ui_command{
                                                      source_location{},
-                                                     ":toggle-breakpoint",
+                                                     "|lnav-open-source",
                                                  }));
     }
 

src/root-config.json

@@ -149,7 +149,7 @@
             "impls": {
                 "IntelliJ": {
                     "config-dir": ".idea",
-                    "prefers": "^.*(?:\\.java|\\.kt)$",
+                    "prefers": "^.*(?:\\.java|\\.kt|\\.py)$",
                     "test": "command -v idea",
                     "command": "idea --line ${LINE} --column ${COL} \"$FILE_PATH\""
                 },

src/scripts/lnav-open-source.lnav

@@ -0,0 +1,13 @@
+#
+# @synopsis: lnav-open-source
+# @description: Open the source file for the focused log message.
+#
+
+;SELECT jget(log_msg_src, '/file', NULL) AS file_path,
+        jget(log_msg_src, '/begin_line', NULL) AS begin_line
+   FROM lnav_focused_msg
+;SELECT raise_error('Unable to locate source file: ' || $file_path,
+                    'Use :add-source-path to add a source path.')
+  WHERE $file_path IS NULL
+;SELECT unparse_url(json_object('scheme', 'file', 'path', $file_path, 'fragment', format('L%d', $begin_line))) AS url
+:xopen $url

src/scripts/scripts.am

@@ -8,6 +8,7 @@ BUILTIN_LNAVSCRIPTS = \
     $(srcdir)/scripts/lnav-copy-text.lnav \
     $(srcdir)/scripts/lnav-link-callback.lnav \
     $(srcdir)/scripts/lnav-moveto-breakpoint.lnav \
+    $(srcdir)/scripts/lnav-open-source.lnav \
     $(srcdir)/scripts/lnav-pop-view.lnav \
     $(srcdir)/scripts/lnav-write-external-access-info-to.lnav \
     $(srcdir)/scripts/partition-by-boot.lnav \