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 71D06D282 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 5AE2D378D8 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 0E56A4087D 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:27 +0200 Message-ID: <20230713094941.475486-4-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 3/7] tui: simplify duplicate disk checking logic 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 This reduces the logic from O(n^2) to O(n), which is always a good thing. Signed-off-by: Christoph Heiss --- proxmox-tui-installer/src/views/bootdisk.rs | 39 ++++++++++++--------- 1 file changed, 23 insertions(+), 16 deletions(-) diff --git a/proxmox-tui-installer/src/views/bootdisk.rs b/proxmox-tui-installer/src/views/bootdisk.rs index 6ef814f..b0557a6 100644 --- a/proxmox-tui-installer/src/views/bootdisk.rs +++ b/proxmox-tui-installer/src/views/bootdisk.rs @@ -1,4 +1,4 @@ -use std::{cell::RefCell, marker::PhantomData, rc::Rc}; +use std::{cell::RefCell, collections::HashSet, marker::PhantomData, rc::Rc}; use cursive::{ view::{Nameable, Resizable, ViewWrapper}, @@ -536,21 +536,11 @@ fn advanced_options_view(disks: &[Disk], options: Rc>) }) .flatten(); - if let Some(disks) = options.as_ref().map(|opts| &opts.disks) { - if disks.len() > 1 { - for i in 0..(disks.len() - 1) { - let check_disk = &disks[i]; - for disk in &disks[(i + 1)..] { - if disk.index == check_disk.index { - siv.add_layer(Dialog::info(format!( - "cannot select same disk ({}) twice", - disk.path - ))); - return; - } - } - } - } + if let Err(duplicate) = check_for_duplicate_disks(&options.disks) { + siv.add_layer(Dialog::info(format!( + "Cannot select same disk twice: {duplicate}" + ))); + return; } siv.pop_layer(); @@ -562,3 +552,20 @@ fn advanced_options_view(disks: &[Disk], options: Rc>) .with_name("advanced-bootdisk-options-dialog") .max_size((120, 40)) } + +/// Checks a list of disks for duplicate entries, using their index as key. +/// +/// # Arguments +/// +/// * `disks` - A list of disks to check for duplicates. +fn check_for_duplicate_disks(disks: &[Disk]) -> Result<(), &Disk> { + let mut set = HashSet::new(); + + for disk in disks { + if !set.insert(&disk.index) { + return Err(disk); + } + } + + Ok(()) +} -- 2.41.0