From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [IPv6:2a01:7e0:0:424::9]) by lore.proxmox.com (Postfix) with ESMTPS id 54F4C1FF177 for ; Fri, 2 Aug 2024 15:27:56 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 5CE83DCD4; Fri, 2 Aug 2024 15:27:55 +0200 (CEST) From: Max Carrara To: pve-devel@lists.proxmox.com Date: Fri, 2 Aug 2024 15:26:49 +0200 Message-Id: <20240802132656.270077-12-m.carrara@proxmox.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240802132656.270077-1-m.carrara@proxmox.com> References: <20240802132656.270077-1-m.carrara@proxmox.com> MIME-Version: 1.0 X-SPAM-LEVEL: Spam detection results: 0 AWL 0.035 Adjusted score from AWL reputation of From: address BAYES_00 -1.9 Bayes spam probability is 0 to 1% DMARC_MISSING 0.1 Missing DMARC policy KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_PASS -0.001 SPF: sender matches SPF record Subject: [pve-devel] [PATCH v1 pve-common 11/18] pbsclient: let `status` method return a hash instead of an array X-BeenThere: pve-devel@lists.proxmox.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Proxmox VE development discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: Proxmox VE development discussion Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: pve-devel-bounces@lists.proxmox.com Sender: "pve-devel" Instead of returning an (arguably awkward) array with four elements, where each element has a special meaning, return the hash that is constructed from the `proxmox-backup-client status` command's JSON output. The documentation is updated accordingly. This method isn't used anywhere in our code base at the moment, so I assume it is safe to change it. Checked with ripgrep. Signed-off-by: Max Carrara --- src/PVE/PBSClient.pm | 32 ++++++++++---------------------- 1 file changed, 10 insertions(+), 22 deletions(-) diff --git a/src/PVE/PBSClient.pm b/src/PVE/PBSClient.pm index 69b4e40..26f73ef 100644 --- a/src/PVE/PBSClient.pm +++ b/src/PVE/PBSClient.pm @@ -731,36 +731,24 @@ sub prune_group { =head3 status - ($total, $free, $used, $active) = $client->status() + $status = $client->status() -Return the I of the client's repository as an array. +Return the I of the client's repository as a hash. -The array contains the C<$total>, C<$free> and C<$used> size of the repository -as bytes, as well as whether the repository is C<$active> or not. +The returned hash has the following structure: + + { + avail => 41735159808, # sizes are in bytes! + total => 264240103424, + used => 41735159808, + } =cut sub status { my ($self) = @_; - my $total = 0; - my $free = 0; - my $used = 0; - my $active = 0; - - eval { - my $res = run_client_cmd($self, "status"); - - $active = 1; - $total = $res->{total}; - $used = $res->{used}; - $free = $res->{avail}; - }; - if (my $err = $@) { - warn $err; - } - - return ($total, $free, $used, $active); + return run_client_cmd($self, "status"); }; =pod -- 2.39.2 _______________________________________________ pve-devel mailing list pve-devel@lists.proxmox.com https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel