use strict;
use warnings;
+
use I18N::Langinfo;
-use POSIX qw(strftime);
-use CPAN::Meta::YAML; # comes with perl-modules
+use YAML::XS; # supports Dumping JSON::PP::Boolean
+$YAML::XS::Boolean = "JSON::PP";
use PVE::JSONSchema;
use PVE::PTY;
+use PVE::Format;
+
use JSON;
use utf8;
use Encode;
-sub render_timestamp {
- my ($epoch) = @_;
-
- # ISO 8601 date format
- return strftime("%F %H:%M:%S", localtime($epoch));
-}
-
-PVE::JSONSchema::register_renderer('timestamp', \&render_timestamp);
-
-sub render_timestamp_gmt {
- my ($epoch) = @_;
-
- # ISO 8601 date format, standard Greenwich time zone
- return strftime("%F %H:%M:%S", gmtime($epoch));
-}
-
-PVE::JSONSchema::register_renderer('timestamp_gmt', \&render_timestamp_gmt);
-
-sub render_duration {
- my ($duration_in_seconds) = @_;
-
- my $text = '';
- my $rest = $duration_in_seconds;
-
- my $step = sub {
- my ($unit, $unitlength) = @_;
-
- if ((my $v = int($rest/$unitlength)) > 0) {
- $text .= " " if length($text);
- $text .= "${v}${unit}";
- $rest -= $v * $unitlength;
- }
- };
-
- $step->('w', 7*24*3600);
- $step->('d', 24*3600);
- $step->('h', 3600);
- $step->('m', 60);
- $step->('s', 1);
-
- return $text;
-}
-
-PVE::JSONSchema::register_renderer('duration', \&render_duration);
-
-sub render_fraction_as_percentage {
- my ($fraction) = @_;
-
- return sprintf("%.2f%%", $fraction*100);
-}
-
-PVE::JSONSchema::register_renderer(
- 'fraction_as_percentage', \&render_fraction_as_percentage);
-
-sub render_bytes {
- my ($value) = @_;
-
- my @units = qw(B KiB MiB GiB TiB PiB);
-
- my $max_unit = 0;
- if ($value > 1023) {
- $max_unit = int(log($value)/log(1024));
- $value /= 1024**($max_unit);
- }
-
- return sprintf "%.2f $units[$max_unit]", $value;
-}
-
-PVE::JSONSchema::register_renderer('bytes', \&render_bytes);
+PVE::JSONSchema::register_renderer('timestamp',
+ \&PVE::Format::render_timestamp);
+PVE::JSONSchema::register_renderer('timestamp_gmt',
+ \&PVE::Format::render_timestamp_gmt);
+PVE::JSONSchema::register_renderer('duration',
+ \&PVE::Format::render_duration);
+PVE::JSONSchema::register_renderer('fraction_as_percentage',
+ \&PVE::Format::render_fraction_as_percentage);
+PVE::JSONSchema::register_renderer('bytes',
+ \&PVE::Format::render_bytes);
sub render_yaml {
my ($value) = @_;
- my $data = CPAN::Meta::YAML::Dump($value);
+ my $data = YAML::XS::Dump($value);
$data =~ s/^---[\n\s]//; # remove yaml marker
return $data;
}
if (my $class = ref($data)) {
- return to_json($data, { canonical => 1 });
+ # JSON::PP::Boolean requires allow_nonref
+ return to_json($data, { allow_nonref => 1, canonical => 1 });
} else {
return "$data";
}
# $props_to_print - ordered list of properties to print
# $options
# - sort_key: can be used to sort after a specific column, if it isn't set we sort
-# after the leftmost column (with no undef value in $data) this can be
-# turned off by passing 0 as sort_key
+# after the leftmost column. This can be turned off by passing 0 as sort_key
# - noborder: print without asciiart border
# - noheader: print without table header
# - columns: limit output width (if > 0)
if (defined($sort_key) && $sort_key ne 0) {
my $type = $returnprops->{$sort_key}->{type} // 'string';
+ my $cmpfn;
if ($type eq 'integer' || $type eq 'number') {
- @$data = sort { $a->{$sort_key} <=> $b->{$sort_key} } @$data;
+ $cmpfn = sub { $_[0] <=> $_[1] };
} else {
- @$data = sort { $a->{$sort_key} cmp $b->{$sort_key} } @$data;
+ $cmpfn = sub { $_[0] cmp $_[1] };
}
+ @$data = sort {
+ PVE::Tools::safe_compare($a->{$sort_key}, $b->{$sort_key}, $cmpfn)
+ } @$data;
}
my $colopts = {};
my $borderstring_m = '';
my $borderstring_b = '';
my $borderstring_t = '';
+ my $borderstring_h = '';
my $formatstring = '';
my $column_count = scalar(@$props_to_print);
for (my $i = 0; $i < $column_count; $i++) {
my $prop = $props_to_print->[$i];
my $propinfo = $returnprops->{$prop} // {};
+ my $type = $propinfo->{type} // 'string';
+ my $alignstr = ($type eq 'integer' || $type eq 'number') ? '' : '-';
my $title = $propinfo->{title} // $prop;
my $cutoff = $propinfo->{print_width} // $propinfo->{maxLength};
if ($border) {
if ($i == 0 && ($column_count == 1)) {
if ($utf8) {
- $formatstring .= "│ %-${cutoff}s │";
+ $formatstring .= "│ %$alignstr${cutoff}s │";
$borderstring_t .= "┌─" . ('─' x $cutoff) . "─┐";
+ $borderstring_h .= "╞═" . ('═' x $cutoff) . '═╡';
$borderstring_m .= "├─" . ('─' x $cutoff) . "─┤";
$borderstring_b .= "└─" . ('─' x $cutoff) . "─┘";
} else {
- $formatstring .= "| %-${cutoff}s |";
+ $formatstring .= "| %$alignstr${cutoff}s |";
$borderstring_m .= "+-" . ('-' x $cutoff) . "-+";
+ $borderstring_h .= "+=" . ('=' x $cutoff) . '=';
}
} elsif ($i == 0) {
if ($utf8) {
- $formatstring .= "│ %-${cutoff}s ";
+ $formatstring .= "│ %$alignstr${cutoff}s ";
$borderstring_t .= "┌─" . ('─' x $cutoff) . '─';
+ $borderstring_h .= "╞═" . ('═' x $cutoff) . '═';
$borderstring_m .= "├─" . ('─' x $cutoff) . '─';
$borderstring_b .= "└─" . ('─' x $cutoff) . '─';
} else {
- $formatstring .= "| %-${cutoff}s ";
+ $formatstring .= "| %$alignstr${cutoff}s ";
$borderstring_m .= "+-" . ('-' x $cutoff) . '-';
+ $borderstring_h .= "+=" . ('=' x $cutoff) . '=';
}
} elsif ($i == ($column_count - 1)) {
if ($utf8) {
- $formatstring .= "│ %-${cutoff}s │";
+ $formatstring .= "│ %$alignstr${cutoff}s │";
$borderstring_t .= "┬─" . ('─' x $cutoff) . "─┐";
+ $borderstring_h .= "╪═" . ('═' x $cutoff) . '═╡';
$borderstring_m .= "┼─" . ('─' x $cutoff) . "─┤";
$borderstring_b .= "┴─" . ('─' x $cutoff) . "─┘";
} else {
- $formatstring .= "| %-${cutoff}s |";
+ $formatstring .= "| %$alignstr${cutoff}s |";
$borderstring_m .= "+-" . ('-' x $cutoff) . "-+";
+ $borderstring_h .= "+=" . ('=' x $cutoff) . "=+";
}
} else {
if ($utf8) {
- $formatstring .= "│ %-${cutoff}s ";
+ $formatstring .= "│ %$alignstr${cutoff}s ";
$borderstring_t .= "┬─" . ('─' x $cutoff) . '─';
+ $borderstring_h .= "╪═" . ('═' x $cutoff) . '═';
$borderstring_m .= "┼─" . ('─' x $cutoff) . '─';
$borderstring_b .= "┴─" . ('─' x $cutoff) . '─';
} else {
- $formatstring .= "| %-${cutoff}s ";
+ $formatstring .= "| %$alignstr${cutoff}s ";
$borderstring_m .= "+-" . ('-' x $cutoff) . '-';
+ $borderstring_h .= "+=" . ('=' x $cutoff) . '=';
}
}
} else {
# skip alignment and cutoff on last column
- $formatstring .= ($i == ($column_count - 1)) ? "%s" : "%-${cutoff}s ";
+ $formatstring .= ($i == ($column_count - 1)) ? "%s" : "%$alignstr${cutoff}s ";
}
}
$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) = @_;
print_text_table($data, $returnprops, $props_to_print, $options, $terminal_opts);
}
+my $guess_type = sub {
+ my $data = shift;
+
+ return 'null' if !defined($data);
+
+ my $class = ref($data);
+ return 'string' if !$class;
+
+ if ($class eq 'HASH') {
+ return 'object';
+ } elsif ($class eq 'ARRAY') {
+ return 'array';
+ } else {
+ return 'string'; # better than nothing
+ }
+};
+
sub print_api_result {
my ($data, $result_schema, $props_to_print, $options, $terminal_opts) = @_;
my $format = $options->{'output-format'} // 'text';
- return if $result_schema->{type} eq 'null';
+ 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 };
+ $result_schema->{items} = { type => $guess_type->($data->[0]) } if $type eq 'array';
+ }
if ($format eq 'yaml') {
- print encode('UTF-8', CPAN::Meta::YAML::Dump($data));
+ print encode('UTF-8', YAML::XS::Dump($data));
} elsif ($format eq 'json') {
# Note: we always use utf8 encoding for json format
print to_json($data, {utf8 => 1, allow_nonref => 1, canonical => 1 }) . "\n";
}
}
+sub print_api_result_plain {
+ my ($data, $result_schema, $props_to_print, $options) = @_;
+
+ # avoid borders and header, ignore terminal width
+ $options = $options ? { %$options } : {}; # copy
+
+ $options->{noheader} //= 1;
+ $options->{noborder} //= 1;
+
+ print_api_result($data, $result_schema, $props_to_print, $options, {});
+}
+
1;
projects / pve-common.git / blobdiff