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 7EA4F8A314 for ; Wed, 19 Oct 2022 13:13:43 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id CDD5733940 for ; Wed, 19 Oct 2022 13:13:41 +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 ; Wed, 19 Oct 2022 13:13:39 +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 5E7DD44A8F for ; Wed, 19 Oct 2022 13:13:37 +0200 (CEST) From: Dominik Csapak To: pbs-devel@lists.proxmox.com Date: Wed, 19 Oct 2022 13:13:35 +0200 Message-Id: <20221019111335.872853-6-d.csapak@proxmox.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20221019111335.872853-1-d.csapak@proxmox.com> References: <20221019111335.872853-1-d.csapak@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.068 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 URIBL_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to URIBL was blocked. See http://wiki.apache.org/spamassassin/DnsBlocklists#dnsbl-block for more information. [proxmox-tape.rs] Subject: [pbs-devel] [PATCH proxmox-backup v3 5/5] proxmox-tape: inventory: add default to 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: Wed, 19 Oct 2022 11:13:43 -0000 and convert the 'Option' to 'bool' Signed-off-by: Dominik Csapak --- src/bin/proxmox-tape.rs | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/src/bin/proxmox-tape.rs b/src/bin/proxmox-tape.rs index 3511507f..59254540 100644 --- a/src/bin/proxmox-tape.rs +++ b/src/bin/proxmox-tape.rs @@ -438,11 +438,13 @@ async fn read_label(mut param: Value) -> Result<(), Error> { description: "Load unknown tapes and try read labels", type: bool, optional: true, + default: false, }, "read-all-labels": { description: "Load all tapes and try read labels (even if already inventoried)", type: bool, optional: true, + default: false, }, "catalog": { description: "Try to restore catalogs from tapes.", @@ -455,8 +457,8 @@ async fn read_label(mut param: Value) -> Result<(), Error> { )] /// List (and update) media labels (Changer Inventory) async fn inventory( - read_labels: Option, - read_all_labels: Option, + read_labels: bool, + read_all_labels: bool, catalog: bool, mut param: Value, ) -> Result<(), Error> { @@ -465,8 +467,7 @@ async fn inventory( let (config, _digest) = pbs_config::drive::config()?; let drive = extract_drive_name(&mut param, &config)?; - let read_all_labels = read_all_labels.unwrap_or(false); - let do_read = read_labels.unwrap_or(false) || read_all_labels || catalog; + let do_read = read_labels || read_all_labels || catalog; let client = connect_to_localhost()?; -- 2.30.2