From: Dietmar Maurer <dietmar@proxmox.com>
Date: Fri, 22 Jun 2018 07:54:21 +0000 (+0200)
Subject: use new PVE::APIClient::CLIHandler::print_api_result
X-Git-Url: https://git.proxmox.com/?p=pve-client.git;a=commitdiff_plain;h=c27b93a5e3ff6e03b68f7b1f53c85f5b03a0e3f3

use new PVE::APIClient::CLIHandler::print_api_result
---

diff --git a/PVE/APIClient/Helpers.pm b/PVE/APIClient/Helpers.pm
index 9ee00e9..ed1822d 100644
--- a/PVE/APIClient/Helpers.pm
+++ b/PVE/APIClient/Helpers.pm
@@ -41,40 +41,6 @@ sub get_output_format {
     return $client_output_format;
 }
 
-sub print_result {
-    my ($data, $result_schema) = @_;
-
-    my $format = get_output_format();
-
-    return if $result_schema->{type} eq 'null';
-
-    # TODO: implement different output formats ($format)
-
-    if ($format eq 'json') {
-       print to_json($data, {utf8 => 1, allow_nonref => 1, canonical => 1, pretty => 1 });
-    } elsif ($format eq 'text') {
-       my $type = $result_schema->{type};
-       if ($type eq 'object') {
-           die "implement me";
-       } elsif ($type eq 'array') {
-           my $item_type = $result_schema->{items}->{type};
-           if ($item_type eq 'object') {
-               die "implement me";
-           } elsif ($item_type eq 'array') {
-               die "implement me";
-           } else {
-               foreach my $el (@$data) {
-                   print "$el\n"
-               }
-           }
-       } else {
-           print "$data\n";
-       }
-    } else {
-       die "internal error: unknown output format"; # should not happen
-    }
-}
-
 my $__real_remove_formats; $__real_remove_formats = sub {
     my ($properties) = @_;
 
diff --git a/pveclient b/pveclient
index 2995fd5..7688ffe 100755
--- a/pveclient
+++ b/pveclient
@@ -108,7 +108,8 @@ $path_properties->{api_path} = {
 my $format_result = sub {
     my ($data) = @_;
 
-    PVE::APIClient::Helpers::print_result($data, $path_returns);
+    my $format = PVE::APIClient::Helpers::get_output_format();
+    PVE::APIClient::CLIHandler::print_api_result($format, $data, $path_returns);
 };
 
 __PACKAGE__->register_method ({