[hist] add month/year zoom levels

tstack · tstack · commit 9aec963a260f · 2025-11-18T07:02:10.000-08:00
Related to #1587
diff --git a/src/hotkeys.cc b/src/hotkeys.cc
@@ -349,21 +349,29 @@ DELETE FROM lnav_user_notifications WHERE id = 'org.lnav.mouse-support'
             if ((lnav_data.ld_zoom_level - 1) < 0) {
                 alerter::singleton().chime("maximum zoom-in level reached");
             } else {
-                ec.execute(INTERNAL_SRC_LOC,
-                           fmt::format(
-                               FMT_STRING(":zoom-to {}"),
-                               lnav_zoom_strings[lnav_data.ld_zoom_level - 1]));
+                auto res = ec.execute(
+                    INTERNAL_SRC_LOC,
+                    fmt::format(
+                        FMT_STRING(":zoom-to {}"),
+                        lnav_zoom_strings[lnav_data.ld_zoom_level - 1]));
+                if (res.isOk()) {
+                    prompt.p_editor.set_inactive_value(res.unwrap());
+                }
             }
             break;
 
         case 'Z':
             if ((lnav_data.ld_zoom_level + 1) >= ZOOM_COUNT) {
                 alerter::singleton().chime("maximum zoom-out level reached");
             } else {
-                ec.execute(INTERNAL_SRC_LOC,
-                           fmt::format(
-                               FMT_STRING(":zoom-to {}"),
-                               lnav_zoom_strings[lnav_data.ld_zoom_level + 1]));
+                auto res = ec.execute(
+                    INTERNAL_SRC_LOC,
+                    fmt::format(
+                        FMT_STRING(":zoom-to {}"),
+                        lnav_zoom_strings[lnav_data.ld_zoom_level + 1]));
+                if (res.isOk()) {
+                    prompt.p_editor.set_inactive_value(res.unwrap());
+                }
             }
             break;
 
