From cd6591d38bf07e984fd6b604606d0abc210fe630 Mon Sep 17 00:00:00 2001 From: Dietmar Maurer Date: Tue, 10 Jul 2018 13:51:27 +0200 Subject: [PATCH] output format options: remove 'plain', add 'json-pretty' Signed-off-by: Dietmar Maurer --- src/PVE/CLIFormatter.pm | 5 ++++- src/PVE/JSONSchema.pm | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/src/PVE/CLIFormatter.pm b/src/PVE/CLIFormatter.pm index 043ce49..927e5a6 100644 --- a/src/PVE/CLIFormatter.pm +++ b/src/PVE/CLIFormatter.pm @@ -379,9 +379,12 @@ sub print_api_result { return if $result_schema->{type} eq 'null'; if ($format eq 'json') { + # Note: we always use utf8 encoding for json format + print to_json($data, {utf8 => 1, allow_nonref => 1, canonical => 1 }) . "\n"; + } elsif ($format eq 'json-pretty') { # Note: we always use utf8 encoding for json format print to_json($data, {utf8 => 1, allow_nonref => 1, canonical => 1, pretty => 1 }); - } elsif ($format eq 'text' || $format eq 'plain') { + } elsif ($format eq 'text') { my $encoding = $options->{encoding} // 'UTF-8'; my $type = $result_schema->{type}; if ($type eq 'object') { diff --git a/src/PVE/JSONSchema.pm b/src/PVE/JSONSchema.pm index aa82167..c9a9b1e 100644 --- a/src/PVE/JSONSchema.pm +++ b/src/PVE/JSONSchema.pm @@ -108,7 +108,7 @@ register_standard_option('fingerprint-sha256', { register_standard_option('pve-output-format', { type => 'string', description => 'Output format.', - enum => [ 'text', 'plain', 'json' ], + enum => [ 'text', 'json', 'json-pretty' ], optional => 1, default => 'text', }); -- 2.39.2