[format] json field width should use column width

Related to #1500

Author: tstack

src/base/attr_line.hh

@@ -153,7 +153,6 @@ rfind_string_attr_if(const string_attrs_t& sa, ssize_t near, T predicate)
     auto nearest = sa.end();
     ssize_t last_diff = INT_MAX;
 
-
     for (auto iter = sa.begin(); iter != sa.end(); ++iter) {
         const auto& lr = iter->sa_range;
 
@@ -298,7 +297,11 @@ public:
     {
         size_t start_len = this->al_string.length();
 
-        this->al_string.append(str);
+        if constexpr (std::is_same_v<S, string_fragment>) {
+            this->al_string.append(str.data(), str.length());
+        } else {
+            this->al_string.append(str);
+        }
 
         line_range lr{(int) start_len, (int) this->al_string.length()};
 
@@ -312,7 +315,11 @@ public:
     {
         size_t start_len = this->al_string.length();
 
-        this->al_string.append(std::move(value.first));
+        if constexpr (std::is_same_v<S, string_fragment>) {
+            this->al_string.append(value.first.data(), value.first.length());
+        } else {
+            this->al_string.append(std::move(value.first));
+        }
 
         line_range lr{(int) start_len, (int) this->al_string.length()};
 

src/base/intern_string.hh

@@ -820,6 +820,8 @@ public:
 
     const char* get() const { return this->is_str.c_str(); };
 
+    const char* data() const { return this->is_str.c_str(); };
+
     size_t size() const { return this->is_str.size(); }
 
     std::string to_string() const { return this->is_str; }
@@ -872,6 +874,8 @@ public:
 
     const char* c_str() const { return this->get(); }
 
+    const char* data() const { return this->get(); }
+
     iterator begin() const { return this->get(); }
 
     iterator end() const { return this->get() + this->size(); }

src/bookmarks.cc

@@ -109,17 +109,17 @@ bookmark_type_t::get_all_types()
     return all_types;
 }
 
-std::vector<const char*>
+std::vector<string_fragment>
 bookmark_type_t::get_type_names()
 {
-    std::vector<const char*> retval;
+    std::vector<string_fragment> retval;
 
     for (const auto& bt : get_all_types()) {
-        retval.emplace_back(bt->get_name().data());
+        retval.emplace_back(bt->get_name());
     }
     std::stable_sort(
-        retval.begin(), retval.end(), [](const char* lhs, const char* rhs) {
-            return strcmp(lhs, rhs) < 0;
+        retval.begin(), retval.end(), [](const auto& lhs, const auto& rhs) {
+            return lhs < rhs;
         });
     return retval;
 }

src/bookmarks.hh

@@ -191,7 +191,7 @@ public:
 
     static std::vector<bookmark_type_t*>& get_all_types();
 
-    static std::vector<const char*> get_type_names();
+    static std::vector<string_fragment> get_type_names();
 
     template<typename T, std::size_t N>
     explicit bookmark_type_t(const T (&name)[N])

src/cmds.display.cc

@@ -164,7 +164,10 @@ static readline_context::command_t DISPLAY_COMMANDS[] = {
             .with_summary("Set the display mode for text files")
             .with_parameter(help_text{"mode"}
                                 .with_summary("The display mode")
-                                .with_enum_values({"raw", "rendered"}))
+                                .with_enum_values({
+                                    "raw"_frag,
+                                    "rendered"_frag,
+                                }))
             .with_tags({"display"}),
     },
     {

src/cmds.io.cc

@@ -1567,7 +1567,7 @@ com_pipe_to(exec_context& ec,
         sql_strftime(tmp_str, sizeof(tmp_str), ldh.ldh_line->get_timeval());
         extra_env["log_time"] = tmp_str;
         extra_env["log_path"] = ldh.ldh_file->get_filename();
-        extra_env["log_level"] = ldh.ldh_line->get_level_name();
+        extra_env["log_level"] = ldh.ldh_line->get_level_name().to_string();
         if (ldh.ldh_line_values.lvv_opid_value) {
             extra_env["log_opid"] = ldh.ldh_line_values.lvv_opid_value.value();
         }
@@ -1888,7 +1888,7 @@ static readline_context::command_t IO_COMMANDS[] = {
             .with_parameter(
                 help_text("--view", "The view to use as the source of data")
                     .optional()
-                    .with_enum_values({"log", "db"}))
+                    .with_enum_values({"log"_frag, "db"_frag}))
             .with_parameter(
                 help_text("--anonymize", "Anonymize the lines").flag())
             .with_parameter(

src/fstat_vtab.cc

@@ -512,13 +512,13 @@ register_fstat_vtab(sqlite3* db)
               .with_result({"st_ino", "The inode number"})
               .with_result(help_text{"st_type", "The type of the entry"}
                                .with_enum_values({
-                                   "reg",
-                                   "blk",
-                                   "chr",
-                                   "dir",
-                                   "fifo",
-                                   "lnk",
-                                   "sock",
+                                   "reg"_frag,
+                                   "blk"_frag,
+                                   "chr"_frag,
+                                   "dir"_frag,
+                                   "fifo"_frag,
+                                   "lnk"_frag,
+                                   "sock"_frag,
                                }))
               .with_result({"st_mode", "The protection mode"})
               .with_result(

src/help_text.cc

@@ -91,7 +91,7 @@ help_text::is_trailing_arg() const
 
 help_text&
 help_text::with_enum_values(
-    const std::initializer_list<const char*>& enum_values) noexcept
+    const std::initializer_list<string_fragment>& enum_values) noexcept
 {
     this->ht_enum_values = enum_values;
     return *this;

src/help_text.hh

@@ -35,6 +35,8 @@
 #include <string>
 #include <vector>
 
+#include "base/intern_string.hh"
+
 enum class help_context_t {
     HC_NONE,
     HC_PARAMETER,
@@ -120,7 +122,7 @@ struct help_text {
     std::vector<help_example> ht_example;
     help_nargs_t ht_nargs{help_nargs_t::HN_REQUIRED};
     help_parameter_format_t ht_format{help_parameter_format_t::HPF_STRING};
-    std::vector<const char*> ht_enum_values;
+    std::vector<string_fragment> ht_enum_values;
     std::vector<const char*> ht_tags;
     std::vector<const char*> ht_opposites;
     help_function_type_t ht_function_type{help_function_type_t::HFT_REGULAR};
@@ -274,21 +276,21 @@ struct help_text {
     bool is_trailing_arg() const;
 
     help_text& with_enum_values(
-        const std::initializer_list<const char*>& enum_values) noexcept;
+        const std::initializer_list<string_fragment>& enum_values) noexcept;
 
     template<std::size_t N>
     help_text& with_enum_values(
-        const std::array<const char*, N>& enum_values) noexcept
+        const std::array<string_fragment, N>& enum_values) noexcept
     {
         this->ht_enum_values.reserve(N);
-        for (const auto* val : enum_values) {
+        for (const auto& val : enum_values) {
             this->ht_enum_values.emplace_back(val);
         }
 
         return *this;
     }
 
-    help_text& with_enum_values(const std::vector<const char*>& ev)
+    help_text& with_enum_values(const std::vector<string_fragment>& ev)
     {
         this->ht_enum_values = ev;
         return *this;

src/help_text_formatter.cc

@@ -515,7 +515,7 @@ format_help_text_for_term(const help_text& ht,
                     .append("Values"_h5)
                     .append(": ");
                 auto initial = true;
-                for (const auto* ename : param.ht_enum_values) {
+                for (const auto& ename : param.ht_enum_values) {
                     if (!initial) {
                         alb.append("|");
                     }