[timeline] try a different approach with header

Author: tstack

NEWS.md

@@ -132,6 +132,14 @@ Interface changes:
 * The `}` hotkey and `:next-section` command will now
   move to the next log message if the focused line is
   in the middle of a multi-line message.
+* The TIMELINE view header has been redesigned to be
+  one line that shows the time increments at the
+  current scale.  This approach should more clearly
+  convey the spans of time shown in the main part of the
+  view.  The previous design tried to show the overall
+  time and the current time frame.  But, the multi-line
+  header was hard to interpret and didn't make it clear
+  how large the time increments were.
 
 Bug Fixes:
 * If a file path contains a hash (`#`), check if the path

src/archive_manager.cc

@@ -268,7 +268,7 @@ extract(const std::string& filename, const extract_cb& cb)
     if (fs::exists(done_path)) {
         size_t file_count = 0;
         if (fs::is_directory(tmp_path)) {
-            for (const auto& entry : fs::directory_iterator(tmp_path)) {
+            for (const auto& entry : fs::directory_iterator(tmp_path, ec)) {
                 (void) entry;
                 file_count += 1;
             }
@@ -415,9 +415,10 @@ cleanup_cache()
             auto cache_path = archive_cache_path();
             const auto& cfg = injector::get<const config&>();
             std::vector<fs::path> to_remove;
+            std::error_code ec;
 
             log_debug("cache-ttl %d", cfg.amc_cache_ttl.count());
-            for (const auto& entry : fs::directory_iterator(cache_path)) {
+            for (const auto& entry : fs::directory_iterator(cache_path, ec)) {
                 if (entry.path().extension() != ".done") {
                     continue;
                 }

src/base/humanize.time.cc

@@ -151,24 +151,31 @@ duration::to_string() const
 
     const auto* curr_interval = intervals;
     auto usecs = to_us(this->d_timeval);
-    auto millis = std::chrono::ceil<std::chrono::milliseconds>(usecs);
     std::string retval;
     bool neg = false;
 
-    if (millis < 0s) {
+    if (usecs == 0us) {
+        return retval;
+    }
+
+    if (usecs < 0s) {
         neg = true;
-        millis = -millis;
+        usecs = -usecs;
+    }
+
+    if (usecs < 1ms) {
+        return fmt::format(FMT_STRING("{}us"), usecs.count());
     }
 
-    uint64_t remaining = millis.count();
+    uint64_t remaining = usecs.count() / 1000;
     uint64_t scale = 1;
     if (this->d_msecs_resolution > 0) {
         remaining = roundup(remaining, this->d_msecs_resolution);
     }
-    if (millis >= 10min) {
+    if (usecs >= 10min) {
         remaining /= curr_interval->length;
         scale *= curr_interval->length;
-        curr_interval += 1;
+        ++curr_interval;
     }
 
     for (; curr_interval != std::end(intervals); curr_interval++) {

src/base/humanize.time.hh

@@ -30,6 +30,7 @@
 #ifndef lnav_humanize_time_hh
 #define lnav_humanize_time_hh
 
+#include <chrono>
 #include <optional>
 #include <string>
 
@@ -78,7 +79,7 @@ public:
         return *this;
     }
 
-    std::string to_string() const;
+    [[nodiscard]] std::string to_string() const;
 
 private:
     explicit duration(const timeval& tv) : d_timeval(tv) {}

src/file_converter_manager.cc

@@ -161,9 +161,10 @@ cleanup()
             auto now = std::filesystem::file_time_type::clock::now();
             auto cache_path = cache_dir();
             std::vector<std::filesystem::path> to_remove;
+            std::error_code ec;
 
             for (const auto& entry :
-                 std::filesystem::directory_iterator(cache_path))
+                 std::filesystem::directory_iterator(cache_path, ec))
             {
                 auto mtime = std::filesystem::last_write_time(entry.path());
                 auto exp_time = mtime + cfg.c_ttl;
@@ -176,7 +177,10 @@ cleanup()
 
             for (auto& entry : to_remove) {
                 log_debug("removing conversion: %s", entry.c_str());
-                std::filesystem::remove_all(entry);
+                std::filesystem::remove_all(entry, ec);
+                if (ec) {
+                    log_error("  failed to remove: %s", ec.message().c_str());
+                }
             }
         });
 }

src/piper.looper.cc

@@ -876,9 +876,10 @@ cleanup()
             const auto now = std::filesystem::file_time_type::clock::now();
             const auto& cache_path = storage_path();
             std::vector<std::filesystem::path> to_remove;
+            std::error_code ec;
 
             for (const auto& cache_subdir :
-                 std::filesystem::directory_iterator(cache_path))
+                 std::filesystem::directory_iterator(cache_path, ec))
             {
                 auto mtime
                     = std::filesystem::last_write_time(cache_subdir.path());
@@ -890,7 +891,7 @@ cleanup()
                 bool is_recent = false;
 
                 for (const auto& entry :
-                     std::filesystem::directory_iterator(cache_subdir))
+                     std::filesystem::directory_iterator(cache_subdir, ec))
                 {
                     auto mtime = std::filesystem::last_write_time(entry.path());
                     auto exp_time = mtime + cfg.c_ttl;

src/tailer/tailer.looper.cc

@@ -1197,10 +1197,11 @@ tailer::cleanup_cache()
             auto cache_path = remote_cache_path();
             const auto& cfg = injector::get<const config&>();
             std::vector<std::filesystem::path> to_remove;
+            std::error_code ec;
 
             log_debug("cache-ttl %d", cfg.c_cache_ttl.count());
             for (const auto& entry :
-                 std::filesystem::directory_iterator(cache_path))
+                 std::filesystem::directory_iterator(cache_path, ec))
             {
                 auto mtime = std::filesystem::last_write_time(entry.path());
                 auto exp_time = mtime + cfg.c_cache_ttl;