[file_collection] recursive watch should inherit time range

Author: tstack

src/file_collection.cc

@@ -356,7 +356,8 @@ file_collection::watch_logfile(const std::string& filename,
                     wilddir,
                     logfile_open_options()
                         .with_non_utf_visibility(false)
-                        .with_visible_size_limit(256 * 1024));
+                        .with_visible_size_limit(256 * 1024)
+                        .with_time_range(loo.loo_time_range));
                 return lnav::futures::make_ready_future(std::move(retval));
             }
             return std::nullopt;
@@ -424,9 +425,6 @@ file_collection::watch_logfile(const std::string& filename,
             return std::nullopt;
         }
 
-        log_trace("wtf %d %d",
-                  this->fc_files.size(),
-                  this->fc_files_high_mark.value_or(0));
         if (this->fc_files_high_mark
             && this->fc_files.size() >= this->fc_files_high_mark.value())
         {

src/logfile.cc

@@ -395,7 +395,7 @@ void
 logfile::build_content_map(const struct stat& st)
 {
     this->lf_content_map.clear();
-    this->lf_file_size_at_map_time = st.st_size;
+    this->lf_file_size_at_map_time = this->lf_index_size;
 
     if (this->lf_index_size == this->get_content_size()) {
         log_trace("%s: file has already been scanned, no need to peek",
@@ -1595,7 +1595,7 @@ logfile::rebuild_index(std::optional<ui_clock::time_point> deadline)
         if (this->lf_format != nullptr
             && (this->lf_index.size() >= RETRY_MATCH_SIZE
                 || this->lf_index_size == this->get_content_size())
-            && this->lf_file_size_at_map_time != st.st_size)
+            && this->lf_file_size_at_map_time != this->lf_index_size)
         {
             this->build_content_map(st);
         }

src/logfile_sub_source.cc

@@ -911,6 +911,7 @@ logfile_sub_source::rebuild_index(std::optional<ui_clock::time_point> deadline)
         log_debug("forced to full rebuild");
         retval = rebuild_result::rr_full_rebuild;
         full_sort = true;
+        this->lss_index.clear();
     }
 
     std::vector<size_t> file_order(this->lss_files.size());

src/logfile_sub_source.hh

@@ -463,6 +463,9 @@ public:
         {
             this->ld_filter_state.lfo_filter_state.tfs_logfile = lf;
             this->ld_file_ptr = lf.get();
+            this->ld_lines_indexed = 0;
+            this->ld_lines_watched = 0;
+            this->ld_visible = lf->is_indexing();
             lf->set_logline_observer(&this->ld_filter_state);
         }