From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [IPv6:2a01:7e0:0:424::9]) by lore.proxmox.com (Postfix) with ESMTPS id 9182A1FF161 for ; Tue, 13 Aug 2024 18:15:44 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 1F6236E81; Tue, 13 Aug 2024 18:15:58 +0200 (CEST) From: Christoph Heiss To: pve-devel@lists.proxmox.com Date: Tue, 13 Aug 2024 18:15:33 +0200 Message-ID: <20240813161538.1660140-5-c.heiss@proxmox.com> X-Mailer: git-send-email 2.45.2 In-Reply-To: <20240813161538.1660140-1-c.heiss@proxmox.com> References: <20240813161538.1660140-1-c.heiss@proxmox.com> MIME-Version: 1.0 X-SPAM-LEVEL: Spam detection results: 0 AWL 0.030 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 - Subject: [pve-devel] [PATCH installer v2 4/5] fix #5250: tui: expose new btrfs `compress` option 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: , Reply-To: Proxmox VE development discussion Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: pve-devel-bounces@lists.proxmox.com Sender: "pve-devel" Signed-off-by: Christoph Heiss --- Changes v1 -> v2: * rebased on master proxmox-tui-installer/src/views/bootdisk.rs | 37 +++++++++++++-------- 1 file changed, 24 insertions(+), 13 deletions(-) diff --git a/proxmox-tui-installer/src/views/bootdisk.rs b/proxmox-tui-installer/src/views/bootdisk.rs index 8db33dd..625374e 100644 --- a/proxmox-tui-installer/src/views/bootdisk.rs +++ b/proxmox-tui-installer/src/views/bootdisk.rs @@ -19,8 +19,9 @@ use proxmox_installer_common::{ check_zfs_raid_config, }, options::{ - AdvancedBootdiskOptions, BootdiskOptions, BtrfsBootdiskOptions, BtrfsCompressOption, Disk, - FsType, LvmBootdiskOptions, ZfsBootdiskOptions, ZFS_CHECKSUM_OPTIONS, ZFS_COMPRESS_OPTIONS, + AdvancedBootdiskOptions, BootdiskOptions, BtrfsBootdiskOptions, Disk, FsType, + LvmBootdiskOptions, ZfsBootdiskOptions, BTRFS_COMPRESS_OPTIONS, ZFS_CHECKSUM_OPTIONS, + ZFS_COMPRESS_OPTIONS, }, setup::{BootType, ProductConfig, ProxmoxProduct, RuntimeInfo}, }; @@ -573,12 +574,23 @@ struct BtrfsBootdiskOptionsView { impl BtrfsBootdiskOptionsView { fn new(runinfo: &RuntimeInfo, options: &BtrfsBootdiskOptions) -> Self { - let view = MultiDiskOptionsView::new( - &runinfo.disks, - &options.selected_disks, - FormView::new().child("hdsize", DiskSizeEditView::new().content(options.disk_size)), - ) - .top_panel(TextView::new("Btrfs integration is a technology preview!").center()); + let inner = FormView::new() + .child( + "compress", + SelectView::new() + .popup() + .with_all(BTRFS_COMPRESS_OPTIONS.iter().map(|o| (o.to_string(), *o))) + .selected( + BTRFS_COMPRESS_OPTIONS + .iter() + .position(|o| *o == options.compress) + .unwrap_or_default(), + ), + ) + .child("hdsize", DiskSizeEditView::new().content(options.disk_size)); + + let view = MultiDiskOptionsView::new(&runinfo.disks, &options.selected_disks, inner) + .top_panel(TextView::new("Btrfs integration is a technology preview!").center()); Self { view } } @@ -592,17 +604,16 @@ impl BtrfsBootdiskOptionsView { fn get_values(&mut self) -> Option<(Vec, BtrfsBootdiskOptions)> { let (disks, selected_disks) = self.view.get_disks_and_selection()?; - let disk_size = self - .view - .get_options_view()? - .get_value::(0)?; + let view = self.view.get_options_view()?; + let compress = view.get_value::, _>(0)?; + let disk_size = view.get_value::(1)?; Some(( disks, BtrfsBootdiskOptions { disk_size, selected_disks, - compress: BtrfsCompressOption::default(), + compress, }, )) } -- 2.45.2 _______________________________________________ pve-devel mailing list pve-devel@lists.proxmox.com https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel