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 DC8408A862 for ; Thu, 18 Aug 2022 14:03:13 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id CEC87F49 for ; Thu, 18 Aug 2022 14:03:13 +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 for ; Thu, 18 Aug 2022 14:03:13 +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 EB88944BC3 for ; Thu, 18 Aug 2022 14:03:12 +0200 (CEST) Date: Thu, 18 Aug 2022 14:03:12 +0200 From: Wolfgang Bumiller To: Markus Frank Cc: pbs-devel@lists.proxmox.com Message-ID: <20220818120312.36ixxdwygqpt7tkc@casey.proxmox.com> References: <20220818110654.56988-1-m.frank@proxmox.com> <20220818110654.56988-4-m.frank@proxmox.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20220818110654.56988-4-m.frank@proxmox.com> X-SPAM-LEVEL: Spam detection results: 0 AWL 0.273 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: Re: [pbs-devel] [PATCH proxmox-backup v2 3/3] proxmox-backup-client: added ignore-acl/xattr/ownership/permission & overwrite parameters X-BeenThere: pbs-devel@lists.proxmox.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Proxmox Backup Server development discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 18 Aug 2022 12:03:13 -0000 Sorry for missing this in the v1 revie, but I think it's better to have the parameters as actual function paramters, and the api description contain the `default` values. Also, I think most of these should use plural form ;-) On Thu, Aug 18, 2022 at 01:06:54PM +0200, Markus Frank wrote: > If ignore-acl/ignore-xattr/ignore-ownership/ignore-permission is set, > the corresponding flag gets removed. > > overwrite-existing-files is saved as an PxarExtractOption like > allow-existing-dirs. > > Signed-off-by: Markus Frank > --- > v2: added ignore-permission > > proxmox-backup-client/src/main.rs | 49 ++++++++++++++++++++++++++++++- > 1 file changed, 48 insertions(+), 1 deletion(-) > > diff --git a/proxmox-backup-client/src/main.rs b/proxmox-backup-client/src/main.rs > index 4bb9aa5e..dc038864 100644 > --- a/proxmox-backup-client/src/main.rs > +++ b/proxmox-backup-client/src/main.rs > @@ -1201,6 +1201,31 @@ We do not extract '.pxar' archives when writing to standard output. > type: CryptMode, > optional: true, > }, > + "ignore-acl": { acl -> acls > + type: Boolean, > + description: "ignore acl settings", > + optional: true, Add `default: false,` > + }, > + "ignore-xattr": { xattr -> xattrs > + type: Boolean, > + description: "ignore xattr settings", > + optional: true, Add `default: false,` > + }, > + "ignore-ownership": { > + type: Boolean, > + description: "ignore owner settings (no chown)", > + optional: true, Add `default: false,` > + }, > + "ignore-permission": { permission -> permissions > + type: Boolean, > + description: "ignore permission settings (no chmod)", > + optional: true, Add `default: false,` > + }, > + "overwrite-existing-files": { I think 'overwrite' could be enough actually. (eg. tar has `--overwrite`) > + type: Boolean, > + description: "overwrite already existing files", > + optional: true, > + }, > } > } > )] > @@ -1210,6 +1235,12 @@ async fn restore(param: Value) -> Result { ^ You can just place `bool` parameters in the `fn()` signature and they'll be filled with the `default` values automatically by the api macro (just use underscores in place of the minuses). The `param: Value` parameter will then only contain the remaining arguments. (Most of the required parameters could actually be changed this way, but not necessarily in the same patch series...) > > let allow_existing_dirs = param["allow-existing-dirs"].as_bool().unwrap_or(false); > > + let ignore_acls = param["ignore-acl"].as_bool().unwrap_or(false); > + let ignore_xattr = param["ignore-xattr"].as_bool().unwrap_or(false); > + let ignore_ownership = param["ignore-ownership"].as_bool().unwrap_or(false); > + let ignore_permission = param["ignore-permission"].as_bool().unwrap_or(false); > + let overwrite_existing_files = param["overwrite-existing-files"].as_bool().unwrap_or(false); ^ then this entire block can be dropped