use strict;
use warnings;
+
use I18N::Langinfo;
use POSIX qw(strftime);
use CPAN::Meta::YAML; # comes with perl-modules
use PVE::JSONSchema;
use PVE::PTY;
+
use JSON;
use utf8;
use Encode;
my $borderstring_m = '';
my $borderstring_b = '';
my $borderstring_t = '';
+ my $borderstring_h = '';
my $formatstring = '';
my $column_count = scalar(@$props_to_print);
if ($utf8) {
$formatstring .= "│ %$alignstr${cutoff}s │";
$borderstring_t .= "┌─" . ('─' x $cutoff) . "─┐";
+ $borderstring_h .= "╞═" . ('═' x $cutoff) . '═╡';
$borderstring_m .= "├─" . ('─' x $cutoff) . "─┤";
$borderstring_b .= "└─" . ('─' x $cutoff) . "─┘";
} else {
$formatstring .= "| %$alignstr${cutoff}s |";
$borderstring_m .= "+-" . ('-' x $cutoff) . "-+";
+ $borderstring_h .= "+=" . ('=' x $cutoff) . '=';
}
} elsif ($i == 0) {
if ($utf8) {
$formatstring .= "│ %$alignstr${cutoff}s ";
$borderstring_t .= "┌─" . ('─' x $cutoff) . '─';
+ $borderstring_h .= "╞═" . ('═' x $cutoff) . '═';
$borderstring_m .= "├─" . ('─' x $cutoff) . '─';
$borderstring_b .= "└─" . ('─' x $cutoff) . '─';
} else {
$formatstring .= "| %$alignstr${cutoff}s ";
$borderstring_m .= "+-" . ('-' x $cutoff) . '-';
+ $borderstring_h .= "+=" . ('=' x $cutoff) . '=';
}
} elsif ($i == ($column_count - 1)) {
if ($utf8) {
$formatstring .= "│ %$alignstr${cutoff}s │";
$borderstring_t .= "┬─" . ('─' x $cutoff) . "─┐";
+ $borderstring_h .= "╪═" . ('═' x $cutoff) . '═╡';
$borderstring_m .= "┼─" . ('─' x $cutoff) . "─┤";
$borderstring_b .= "┴─" . ('─' x $cutoff) . "─┘";
} else {
$formatstring .= "| %$alignstr${cutoff}s |";
$borderstring_m .= "+-" . ('-' x $cutoff) . "-+";
+ $borderstring_h .= "+=" . ('=' x $cutoff) . "=+";
}
} else {
if ($utf8) {
$formatstring .= "│ %$alignstr${cutoff}s ";
$borderstring_t .= "┬─" . ('─' x $cutoff) . '─';
+ $borderstring_h .= "╪═" . ('═' x $cutoff) . '═';
$borderstring_m .= "┼─" . ('─' x $cutoff) . '─';
$borderstring_b .= "┴─" . ('─' x $cutoff) . '─';
} else {
$formatstring .= "| %$alignstr${cutoff}s ";
$borderstring_m .= "+-" . ('-' x $cutoff) . '-';
+ $borderstring_h .= "+=" . ('=' x $cutoff) . '=';
}
}
} else {
$writeln->($borderstring_t) if $border;
+ my $borderstring_sep;
if ($header) {
my $text = sprintf $formatstring, map { $colopts->{$_}->{title} } @$props_to_print;
$writeln->($text);
+ $borderstring_sep = $borderstring_h;
+ } else {
+ $borderstring_sep = $borderstring_m;
}
for (my $i = 0; $i < scalar(@$tabledata); $i++) {
my $coldata = $tabledata->[$i];
- $writeln->($borderstring_m) if $border && ($i != 0 || $header);
+ if ($border && ($i != 0 || $header)) {
+ $writeln->($borderstring_sep);
+ $borderstring_sep = $borderstring_m;
+ }
for (my $i = 0; $i < $coldata->{height}; $i++) {
# takes formatting information from the results property of the call
# if $props_to_print is provided, prints only those columns. otherwise
# takes all fields of the results property, with a fallback
-# to all fields occuring in items of $data.
+# to all fields occurring in items of $data.
sub print_api_list {
my ($data, $result_schema, $props_to_print, $options, $terminal_opts) = @_;
my $format = $options->{'output-format'} // 'text';
- if ($result_schema) {
+ if ($result_schema && defined($result_schema->{type})) {
return if $result_schema->{type} eq 'null';
+ return if $result_schema->{optional} && !defined($data);
} else {
my $type = $guess_type->($data);
$result_schema = { type => $type };