[timeline] add bookmarks for files

Author: tstack

src/base/lnav.console.cc

@@ -28,12 +28,17 @@
  */
 
 #include <algorithm>
+#include <set>
 
 #include "lnav.console.hh"
 
+#include <stdio.h>
+#include <stdlib.h>
+
 #include "color_spaces.hh"
 #include "config.h"
 #include "fmt/color.h"
+#include "fmt/format.h"
 #include "itertools.hh"
 #include "lnav.console.into.hh"
 #include "lnav_log.hh"

src/hotkeys.cc

@@ -311,7 +311,9 @@ DELETE FROM lnav_user_notifications WHERE id = 'org.lnav.mouse-support'
             break;
 
         case 'f':
-            if (tc == &lnav_data.ld_views[LNV_LOG]) {
+            if (tc == &lnav_data.ld_views[LNV_LOG]
+                || tc == &lnav_data.ld_views[LNV_TIMELINE])
+            {
                 bm[&logfile_sub_source::BM_FILES].next(
                     tc->get_selection().value_or(0_vl))
                     | [&tc](auto vl) { tc->set_selection(vl); };
@@ -326,7 +328,8 @@ DELETE FROM lnav_user_notifications WHERE id = 'org.lnav.mouse-support'
             break;
 
         case 'F':
-            if (tc == &lnav_data.ld_views[LNV_LOG]) {
+            if (tc == &lnav_data.ld_views[LNV_LOG]
+                || tc == &lnav_data.ld_views[LNV_TIMELINE]) {
                 bm[&logfile_sub_source::BM_FILES].prev(
                     tc->get_selection().value_or(0_vl))
                     | [&tc](auto vl) {

src/timeline_source.cc

@@ -63,7 +63,7 @@ static const std::vector<std::chrono::microseconds> TIME_SPANS = {
 
 static constexpr size_t MAX_OPID_WIDTH = 80;
 static constexpr size_t MAX_DESC_WIDTH = 256;
-static constexpr int CHART_INDENT = 22;
+static constexpr int CHART_INDENT = 24;
 
 size_t
 abbrev_ftime(char* datebuf, size_t db_size, const tm& lb_tm, const tm& dt)
@@ -640,7 +640,7 @@ timeline_source::text_attrs_for_line(textview_curses& tc,
 
             if (width > CHART_INDENT) {
                 width -= CHART_INDENT;
-                double span = (sel_ub - sel_lb).count();
+                const double span = (sel_ub - sel_lb).count();
                 auto us_per_ch = std::chrono::microseconds{
                     static_cast<int64_t>(ceil(span / (double) width))};
 
@@ -692,6 +692,7 @@ timeline_source::rebuild_indexes()
 
     auto op_guard = lnav_opid_guard::internal(op);
     auto& bm = this->tss_view->get_bookmarks();
+    auto& bm_files = bm[&logfile_sub_source::BM_FILES];
     auto& bm_errs = bm[&textview_curses::BM_ERRORS];
     auto& bm_warns = bm[&textview_curses::BM_WARNINGS];
 
@@ -982,6 +983,9 @@ timeline_source::rebuild_indexes()
         [](const auto* lhs, const auto* rhs) { return *lhs < *rhs; });
     for (size_t lpc = 0; lpc < this->gs_time_order.size(); lpc++) {
         const auto& row = *this->gs_time_order[lpc];
+        if (row.or_type == row_type::logfile) {
+            bm_files.insert_once(vis_line_t(lpc));
+        }
         if (row.or_value.otr_level_stats.lls_error_count > 0) {
             bm_errs.insert_once(vis_line_t(lpc));
         } else if (row.or_value.otr_level_stats.lls_warning_count > 0) {

test/expected/Makefile.am

@@ -1702,6 +1702,8 @@ dist_noinst_DATA = \
     test_text_file.sh_f7522b0a99550a3ff91aae6582eb861547c535e1.out \
     test_timeline.sh_070a540e6ae8971dec18b4b69dee2e550a1db20e.err \
     test_timeline.sh_070a540e6ae8971dec18b4b69dee2e550a1db20e.out \
+    test_timeline.sh_074ace0108a86fcf43408193a318587b85a181ab.err \
+    test_timeline.sh_074ace0108a86fcf43408193a318587b85a181ab.out \
     test_timeline.sh_0b9d98b7ae18fc6bb61ddff4e698b365c8352723.err \
     test_timeline.sh_0b9d98b7ae18fc6bb61ddff4e698b365c8352723.out \
     test_timeline.sh_18f6dd738d8daece3db6e25e99322209dea604af.err \

test/expected/test_timeline.sh_074ace0108a86fcf43408193a318587b85a181ab.err

@@ -0,0 +1,4 @@
+   Duration   | ✘▲ | Item         | 241d    | 481d    | 721d    | 961d    |1201d
+         3s000  ▂   📄 logfile_access_log.0            
+                █      03b4b515f3b3961f576c3b49f83194cf 10.112.81.15 
+                █   📄 logfile_access_log.1            

test/expected/test_timeline.sh_074ace0108a86fcf43408193a318587b85a181ab.out

@@ -1,4 +1,4 @@
-   Duration   | ✘▲ | Item       |  614    |1s229    |1s844    |2s459    |3s073    |3s688    |4s303    |4s918    |5s532    |6s147    |6s762    |7s377
-      2m15s609   ▂  🧵                                 
-      2m15s609   ▂  📄 caddy                           
+   Duration   | ✘▲ | Item         |  625    |1s250    |1s875    |2s500    |3s125    |3s750    |4s375    |5s000    |5s625    |6s250    |6s875
+      2m15s609   ▂  🧵                                 
+      2m15s609   ▂  📄 caddy                           
       2m09s311         f468d0fb9dcc7d8c6a1c40a203564946 172.19.0.1 Mozilla/5.0 (X11; Ubuntu; Linux x86_64; rv:142.0) Gecko/20100101 Firefox/142.0