column: add --table-column

Signed-off-by: Karel Zak <kzak@redhat.com>

diff --git a/text-utils/column.1.adoc b/text-utils/column.1.adoc
index 54dacf5815e6e24f97c98d65ae146f2da8787afb..dfb5adfc0610d98fc02fdb7bcacc468504b94101 100644 (file)
--- a/text-utils/column.1.adoc
+++ b/text-utils/column.1.adoc
@@ -65,7 +65,11 @@ Input is taken from _file_, or otherwise from standard input. Empty lines are ig
 
 == OPTIONS
 
-The argument _columns_ for *--table-** options is a comma separated list of the column names as defined by *--table-columns* or it's column number in order as specified by input. It's possible to mix names and numbers. The special placeholder '0' (e.g. -R0) may be used to specify all columns.
+The argument _columns_ for *--table-** options is a comma separated list of the
+column names as defined by *--table-columns*, or names defined by
+*--table-column* or it's column number in order as specified by input. It's
+possible to mix names and numbers. The special placeholder '0' (e.g. -R0) may
+be used to specify all columns.
 
 *-J, --json*::
 Use JSON output format to print the table, the option *--table-columns* is required and the option *--table-name* is recommended.
@@ -87,8 +91,38 @@ Specify the possible input item delimiters (default is whitespace).
 *-t, --table*::
 Determine the number of columns the input contains and create a table. Columns are delimited with whitespace, by default, or with the characters supplied using the *--output-separator* option. Table output is useful for pretty-printing.
 
+*-C, --table-column* _properties_::
+Define one column by comma separated list of column attributes.
+This option can be used more than once, every use defines just one column.
+The properties replace some of --table- options. For example *--table-column
+name=FOO,right* define one column where text is aligned to right. The option is
+mutually exclusive to *--table-columns*.
++
+The currently supported attributes are:
++
+*name=string*;;
+Specifies column name.
+*trunc*;;
+The column text can be truncated when necessary. The same as *--table-truncate*.
+*right*;;
+Right align text in the specified columns. The same as *--table-right*.
+*width=number*;;
+Specifies column width. The width is used as a hint only. The width is strictly followed
+only when *strictwidth* attribute is used too.
+*strictwidth*;;
+Strictly follow column *width=* setting.
+*noextreme*;;
+Specify columns where is possible to ignore unusually long cells. See *--table-noextreme* for more details.
+*wrap*;;
+Specify columns where is possible to use multi-line cell for long text when necessary. See *--table-wrap*.
+*hide*;;
+Don't print specified columns. See *--table-hide*.
+*json=type*;;
+Define column type for JSON output, Supported are string, number and boolean.
+
 *-N, --table-columns* _names_::
-Specify the columns names by comma separated list of names. The names are used for the table header or to address column in option arguments.
+Specify the columns names by comma separated list of names. The names are used
+for the table header or to address column in option argument. See also *--table-column*.
 
 *-l, --table-columns-limit* _number_::
 Specify maximal number of the input columns. The last column will contain all remaining line data if the limit is smaller than the number of the columns in the input data.

diff --git a/text-utils/column.c b/text-utils/column.c
index 1cd9b163242b0f5f8eb81336dec0d27022e701bf..55f9d92b7f99fb4c2d6ec1851796f626dcb0c259 100644 (file)
--- a/text-utils/column.c
+++ b/text-utils/column.c
@@ -75,6 +75,8 @@ struct column_control {
        const char *tab_name;   /* table name */
        const char *tab_order;  /* --table-order */
 
+       char **tab_columns;     /* array from --table-column */
+
        const char *tab_colright;       /* --table-right */
        const char *tab_coltrunc;       /* --table-trunc */
        const char *tab_colnoextrem;    /* --table-noextreme */
@@ -216,37 +218,47 @@ static void init_table(struct column_control *ctl)
        } else
                scols_table_enable_noencoding(ctl->tab, 1);
 
