[reltime] handle "an hour before now"

Author: tstack

src/cmds.filtering.cc

@@ -97,6 +97,15 @@ com_hide_line(exec_context& ec,
         } else if (dts.convert_to_timeval(all_args, tv_abs)) {
             tv_opt = tv_abs;
         } else {
+            auto pe = parse_res.unwrapErr();
+            if (!pe.pe_msg.empty()) {
+                auto msg
+                    = lnav::console::user_message::error(
+                          attr_line_t("invalid time value: ").append(all_args))
+                          .with_reason(pe.pe_msg);
+                return Err(msg);
+            }
+
             return ec.make_error(FMT_STRING("invalid time value: {}"),
                                  all_args);
         }

src/relative_time.cc

@@ -345,7 +345,11 @@ relative_time::from_str(string_fragment str)
                     gettimeofday(&tv, nullptr);
                     localtime_r(&tv.tv_sec, &tm.et_tm);
                     tm.et_nsec = tv.tv_usec * 1000;
+                    if (base_token == RTT_BEFORE) {
+                        retval.negate();
+                    }
                     tm = retval.adjust(tm);
+                    base_token = RTT_INVALID;
 
                     retval.rt_field[RTF_YEARS] = tm.et_tm.tm_year;
                     retval.rt_field[RTF_MONTHS] = tm.et_tm.tm_mon;

src/session_data.cc

@@ -50,6 +50,7 @@
 #include "hasher.hh"
 #include "lnav.events.hh"
 #include "lnav.hh"
+#include "lnav.indexing.hh"
 #include "log_format_ext.hh"
 #include "logfile.hh"
 #include "service_tags.hh"
@@ -1801,7 +1802,7 @@ reset_session()
     lnav_data.ld_log_source.set_sql_filter("", nullptr);
     lnav_data.ld_log_source.set_sql_marker("", nullptr);
     lnav_data.ld_log_source.clear_bookmark_metadata();
-    lnav_data.ld_log_source.rebuild_index();
+    rebuild_indexes(std::nullopt);
 
     lnav_data.ld_db_row_source.reset_user_state();
 

test/expected/test_cmds.sh_69bd25462cab0136f3c8195008568598f6f0e48c.err

@@ -1,4 +1,5 @@
 ✘ error: invalid time value: badbadbad
+ reason: Unrecognized input
  --> command-option:1
  | :hide-lines-before badbadbad            
  = help: :hide-lines-before date

test/test_reltime.cc

@@ -91,6 +91,26 @@ static struct {
 
 TEST_CASE("reltime")
 {
+    setenv("TZ", "UTC", 1);
+
+    {
+        auto rt_res = relative_time::from_str(
+            string_fragment::from_const("an hour before now"));
+
+        if (rt_res.isErr()) {
+            auto err = rt_res.unwrapErr();
+            fprintf(stderr, "error %s\n", err.pe_msg.c_str());
+        }
+
+        CHECK(rt_res.isOk());
+        auto rt = rt_res.unwrap();
+
+        auto now_tv = current_timeval();
+        auto ago_tv = rt.to_timeval();
+        auto diff = now_tv - ago_tv;
+        CHECK(diff.tv_sec == (60 * 60));
+    }
+
     {
         auto tv = timeval{1690440588, 0};
         auto parse_res = relative_time::from_str(