[cmake] reorg some stuff to fix build

Author: tstack

CMakeLists.txt

@@ -34,6 +34,7 @@ set(lnav_LIBS
         PkgConfig::readline
         LibArchive::LibArchive
         ZLIB::ZLIB
+        ${VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/lib/libunistring.a
 )
 
 add_subdirectory(src)

src/CMakeLists.txt

@@ -353,6 +353,7 @@ target_include_directories(base64 PUBLIC third-party/base64/include)
 
 add_library(
         lnavnotcurses STATIC
+        third-party/notcurses/src/compat/compat.c
         third-party/notcurses/src/lib/automaton.c
         third-party/notcurses/src/lib/blit.c
         third-party/notcurses/src/lib/debug.c
@@ -402,15 +403,14 @@ add_library(lnavfileio STATIC
         grep_proc.hh
         line_buffer.hh
         log_level.hh
-        piper.looper.cfg.hh
-        piper.looper.hh
+        piper.header.hh
         pollable.hh
         shared_buffer.hh
 
         grep_proc.cc
         line_buffer.cc
         log_level.cc
-        piper.looper.cc
+        piper.header.cc
         pollable.cc
         shared_buffer.cc
 )
@@ -485,6 +485,8 @@ add_library(
         data_scanner_re.cc
         data_parser.cc
         file_converter_manager.cc
+        piper.looper.cc
+        piper.match.cc
         plain_text_source.cc
         pretty_printer.cc
         pugixml/pugixml.cpp
@@ -606,6 +608,9 @@ add_library(
         md2attr_line.hh
         md4cpp.hh
         file_converter_manager.hh
+        piper.looper.cfg.hh
+        piper.looper.hh
+        piper.match.hh
         plain_text_source.hh
         pretty_printer.hh
         preview_status_source.hh

src/Makefile.am

@@ -307,8 +307,10 @@ noinst_HEADERS = \
 	mapbox/variant_visitor.hpp \
 	md2attr_line.hh \
 	md4cpp.hh \
+	piper.header.hh \
 	piper.looper.hh \
 	piper.looper.cfg.hh \
+	piper.match.hh \
 	plain_text_source.hh \
 	pollable.hh \
 	pretty_printer.hh \
@@ -484,7 +486,9 @@ libdiag_a_SOURCES = \
 	md4cpp.cc \
 	network-extension-functions.cc \
 	data_parser.cc \
+	piper.header.cc \
 	piper.looper.cc \
+	piper.match.cc \
 	plain_text_source.cc \
 	pollable.cc \
 	pretty_printer.cc \

src/base/piper.file.cc

@@ -35,14 +35,8 @@
 #include "base/injector.hh"
 #include "base/lnav_log.hh"
 #include "base/paths.hh"
-#include "base/snippet_highlighters.hh"
-#include "piper.looper.cfg.hh"
-#include "readline_highlighters.hh"
 
-using namespace lnav::roles::literals;
-
-namespace lnav {
-namespace piper {
+namespace lnav::piper {
 
 const char HEADER_MAGIC[4] = {'L', 0, 'N', 1};
 
@@ -83,143 +77,4 @@ read_header(int fd, const char* first8)
     return meta_buf;
 }
 
-multiplex_matcher::match_result
-multiplex_matcher::match(const string_fragment& line)
-{
-    const auto& cfg = injector::get<const config&>();
-    auto md = lnav::pcre2pp::match_data::unitialized();
-
-    for (const auto& demux_pair : cfg.c_demux_definitions) {
-        const auto& df = demux_pair.second;
-
-        if (!df.dd_valid) {
-            continue;
-        }
-
-        if (!this->mm_partial_match_ids.empty()
-            && this->mm_partial_match_ids.count(demux_pair.first) == 0)
-        {
-            continue;
-        }
-
-        log_info("attempting to demux using: %s", demux_pair.first.c_str());
-        {
-            md = df.dd_pattern.pp_value->create_match_data();
-            if (df.dd_pattern.pp_value->capture_from(line)
-                    .into(md)
-                    .matches()
-                    .ignore_error())
-            {
-                log_info("  demuxer pattern matched");
-                if (!md[df.dd_muxid_capture_index].has_value()) {
-                    log_info("    however, mux_id was not captured");
-
-                    const auto match_um = lnav::console::user_message::warning(
-                        attr_line_t("demuxer ")
-                            .append_quoted(demux_pair.first)
-                            .append(" matched, however the ")
-                            .append("mux_id"_symbol)
-                            .append(" was not captured"));
-                    this->mm_details.emplace_back(match_um);
-                    continue;
-                }
-                if (!md[df.dd_body_capture_index].has_value()) {
-                    log_info("    however, body was not captured");
-                    const auto match_um = lnav::console::user_message::warning(
-                        attr_line_t("demuxer ")
-                            .append_quoted(demux_pair.first)
-                            .append(" matched, however the ")
-                            .append("body"_symbol)
-                            .append(" was not captured"));
-                    this->mm_details.emplace_back(match_um);
-                    continue;
-                }
-                log_info("  and required captures were found, using demuxer");
-
-                if (df.dd_enabled) {
-                    auto match_um = lnav::console::user_message::ok(
-                        attr_line_t("demuxer ")
-                            .append_quoted(demux_pair.first)
-                            .append(" matched line ")
-                            .append(lnav::roles::number(
-                                fmt::to_string(this->mm_line_count))));
-                    this->mm_details.emplace_back(match_um);
-                    return found{demux_pair.first};
-                }
-                auto config_al
-                    = attr_line_t()
-                          .append(fmt::format(
-                              FMT_STRING(":config /log/demux/{}/enabled "
-                                         "true"),
-                              demux_pair.first))
-                          .move();
-                readline_lnav_highlighter(config_al, -1);
-                auto match_um
-                    = lnav::console::user_message::info(
-                          attr_line_t("demuxer ")
-                              .append_quoted(demux_pair.first)
-                              .append(" matched line ")
-                              .append(lnav::roles::number(
-                                  fmt::to_string(this->mm_line_count)))
-                              .append(", however, it is disabled"))
-                          .with_help(
-                              attr_line_t("Use ")
-                                  .append_quoted(
-                                      lnav::roles::quoted_code(config_al))
-                                  .append(" to enable this demuxer"))
-                          .move();
-                this->mm_details.emplace_back(match_um);
-            }
-
-            auto partial_size = df.dd_pattern.pp_value->match_partial(
-                line.sub_range(0, 1024));
-            auto regex_al = attr_line_t(df.dd_pattern.pp_value->get_pattern());
-            lnav::snippets::regex_highlighter(
-                regex_al, -1, line_range{0, (int) regex_al.length()});
-            auto in_line = line.sub_range(0, 1024).rtrim("\n").to_string();
-            auto esc_res
-                = fmt::v10::detail::find_escape(&in_line[0], &(*in_line.end()));
-            if (esc_res.end != nullptr) {
-                in_line = fmt::format(FMT_STRING("{:?}"), in_line);
-            }
-            auto note = attr_line_t("pattern: ")
-                            .append(regex_al)
-                            .append("\n  ")
-                            .append(lnav::roles::quoted_code(in_line))
-                            .append("\n")
-                            .append(partial_size + 2, ' ')
-                            .append("^ matched up to here")
-                            .move();
-            auto match_um = lnav::console::user_message::info(
-                                attr_line_t("demuxer ")
-                                    .append_quoted(demux_pair.first)
-                                    .append(" did not match line ")
-                                    .append(lnav::roles::number(
-                                        fmt::to_string(this->mm_line_count))))
-                                .with_note(note)
-                                .move();
-            this->mm_details.emplace_back(match_um);
-        }
-        if (df.dd_control_pattern.pp_value) {
-            md = df.dd_control_pattern.pp_value->create_match_data();
-            if (df.dd_control_pattern.pp_value->capture_from(line)
-                    .into(md)
-                    .matches()
-                    .ignore_error())
-            {
-                log_info("  demuxer control pattern matched");
-                this->mm_partial_match_ids.emplace(demux_pair.first);
-            }
-        }
-    }
-
-    this->mm_line_count += 1;
-    if (this->mm_partial_match_ids.empty()) {
-        return not_found{};
-    }
-
-    return partial{};
-}
-
-}  // namespace piper
-}  // namespace lnav
+}  // namespace lnav::piper

src/base/piper.file.hh

@@ -33,19 +33,14 @@
 #include <filesystem>
 #include <map>
 #include <optional>
-#include <set>
 #include <string>
 
 #include <sys/time.h>
 
 #include "auto_mem.hh"
-#include "base/intern_string.hh"
-#include "lnav.console.hh"
-#include "mapbox/variant_io.hpp"
 #include "time_util.hh"
 
-namespace lnav {
-namespace piper {
+namespace lnav::piper {
 
 enum class demux_output_t {
     not_applicable,
@@ -84,27 +79,6 @@ extern const char HEADER_MAGIC[4];
 
 std::optional<auto_buffer> read_header(int fd, const char* first8);
 
-class multiplex_matcher {
-public:
-    struct found {
-        std::string f_id;
-    };
-
-    struct partial {};
-    struct not_found {};
-
-    using match_result = mapbox::util::variant<found, partial, not_found>;
-
-    match_result match(const string_fragment& line);
-
-    std::vector<lnav::console::user_message> mm_details;
-
-private:
-    std::set<std::string> mm_partial_match_ids;
-    size_t mm_line_count{0};
-};
-
-}  // namespace piper
-}  // namespace lnav
+}  // namespace lnav::piper
 
 #endif

src/base/snippet_highlighters.cc

@@ -203,7 +203,7 @@ regex_highlighter(attr_line_t& al, std::optional<int> x, line_range sub)
                     }
                     break;
                 case '?': {
-                    struct line_range lr(lpc, lpc + 1);
+                    line_range lr(lpc, lpc + 1);
 
                     if (lpc == sub.lr_start || (lpc - sub.lr_start) == 0) {
                         alb.overlay_attr_for_char(

src/command_executor.cc

@@ -1054,25 +1054,24 @@ sql_callback(exec_context& ec, sqlite3_stmt* stmt)
     auto row_number = dls.dls_rows.size();
     dls.dls_rows.resize(row_number + 1);
     for (int lpc = 0; lpc < ncols; lpc++) {
-        auto* raw_value = sqlite3_column_value(stmt, lpc);
-        const auto value_type = sqlite3_value_type(raw_value);
+        const auto value_type = sqlite3_column_type(stmt, lpc);
         scoped_value_t value;
         auto& hm = dls.dls_headers[lpc];
 
         switch (value_type) {
             case SQLITE_INTEGER:
-                value = (int64_t) sqlite3_value_int64(raw_value);
+                value = (int64_t) sqlite3_column_int64(stmt, lpc);
                 break;
             case SQLITE_FLOAT:
-                value = sqlite3_value_double(raw_value);
+                value = sqlite3_column_double(stmt, lpc);
                 break;
             case SQLITE_NULL:
                 value = null_value_t{};
                 break;
             default:
                 value = string_fragment::from_bytes(
-                    sqlite3_value_text(raw_value),
-                    sqlite3_value_bytes(raw_value));
+                    sqlite3_column_text(stmt, lpc),
+                    sqlite3_column_bytes(stmt, lpc));
                 break;
         }
         dls.push_column(value);
@@ -1082,6 +1081,7 @@ sql_callback(exec_context& ec, sqlite3_stmt* stmt)
         {
             switch (value_type) {
                 case SQLITE_TEXT:
+                    auto *raw_value = sqlite3_column_value(stmt, lpc);
                     hm.hm_column_type = SQLITE_TEXT;
                     hm.hm_sub_type = sqlite3_value_subtype(raw_value);
                     break;
@@ -1121,22 +1121,22 @@ internal_sql_callback(exec_context& ec, sqlite3_stmt* stmt)
             continue;
         }
 
-        auto* raw_value = sqlite3_column_value(stmt, lpc);
         auto value_type = sqlite3_column_type(stmt, lpc);
         scoped_value_t value;
         switch (value_type) {
             case SQLITE_INTEGER:
-                value = (int64_t) sqlite3_value_int64(raw_value);
+                value = (int64_t) sqlite3_column_int64(stmt, lpc);
                 break;
             case SQLITE_FLOAT:
-                value = sqlite3_value_double(raw_value);
+                value = sqlite3_column_double(stmt, lpc);
                 break;
             case SQLITE_NULL:
                 value = null_value_t{};
                 break;
             default:
-                value = std::string((const char*) sqlite3_value_text(raw_value),
-                                    sqlite3_value_bytes(raw_value));
+                value
+                    = std::string((const char*) sqlite3_column_text(stmt, lpc),
+                                  sqlite3_column_bytes(stmt, lpc));
                 break;
         }
         vars[column_name] = value;

src/file_format.cc

@@ -38,6 +38,7 @@
 #include "base/lnav_log.hh"
 #include "config.h"
 #include "line_buffer.hh"
+#include "piper.match.hh"
 #include "text_format.hh"
 
 detect_file_format_result

src/line_buffer.cc

@@ -59,7 +59,7 @@
 #include "fmtlib/fmt/format.h"
 #include "hasher.hh"
 #include "line_buffer.hh"
-#include "piper.looper.hh"
+#include "piper.header.hh"
 #include "scn/scan.h"
 
 using namespace std::chrono_literals;

src/lnav.management_cli.cc

@@ -48,7 +48,7 @@
 #include "log_format.hh"
 #include "log_format_ext.hh"
 #include "mapbox/variant.hpp"
-#include "piper.looper.hh"
+#include "piper.header.hh"
 #include "regex101.import.hh"
 #include "session_data.hh"