-       if (ctl->tab_colnames) {
+       if (ctl->tab_columns) {
+               char **opts;
+
+               STRV_FOREACH(opts, ctl->tab_columns) {
+                       struct libscols_column *cl;
+
+                       cl = scols_table_new_column(ctl->tab, NULL, 0, 0);
+                       scols_column_set_properties(cl, *opts);
+               }
+
+       } else if (ctl->tab_colnames) {
                char **name;
 
                STRV_FOREACH(name, ctl->tab_colnames)
                        scols_table_new_column(ctl->tab, *name, 0, 0);
+       } else
+               scols_table_enable_noheadings(ctl->tab, 1);
+
+       if (ctl->tab_colnames || ctl->tab_columns) {
                if (ctl->header_repeat)
                        scols_table_enable_header_repeat(ctl->tab, 1);
                scols_table_enable_noheadings(ctl->tab, !!ctl->tab_noheadings);
-       } else
-               scols_table_enable_noheadings(ctl->tab, 1);
+       }
+
 }
 
 static struct libscols_column *string_to_column(struct column_control *ctl, const char *str)
 {
-       uint32_t colnum = 0;
+       struct libscols_column *cl;
 
-       if (isdigit_string(str))
-               colnum = strtou32_or_err(str, _("failed to parse column")) - 1;
-       else {
-               char **name;
+       if (isdigit_string(str)) {
+               uint32_t n = strtou32_or_err(str, _("failed to parse column")) - 1;
 
-               STRV_FOREACH(name, ctl->tab_colnames) {
-                       if (strcasecmp(*name, str) == 0)
-                               break;
-                       colnum++;
-               }
-               if (!name || !*name)
-                       errx(EXIT_FAILURE, _("undefined column name '%s'"), str);
-       }
+               cl = scols_table_get_column(ctl->tab, n);
+       } else
+               cl = scols_table_get_column_by_name(ctl->tab, str);
+
+       if (!cl)
+               errx(EXIT_FAILURE, _("undefined column name '%s'"), str);
 
-       return scols_table_get_column(ctl->tab, colnum);
+       return cl;
 }
 
 static struct libscols_column *get_last_visible_column(struct column_control *ctl)
@@ -723,6 +735,7 @@ int main(int argc, char **argv)
                { "separator",           required_argument, NULL, 's' },
                { "table",               no_argument,       NULL, 't' },
                { "table-columns",       required_argument, NULL, 'N' },
+               { "table-column",        required_argument, NULL, 'C' },
                { "table-columns-limit", required_argument, NULL, 'l' },
                { "table-hide",          required_argument, NULL, 'H' },
                { "table-name",          required_argument, NULL, 'n' },
@@ -741,6 +754,7 @@ int main(int argc, char **argv)
                { NULL, 0, NULL, 0 },
        };
        static const ul_excl_t excl[] = {       /* rows and cols in ASCII order */
+               { 'C','N' },
                { 'J','x' },
                { 't','x' },
                { 0 }
@@ -755,11 +769,14 @@ int main(int argc, char **argv)
        ctl.output_separator = "  ";
        ctl.input_separator = mbs_to_wcs("\t ");
 
-       while ((c = getopt_long(argc, argv, "c:dE:eH:hi:Jl:LN:n:O:o:p:R:r:s:T:tVW:x", longopts, NULL)) != -1) {
+       while ((c = getopt_long(argc, argv, "C:c:dE:eH:hi:Jl:LN:n:O:o:p:R:r:s:T:tVW:x", longopts, NULL)) != -1) {
 
                err_exclusive_options(c, longopts, excl, excl_st);
 
                switch(c) {
+               case 'C':
+                       strv_extend(&ctl.tab_columns, optarg);
+                       break;
                case 'c':
                        if (strcmp(optarg, "unlimited") == 0)
                                ctl.termwidth = 0;
@@ -858,11 +875,11 @@ int main(int argc, char **argv)
        if (ctl.mode != COLUMN_MODE_TABLE
            && (ctl.tab_order || ctl.tab_name || ctl.tab_colwrap ||
                ctl.tab_colhide || ctl.tab_coltrunc || ctl.tab_colnoextrem ||
-               ctl.tab_colright || ctl.tab_colnames))
+               ctl.tab_colright || ctl.tab_colnames || ctl.tab_columns))
                errx(EXIT_FAILURE, _("option --table required for all --table-*"));
 
-       if (ctl.tab_colnames == NULL && ctl.json)
-               errx(EXIT_FAILURE, _("option --table-columns required for --json"));
+       if (!ctl.tab_colnames && !ctl.tab_columns && ctl.json)
+               errx(EXIT_FAILURE, _("option --table-columns or --table-column required for --json"));
 
        if (!*argv)
                eval += read_input(&ctl, stdin);
@@ -891,6 +908,12 @@ int main(int argc, char **argv)
                if (ctl.tab && scols_table_get_nlines(ctl.tab)) {
                        modify_table(&ctl);
                        eval = scols_print_table(ctl.tab);
+
+                       scols_unref_table(ctl.tab);
+                       if (ctl.tab_colnames)
+                               strv_free(ctl.tab_colnames);
+                       if (ctl.tab_columns)
+                               strv_free(ctl.tab_columns);
                }
                break;
        case COLUMN_MODE_FILLCOLS:
@@ -904,5 +927,7 @@ int main(int argc, char **argv)
                break;
        }
 
+       free(ctl.input_separator);
+
        return eval == 0 ? EXIT_SUCCESS : EXIT_FAILURE;
 }