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 980B9D244 for ; Thu, 13 Jul 2023 11:49:48 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 7FDA9378D9 for ; Thu, 13 Jul 2023 11:49:48 +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, 13 Jul 2023 11:49:47 +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 957934076D for ; Thu, 13 Jul 2023 11:49:47 +0200 (CEST) From: Christoph Heiss To: pve-devel@lists.proxmox.com Date: Thu, 13 Jul 2023 11:49:29 +0200 Message-ID: <20230713094941.475486-6-c.heiss@proxmox.com> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20230713094941.475486-1-c.heiss@proxmox.com> References: <20230713094941.475486-1-c.heiss@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL -0.062 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 T_SCC_BODY_TEXT_LINE -0.01 - URIBL_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to URIBL was blocked. See http://wiki.apache.org/spamassassin/DnsBlocklists#dnsbl-block for more information. [bootdisk.rs] Subject: [pve-devel] [PATCH installer 5/7] tui: improve bootdisk dialog error handling 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: Thu, 13 Jul 2023 09:49:48 -0000 Now we don't just fail silently, but instead give the user/developer some indication what went wrong. Signed-off-by: Christoph Heiss --- proxmox-tui-installer/src/views/bootdisk.rs | 55 +++++++++++++++------ 1 file changed, 39 insertions(+), 16 deletions(-) diff --git a/proxmox-tui-installer/src/views/bootdisk.rs b/proxmox-tui-installer/src/views/bootdisk.rs index b0557a6..19a71cf 100644 --- a/proxmox-tui-installer/src/views/bootdisk.rs +++ b/proxmox-tui-installer/src/views/bootdisk.rs @@ -164,39 +164,52 @@ impl AdvancedBootdiskOptionsView { ); } - fn get_values(&mut self) -> Option { + fn get_values(&mut self) -> Result { let fstype = self .view - .get_child(1)? - .downcast_ref::()? - .get_value::, _>(0)?; + .get_child(1) + .and_then(|v| v.downcast_ref::()) + .and_then(|v| v.get_value::, _>(0)) + .ok_or("Failed to retrieve filesystem type".to_owned())?; - let advanced = self.view.get_child_mut(3)?; + let advanced = self + .view + .get_child_mut(3) + .ok_or("Failed to retrieve advanced bootdisk options view".to_owned())?; if let Some(view) = advanced.downcast_mut::() { - Some(BootdiskOptions { + let advanced = view + .get_values() + .map(AdvancedBootdiskOptions::Lvm) + .ok_or("Failed to retrieve advanced bootdisk options")?; + + Ok(BootdiskOptions { disks: vec![], fstype, - advanced: view.get_values().map(AdvancedBootdiskOptions::Lvm)?, + advanced, }) } else if let Some(view) = advanced.downcast_mut::() { - let (disks, advanced) = view.get_values()?; + let (disks, advanced) = view + .get_values() + .ok_or("Failed to retrieve advanced bootdisk options")?; - Some(BootdiskOptions { + Ok(BootdiskOptions { disks, fstype, advanced: AdvancedBootdiskOptions::Zfs(advanced), }) } else if let Some(view) = advanced.downcast_mut::() { - let (disks, advanced) = view.get_values()?; + let (disks, advanced) = view + .get_values() + .ok_or("Failed to retrieve advanced bootdisk options")?; - Some(BootdiskOptions { + Ok(BootdiskOptions { disks, fstype, advanced: AdvancedBootdiskOptions::Btrfs(advanced), }) } else { - None + Err("Invalid bootdisk view state".to_owned()) } } } @@ -532,10 +545,22 @@ fn advanced_options_view(disks: &[Disk], options: Rc>) .call_on_name("advanced-bootdisk-options-dialog", |view: &mut Dialog| { view.get_content_mut() .downcast_mut() - .and_then(AdvancedBootdiskOptionsView::get_values) + .map(AdvancedBootdiskOptionsView::get_values) }) .flatten(); + let options = match options { + Some(Ok(options)) => options, + Some(Err(err)) => { + siv.add_layer(Dialog::info(err)); + return; + } + None => { + siv.add_layer(Dialog::info("Failed to retrieve bootdisk options view")); + return; + } + }; + if let Err(duplicate) = check_for_duplicate_disks(&options.disks) { siv.add_layer(Dialog::info(format!( "Cannot select same disk twice: {duplicate}" @@ -544,9 +569,7 @@ fn advanced_options_view(disks: &[Disk], options: Rc>) } siv.pop_layer(); - if let Some(options) = options { - *(*options_ref).borrow_mut() = options; - } + *(*options_ref).borrow_mut() = options; } }) .with_name("advanced-bootdisk-options-dialog") -- 2.41.0