[session] do not clear format-provided tags/partitions when resetting

Author: tstack

src/logfile_sub_source.cc

@@ -3239,7 +3239,32 @@ logfile_sub_source::clear_bookmark_metadata()
             continue;
         }
 
-        ld->get_file_ptr()->get_bookmark_metadata().clear();
+        auto& bm_map = ld->get_file_ptr()->get_bookmark_metadata();
+        auto iter = bm_map.begin();
+        while (iter != bm_map.end()) {
+            auto& meta = iter->second;
+            meta.bm_comment.clear();
+            meta.bm_annotations.la_pairs.clear();
+            meta.bm_opid.clear();
+            if (meta.bm_name_source == bookmark_metadata::meta_source::user) {
+                meta.bm_name.clear();
+            }
+            auto tag_iter = meta.bm_tags.begin();
+            while (tag_iter != meta.bm_tags.end()) {
+                if (tag_iter->te_source
+                    == bookmark_metadata::meta_source::user)
+                {
+                    tag_iter = meta.bm_tags.erase(tag_iter);
+                } else {
+                    ++tag_iter;
+                }
+            }
+            if (meta.empty(bookmark_metadata::categories::any)) {
+                iter = bm_map.erase(iter);
+            } else {
+                ++iter;
+            }
+        }
     }
 }
 

src/session_data.cc

@@ -2364,19 +2364,17 @@ reset_session()
     }
 
     for (auto& tc : lnav_data.ld_views) {
-        text_sub_source* tss = tc.get_sub_source();
+        auto* tss = tc.get_sub_source();
 
         if (tss == nullptr) {
             continue;
         }
         tss->get_filters().clear_filters();
         tss->tss_apply_filters = true;
-        tss->text_filters_changed();
         tss->text_clear_marks(&textview_curses::BM_USER);
         tc.get_bookmarks()[&textview_curses::BM_USER].clear();
-        tss->text_clear_marks(&textview_curses::BM_META);
-        tc.get_bookmarks()[&textview_curses::BM_META].clear();
         tc.get_bookmarks()[&textview_curses::BM_STICKY].clear();
+        tss->text_filters_changed();
         tc.reload_data();
     }
 

test/expected/Makefile.am

@@ -748,6 +748,8 @@ dist_noinst_DATA = \
     test_sessions.sh_42c75e0d5f674a3df5251e7cd1a9f950d592a2c8.out \
     test_sessions.sh_430b9522ba1a37983138f3c4935cba91b781e415.err \
     test_sessions.sh_430b9522ba1a37983138f3c4935cba91b781e415.out \
+    test_sessions.sh_446d4b5105468c36d595f5ea696eac1e550016f7.err \
+    test_sessions.sh_446d4b5105468c36d595f5ea696eac1e550016f7.out \
     test_sessions.sh_4b353754b96aa93f7c5053697e3e0564721454d5.err \
     test_sessions.sh_4b353754b96aa93f7c5053697e3e0564721454d5.out \
     test_sessions.sh_4f13dd3858546b6e04a27e244159d355e368f2ae.err \

test/expected/test_sessions.sh_446d4b5105468c36d595f5ea696eac1e550016f7.err

@@ -0,0 +1,59 @@
+log_line,log_part
+24,10.1.10.103
+25,10.1.10.103
+26,10.1.10.103
+27,10.1.10.103
+28,10.1.10.103
+29,10.1.10.103
+30,10.1.10.103
+31,10.1.10.103
+32,10.1.10.103
+33,10.1.10.103
+34,10.1.10.103
+35,10.1.10.103
+36,10.1.10.103
+37,10.1.10.103
+38,10.1.10.103
+39,10.1.10.103
+40,10.1.10.103
+41,10.1.10.103
+42,10.1.10.103
+43,10.1.10.103
+44,10.1.10.103
+45,10.1.10.103
+46,10.1.10.103
+47,10.1.10.103
+48,10.1.10.103
+49,10.1.10.103
+50,10.1.10.103
+51,10.1.10.103
+52,10.1.10.103
+53,10.1.10.103
+54,10.1.10.103
+55,10.1.10.103
+56,10.1.10.103
+57,10.1.10.103
+58,10.1.10.103
+59,10.1.10.103
+60,10.1.10.103
+61,10.1.10.103
+62,10.1.10.103
+63,10.1.10.103
+64,10.1.10.103
+65,10.1.10.103
+66,10.1.10.103
+67,10.1.10.62
+68,10.1.10.62
+69,10.1.10.62
+70,10.1.10.62
+71,10.1.10.62
+72,10.1.10.62
+73,10.1.10.62
+74,10.1.10.62
+75,10.1.10.62
+76,10.1.10.62
+77,10.1.10.62
+78,10.1.10.62
+79,10.1.10.62
+80,10.1.10.62
+81,10.1.10.62

test/expected/test_sessions.sh_446d4b5105468c36d595f5ea696eac1e550016f7.out

@@ -306,6 +306,14 @@ run_cap_test ${lnav_test} -nq \
 run_cap_test sqlite3 ${HOME}/.lnav/log_metadata.db \
     "SELECT count(*) FROM bookmarks WHERE part_name IS NOT NULL AND part_name != ''"
 
+# format-defined partitions should survive a session reset
+run_cap_test ${lnav_test} -n \
+    -I ${test_dir} \
+    -c ':reset-session' \
+    -c ';SELECT log_line, log_part FROM syslog_log WHERE log_part IS NOT NULL' \
+    -c ':write-csv-to -' \
+    ${test_dir}/logfile_partitions.0
+
 rm -rf ./sessions
 mkdir -p $HOME