From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [212.224.123.68]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by lists.proxmox.com (Postfix) with ESMTPS id 32BEC73488; Fri, 27 May 2022 10:22:08 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 2F564B400; Fri, 27 May 2022 10:22:08 +0200 (CEST) Received: from proxmox-new.maurer-it.com (proxmox-new.maurer-it.com [94.136.29.106]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by firstgate.proxmox.com (Proxmox) with ESMTPS id 15ECCB3E4; Fri, 27 May 2022 10:22:04 +0200 (CEST) Received: from proxmox-new.maurer-it.com (localhost.localdomain [127.0.0.1]) by proxmox-new.maurer-it.com (Proxmox) with ESMTP id D9500438B4; Fri, 27 May 2022 10:22:03 +0200 (CEST) From: Dominik Csapak To: pve-devel@lists.proxmox.com, pbs-devel@lists.proxmox.com Date: Fri, 27 May 2022 10:22:03 +0200 Message-Id: <20220527082203.1653182-4-d.csapak@proxmox.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220527082203.1653182-1-d.csapak@proxmox.com> References: <20220527082203.1653182-1-d.csapak@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.113 Adjusted score from AWL reputation of From: address BAYES_00 -1.9 Bayes spam probability is 0 to 1% 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 T_SCC_BODY_TEXT_LINE -0.01 - Subject: [pve-devel] [PATCH proxmox-backup v3 1/1] file-restore: remove 'json-error' parameter from list_files 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: , X-List-Received-Date: Fri, 27 May 2022 08:22:08 -0000 we can reuse the 'output_format' here also remove the 'error: true' here. we can determine it was an error, by checking if it's an object with a 'message' property Signed-off-by: Dominik Csapak --- proxmox-file-restore/src/main.rs | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/proxmox-file-restore/src/main.rs b/proxmox-file-restore/src/main.rs index 3420ea8e..ee5b5b9c 100644 --- a/proxmox-file-restore/src/main.rs +++ b/proxmox-file-restore/src/main.rs @@ -217,12 +217,6 @@ async fn list_files( schema: OUTPUT_FORMAT, optional: true, }, - "json-error": { - type: Boolean, - description: "If set, errors are returned as json instead of writing to stderr", - optional: true, - default: false, - }, "timeout": { type: Integer, description: "Defines the maximum time the call can should take.", @@ -245,7 +239,6 @@ async fn list( snapshot: String, path: String, base64: bool, - json_error: bool, timeout: Option, param: Value, ) -> Result<(), Error> { @@ -290,7 +283,7 @@ async fn list( let output_format = get_output_format(¶m); if let Err(err) = result { - if !json_error { + if &output_format == "text" { return Err(err); } let (msg, code) = match err.downcast_ref::() { @@ -298,7 +291,6 @@ async fn list( None => (err.to_string(), None), }; let mut json_err = json!({ - "error": true, "message": msg, }); if let Some(code) = code { -- 2.30.2