proxmox-mirrors/pve-common
1
0
Fork 0
mirror of https://git.proxmox.com/git/pve-common synced 2025-07-25 22:06:58 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

cli: print_api_result: add/use new encoding option

Browse Source 
Signed-off-by: Dietmar Maurer <dietmar@proxmox.com>
This commit is contained in:
Dietmar Maurer 2018-06-29 13:15:23 +02:00 committed by Thomas Lamprecht
parent eb1c51c2e8
commit 43b104c416
1 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/PVE/CLIFormatter.pm
View File

@ -8,15 +8,15 @@ use utf8;
use Encode; use Encode;
sub println_max { sub println_max {
my ($text, $max) = @_; my ($text, $encoding, $max) = @_;
if ($max) { if ($max) {
my @lines = split(/\n/, $text); my @lines = split(/\n/, $text);
foreach my $line (@lines) { foreach my $line (@lines) {
print encode('UTF-8', substr($line, 0, $max) . "\n"); print encode($encoding, substr($line, 0, $max) . "\n");
} }
} else { } else {
print encode('UTF-8', $text); print encode($encoding, $text);
} }
} }
@ -66,6 +66,7 @@ sub print_text_table {
my $border = $options->{border}; my $border = $options->{border};
my $columns = $options->{columns}; my $columns = $options->{columns};
my $utf8 = $options->{utf8}; my $utf8 = $options->{utf8};
my $encoding = $options->{encoding} // 'UTF-8';
my $autosort = 1; my $autosort = 1;
if (defined($sort_key) && $sort_key eq 0) { if (defined($sort_key) && $sort_key eq 0) {
@ -168,19 +169,19 @@ sub print_text_table {
$borderstring_t = $borderstring_m if !length($borderstring_t); $borderstring_t = $borderstring_m if !length($borderstring_t);
$borderstring_b = $borderstring_m if !length($borderstring_b); $borderstring_b = $borderstring_m if !length($borderstring_b);
println_max($borderstring_t, $columns) if $border; println_max($borderstring_t, $encoding, $columns) if $border;
my $text = sprintf $formatstring, map { $colopts->{$_}->{title} } @$props_to_print; my $text = sprintf $formatstring, map { $colopts->{$_}->{title} } @$props_to_print;
println_max($text, $columns); println_max($text, $encoding, $columns);
foreach my $entry (@$data) { foreach my $entry (@$data) {
println_max($borderstring_m, $columns) if $border; println_max($borderstring_m, $encoding, $columns) if $border;
$text = sprintf $formatstring, map { $text = sprintf $formatstring, map {
substr(data_to_text($entry->{$_}, $returnprops->{$_}) // $colopts->{$_}->{default}, substr(data_to_text($entry->{$_}, $returnprops->{$_}) // $colopts->{$_}->{default},
0, $colopts->{$_}->{cutoff}); 0, $colopts->{$_}->{cutoff});
} @$props_to_print; } @$props_to_print;
println_max($text, $columns); println_max($text, $encoding, $columns);
} }
println_max($borderstring_b, $columns) if $border; println_max($borderstring_b, $encoding, $columns) if $border;
} }
# prints the result of an API GET call returning an array as a table. # prints the result of an API GET call returning an array as a table.
@ -222,8 +223,10 @@ sub print_api_result {
return if $result_schema->{type} eq 'null'; return if $result_schema->{type} eq 'null';
if ($format eq 'json') { if ($format eq 'json') {
# Note: we always use utf8 encoding for json format
print to_json($data, {utf8 => 1, allow_nonref => 1, canonical => 1, pretty => 1 }); print to_json($data, {utf8 => 1, allow_nonref => 1, canonical => 1, pretty => 1 });
} elsif ($format eq 'text' || $format eq 'plain') { } elsif ($format eq 'text' || $format eq 'plain') {
my $encoding = $options->{encoding} // 'UTF-8';
my $type = $result_schema->{type}; my $type = $result_schema->{type};
if ($type eq 'object') { if ($type eq 'object') {
$props_to_print = [ sort keys %$data ] if !defined($props_to_print); $props_to_print = [ sort keys %$data ] if !defined($props_to_print);
@ -242,11 +245,11 @@ sub print_api_result {
print_api_list($data, $result_schema, $props_to_print, $options); print_api_list($data, $result_schema, $props_to_print, $options);
} else { } else {
foreach my $entry (@$data) { foreach my $entry (@$data) {
print data_to_text($entry) . "\n"; print encode($encoding, data_to_text($entry) . "\n");
} }
} }
} else { } else {
print "$data\n"; print encode($encoding, "$data\n");
} }
} else { } else {
die "internal error: unknown output format"; # should not happen die "internal error: unknown output format"; # should not happen