[indexing] dupe file check was always triggering text_filters_changed call

Related to #1531

Author: tstack

src/base/string_util.cc

@@ -443,9 +443,9 @@ char_escape_seq(char ch)
             return "\\t";
         case '\n':
             return "\\n";
+        default:
+            return std::nullopt;
     }
-
-    return std::nullopt;
 }
 
 std::string

src/lnav.cc

@@ -1795,12 +1795,13 @@ VALUES ('org.lnav.mouse-support', -1, DATETIME('now', '+1 minute'),
     auto next_status_update_time = next_rebuild_time;
     auto next_rescan_time = next_rebuild_time;
     auto got_user_input = true;
-    sig_atomic_t render_counter = 0;
+    auto loop_count = 0;
     std::vector<view_curses*> updated_views;
     updated_views.emplace_back(&lnav_data.ld_view_stack);
 
     while (lnav_data.ld_looping) {
         auto loop_deadline = ui_clock::now() + (session_stage == 0 ? 3s : 50ms);
+        loop_count += 1;
 
         std::vector<pollfd> pollfds;
         size_t starting_view_stack_size = lnav_data.ld_view_stack.size();
@@ -1829,8 +1830,9 @@ VALUES ('org.lnav.mouse-support', -1, DATETIME('now', '+1 minute'),
             {
                 initial_rescan_completed = true;
 
-                log_debug("initial rescan rebuild");
+                log_debug("%d: BEGIN initial rescan rebuild", loop_count);
                 auto rebuild_res = rebuild_indexes(loop_deadline);
+                log_debug("%d: END initial rescan rebuild", loop_count);
                 changes += rebuild_res.rir_changes;
                 load_session();
                 if (session_data.sd_save_time) {
@@ -1882,7 +1884,7 @@ VALUES ('org.lnav.mouse-support', -1, DATETIME('now', '+1 minute'),
                 lnav_data.ld_session_loaded = true;
                 session_stage += 1;
                 loop_deadline = ui_now;
-                log_debug("file count %d",
+                log_debug("initial rescan found %d files",
                           lnav_data.ld_active_files.fc_files.size());
             }
             auto old_gen = lnav_data.ld_active_files.fc_files_generation;
@@ -1940,6 +1942,8 @@ VALUES ('org.lnav.mouse-support', -1, DATETIME('now', '+1 minute'),
                     next_rebuild_time = ui_clock::now() + 333ms;
                 }
                 if (rebuild_res.rir_rescan_needed) {
+                    log_trace("%d: rebuild detected a rescan needed",
+                              loop_count);
                     rescan_needed = true;
                     next_rescan_time = loop_deadline = ui_now;
                 }
@@ -2313,7 +2317,7 @@ VALUES ('org.lnav.mouse-support', -1, DATETIME('now', '+1 minute'),
                            file_format_t::SQLITE_DB)
                         > 0))
             {
-                log_debug("initial build completed");
+                log_debug("%d: initial build completed", loop_count);
                 lnav_data.ld_initial_build = true;
             }
 
@@ -2373,7 +2377,7 @@ VALUES ('org.lnav.mouse-support', -1, DATETIME('now', '+1 minute'),
                             ->readAccess()
                             ->empty())
                     {
-                        log_info("switching to paging!");
+                        log_info("%d: switching to paging!", loop_count);
                         set_view_mode(ln_mode_t::PAGING);
                         lnav_data.ld_active_files.fc_files
                             | lnav::itertools::for_each(&logfile::dump_stats);
@@ -2383,6 +2387,7 @@ VALUES ('org.lnav.mouse-support', -1, DATETIME('now', '+1 minute'),
                         lnav_data.ld_files_view.set_selection(0_vl);
                     }
                 }
+                log_debug("%d: going interactive", loop_count);
                 session_stage += 1;
                 lnav_data.ld_exec_phase = lnav_exec_phase::INTERACTIVE;
                 load_time_bookmarks();

src/lnav.indexing.cc

@@ -349,7 +349,7 @@ rebuild_indexes(std::optional<ui_clock::time_point> deadline)
         {
             std::unordered_map<std::string, std::list<std::shared_ptr<logfile>>>
                 id_to_files;
-            bool reload = false;
+            auto reload = false;
 
             for (const auto& lf : lnav_data.ld_active_files.fc_files) {
                 id_to_files[lf->get_content_id()].push_back(lf);
@@ -366,21 +366,24 @@ rebuild_indexes(std::optional<ui_clock::time_point> deadline)
 
                 auto dupe_name = pair.second.front()->get_unique_path();
                 pair.second.pop_front();
-                for_each(pair.second.begin(),
-                         pair.second.end(),
-                         [&dupe_name](auto& lf) {
-                             if (lf->mark_as_duplicate(dupe_name)) {
-                                 log_info("Hiding duplicate file: %s",
-                                          lf->get_filename().c_str());
-                                 lnav_data.ld_log_source.find_data(lf) |
-                                     [](auto ld) { ld->set_visibility(false); };
-                             }
-                         });
-                reload = true;
+                std::for_each(pair.second.begin(),
+                              pair.second.end(),
+                              [&dupe_name, &reload](auto& lf) {
+                                  if (lf->mark_as_duplicate(dupe_name)) {
+                                      log_info("Hiding duplicate file: %s",
+                                               lf->get_filename().c_str());
+                                      lnav_data.ld_log_source.find_data(lf) |
+                                          [](auto ld) {
+                                              ld->set_visibility(false);
+                                          };
+                                      reload = true;
+                                  }
+                              });
             }
 
             if (reload) {
-                log_trace("text filters changed");
+                log_trace(
+                    "file visibility changed, calling text_filters_changed");
                 lss.text_filters_changed();
             }
         }

src/view_helpers.cc

@@ -118,9 +118,7 @@ view_from_string(const char* name)
     auto view_name_iter
         = std::find_if(std::begin(lnav_view_strings),
                        std::end(lnav_view_strings),
-                       [&](const auto& v) {
-                           return name_sf.iequal(v);
-                       });
+                       [&](const auto& v) { return name_sf.iequal(v); });
 
     if (view_name_iter == std::end(lnav_view_strings)) {
         return std::nullopt;
@@ -900,18 +898,21 @@ layout_views()
         vis = bottom.try_consume(filter_height + (config_panel_open ? 1 : 0)
                                  + (filters_supported ? 1 : 0));
     }
-    lnav_data.ld_filter_view.set_height(vis_line_t(filter_height));
+    lnav_data.ld_filter_view.set_height(
+        vis_line_t(filter_height) - (filters_supported ? 0_vl : 1_vl));
     lnav_data.ld_filter_view.set_y(bottom + 2);
     lnav_data.ld_filter_view.set_width(width);
     lnav_data.ld_filter_view.set_visible(filters_open && vis);
     filter_source->fss_editor->set_width(width - 26);
 
-    lnav_data.ld_files_view.set_height(vis_line_t(filter_height));
+    lnav_data.ld_files_view.set_height(
+        vis_line_t(filter_height) - (filters_supported ? 0_vl : 1_vl));
     lnav_data.ld_files_view.set_y(bottom + 2);
     lnav_data.ld_files_view.set_width(files_width);
     lnav_data.ld_files_view.set_visible(files_open && vis);
 
-    lnav_data.ld_file_details_view.set_height(vis_line_t(filter_height));
+    lnav_data.ld_file_details_view.set_height(
+        vis_line_t(filter_height) - (filters_supported ? 0_vl : 1_vl));
     lnav_data.ld_file_details_view.set_y(bottom + 2);
     lnav_data.ld_file_details_view.set_x(files_width);
     lnav_data.ld_file_details_view.set_width(