diff --git a/src/lnav_commands.cc b/src/lnav_commands.cc
@@ -107,6 +107,8 @@ constexpr std::chrono::microseconds ZOOM_LEVELS[] = {
     8h,
     24h,
     7 * 24h,
+    30 * 24h,
+    365 * 24h,
 };
 
 constexpr std::array<string_fragment, ZOOM_COUNT> lnav_zoom_strings = {
@@ -120,6 +122,8 @@ constexpr std::array<string_fragment, ZOOM_COUNT> lnav_zoom_strings = {
     "8-hour"_frag,
     "1-day"_frag,
     "1-week"_frag,
+    "1-month"_frag,
+    "1-year"_frag,
 };
 
 inline attr_line_t&
@@ -2232,71 +2236,76 @@ com_zoom_to(exec_context& ec,
             std::vector<std::string>& args)
 {
     std::string retval;
+    std::optional<int> zoom_level;
 
-    if (ec.ec_dry_run) {
-    } else if (args.size() > 1) {
-        bool found = false;
-
-        for (size_t lpc = 0; lpc < lnav_zoom_strings.size() && !found; lpc++) {
-            if (lnav_zoom_strings[lpc].iequal(args[1])) {
-                auto& ss = *lnav_data.ld_spectro_source;
-                timeval old_time;
-
-                lnav_data.ld_zoom_level = lpc;
-
-                auto& hist_view = lnav_data.ld_views[LNV_HISTOGRAM];
-
-                if (hist_view.get_inner_height() > 0) {
-                    auto old_time_opt = lnav_data.ld_hist_source2.time_for_row(
-                        lnav_data.ld_views[LNV_HISTOGRAM].get_top());
-                    if (old_time_opt) {
-                        old_time = old_time_opt.value().ri_time;
-                        rebuild_hist();
-                        lnav_data.ld_hist_source2.row_for_time(old_time) |
-                            [](auto new_top) {
-                                lnav_data.ld_views[LNV_HISTOGRAM].set_top(
-                                    new_top);
-                            };
-                    }
-                }
-
-                auto& spectro_view = lnav_data.ld_views[LNV_SPECTRO];
-
-                if (spectro_view.get_inner_height() > 0) {
-                    auto old_time_opt
-                        = lnav_data.ld_spectro_source->time_for_row(
-                            lnav_data.ld_views[LNV_SPECTRO]
-                                .get_selection()
-                                .value_or(0_vl));
-                    ss.ss_granularity = ZOOM_LEVELS[lnav_data.ld_zoom_level];
-                    ss.invalidate();
-                    spectro_view.reload_data();
-                    if (old_time_opt) {
-                        lnav_data.ld_spectro_source->row_for_time(
-                            old_time_opt.value().ri_time)
-                            | [](auto new_top) {
-                                  lnav_data.ld_views[LNV_SPECTRO].set_selection(
-                                      new_top);
-                              };
-                    }
-                }
+    if (args.size() == 1) {
+        auto um = lnav::console::user_message::error("expecting a zoom level")
+                      .with_snippets(ec.ec_source)
+                      .with_help(attr_line_t("available levels: ")
+                                     .join(lnav_zoom_strings, ", "))
+                      .move();
+        return Err(um);
+    }
 
-                lnav_data.ld_view_stack.set_needs_update();
+    for (size_t lpc = 0; lpc < lnav_zoom_strings.size() && !zoom_level; lpc++) {
+        if (lnav_zoom_strings[lpc].iequal(args[1])) {
+            zoom_level = lpc;
+        }
+    }
 
-                found = true;
+    if (!zoom_level) {
+        auto um = lnav::console::user_message::error(
+                      attr_line_t("invalid zoom level: ")
+                          .append(lnav::roles::symbol(args[1])))
+                      .with_snippets(ec.ec_source)
+                      .with_help(attr_line_t("available levels: ")
+                                     .join(lnav_zoom_strings, ", "))
+                      .move();
+        return Err(um);
+    }
+    if (!ec.ec_dry_run) {
+        auto& ss = *lnav_data.ld_spectro_source;
+        timeval old_time;
+
+        lnav_data.ld_zoom_level = zoom_level.value();
+
+        auto& hist_view = lnav_data.ld_views[LNV_HISTOGRAM];
+
+        if (hist_view.get_inner_height() > 0) {
+            auto old_time_opt = lnav_data.ld_hist_source2.time_for_row(
+                lnav_data.ld_views[LNV_HISTOGRAM].get_top());
+            if (old_time_opt) {
+                old_time = old_time_opt.value().ri_time;
+                rebuild_hist();
+                lnav_data.ld_hist_source2.row_for_time(old_time) |
+                    [](auto new_top) {
+                        lnav_data.ld_views[LNV_HISTOGRAM].set_top(new_top);
+                    };
             }
         }
 
-        if (!found) {
-            auto um = lnav::console::user_message::error(
-                          attr_line_t("invalid zoom level: ")
-                              .append(lnav::roles::symbol(args[1])))
-                          .with_snippets(ec.ec_source)
-                          .with_help(attr_line_t("available levels: ")
-                                         .join(lnav_zoom_strings, ", "))
-                          .move();
-            return Err(um);
+        auto& spectro_view = lnav_data.ld_views[LNV_SPECTRO];
+
+        if (spectro_view.get_inner_height() > 0) {
+            auto old_time_opt = lnav_data.ld_spectro_source->time_for_row(
+                lnav_data.ld_views[LNV_SPECTRO].get_selection().value_or(0_vl));
+            ss.ss_granularity = ZOOM_LEVELS[lnav_data.ld_zoom_level];
+            ss.invalidate();
+            spectro_view.reload_data();
+            if (old_time_opt) {
+                lnav_data.ld_spectro_source->row_for_time(
+                    old_time_opt.value().ri_time)
+                    |
+                    [](auto new_top) {
+                        lnav_data.ld_views[LNV_SPECTRO].set_selection(new_top);
+                    };
+            }
         }
+
+        lnav_data.ld_view_stack.set_needs_update();
+
+        retval = fmt::format(FMT_STRING("info: set zoom-level to {}"),
+                             lnav_zoom_strings[zoom_level.value()]);
     }
 
     return Ok(retval);
diff --git a/src/lnav_commands.hh b/src/lnav_commands.hh
@@ -69,7 +69,7 @@ std::optional<std::string> find_arg(std::vector<std::string>& args,
 
 bookmark_vector<vis_line_t> combined_user_marks(vis_bookmarks& vb);
 
-constexpr ssize_t ZOOM_COUNT = 10;
+constexpr ssize_t ZOOM_COUNT = 12;
 extern const std::chrono::microseconds ZOOM_LEVELS[ZOOM_COUNT];
 
 extern const std::array<string_fragment, ZOOM_COUNT> lnav_zoom_strings;
diff --git a/test/expected/test_cmds.sh_6e016c0ed61fc652be1a79b864875ffede64f281.err b/test/expected/test_cmds.sh_6e016c0ed61fc652be1a79b864875ffede64f281.err
@@ -1,4 +1,4 @@
 [1m[31m✘[0m [1m[31merror[0m: invalid zoom level: [1mbad[0m
 [36m --> [0m[1mcommand-option[0m:1
 [36m | [0m[37m[40m:[0m[1m[36m[40mzoom-to[0m[37m[40m bad                            [0m
-[36m =[0m [36mhelp[0m: available levels: 1-second, 30-second, 1-minute, 5-minute, 15-minute, 1-hour, 4-hour, 8-hour, 1-day, 1-week
+[36m =[0m [36mhelp[0m: available levels: 1-second, 30-second, 1-minute, 5-minute, 15-minute, 1-hour, 4-hour, 8-hour, 1-day, 1-week, 1-month, 1-year
diff --git a/test/expected/test_cmds.sh_b6a3bb78e9d60e5e1f5ce5b18e40d2f1662707ab.out b/test/expected/test_cmds.sh_b6a3bb78e9d60e5e1f5ce5b18e40d2f1662707ab.out
@@ -2046,7 +2046,7 @@ For support questions, email:
   Zoom the histogram view to the given level
 [4mParameter[0m
   [4mzoom-level[0m   The zoom level
-               [4mValues[0m: [1m1-second[0m|[1m30-second[0m|[1m1-minute[0m|[1m5-minute[0m|[1m15-minute[0m|[1m1-hour[0m|[1m4-hour[0m|[1m8-hour[0m|[1m1-day[0m|[1m1-week[0m
+               [4mValues[0m: [1m1-second[0m|[1m30-second[0m|[1m1-minute[0m|[1m5-minute[0m|[1m15-minute[0m|[1m1-hour[0m|[1m4-hour[0m|[1m8-hour[0m|[1m1-day[0m|[1m1-week[0m|[1m1-month[0m|[1m1-year[0m
 
 [4mExample[0m
 #1 To set the zoom level to '1-week':

-Original file line number
+Diff line change
@@ @@ -1,4 +1,4 @@ @@
 [1m[31m✘[0m [1m[31merror[0m: invalid zoom level: [1mbad[0m
 [36m --> [0m[1mcommand-option[0m:1
 [36m | [0m[37m[40m:[0m[1m[36m[40mzoom-to[0m[37m[40m bad                            [0m
 -[36m =[0m [36mhelp[0m: available levels: 1-second, 30-second, 1-minute, 5-minute, 15-minute, 1-hour, 4-hour, 8-hour, 1-day, 1-week
 +[36m =[0m [36mhelp[0m: available levels: 1-second, 30-second, 1-minute, 5-minute, 15-minute, 1-hour, 4-hour, 8-hour, 1-day, 1-week, 1-month, 1-year
-Original file line number
+Diff line change
   Zoom the histogram view to the given level
 [4mParameter[0m
   [4mzoom-level[0m   The zoom level
 -               [4mValues[0m: [1m1-second[0m|[1m30-second[0m|[1m1-minute[0m|[1m5-minute[0m|[1m15-minute[0m|[1m1-hour[0m|[1m4-hour[0m|[1m8-hour[0m|[1m1-day[0m|[1m1-week[0m
 +               [4mValues[0m: [1m1-second[0m|[1m30-second[0m|[1m1-minute[0m|[1m5-minute[0m|[1m15-minute[0m|[1m1-hour[0m|[1m4-hour[0m|[1m8-hour[0m|[1m1-day[0m|[1m1-week[0m|[1m1-month[0m|[1m1-year[0m
 [4mExample[0m
 #1 To set the zoom level to '1-week':