From 0684a19ab2910cfe5ddf0c3bb4a30d1947723506 Mon Sep 17 00:00:00 2001 From: Ward from fusion-voyager-3 Date: Mon, 19 Aug 2024 09:45:27 +0300 Subject: [PATCH] Move giant manual parting code into seprate file --- src/manual_partitioning_page/func.rs | 856 +++++++++++++++++++++++++++ src/manual_partitioning_page/mod.rs | 856 +-------------------------- 2 files changed, 861 insertions(+), 851 deletions(-) create mode 100644 src/manual_partitioning_page/func.rs diff --git a/src/manual_partitioning_page/func.rs b/src/manual_partitioning_page/func.rs new file mode 100644 index 0000000..4335c9a --- /dev/null +++ b/src/manual_partitioning_page/func.rs @@ -0,0 +1,856 @@ +use crate::drive_mount_row::DriveMountRow; +use crate::installer_stack_page; +use crate::partitioning_page::{get_partitions, CrypttabEntry, FstabEntry, Partition}; +use adw::gio; +use adw::prelude::*; +use glib::{clone, closure_local, ffi::gboolean}; +use gtk::{glib, prelude::*}; +use std::{cell::RefCell, rc::Rc}; + +const MINIMUM_EFI_BYTE_SIZE: f64 = 500000000.0; +const MINIMUM_BOOT_BYTE_SIZE: f64 = 1000000000.0; +const MINIMUM_ROOT_BYTE_SIZE: f64 = 39000000000.0; + +#[derive(Clone)] +struct PartitionRow { + widget: adw::ActionRow, + swap_fs_error: Rc>, + hardcode_fs_error: Rc>, + used: Rc>, + never: Rc>, +} + +pub fn create_efi_row( + listbox: >k::ListBox, + drive_rows_size_group: >k::SizeGroup, + partition_array: &Vec, + partition_changed_action: &gio::SimpleAction, + language_changed_action: &gio::SimpleAction, + used_partition_array_refcell: &Rc>>, + subvol_partition_array_refcell: &Rc>>, +) { + let partition_scroll_child = gtk::ListBox::builder() + .selection_mode(gtk::SelectionMode::None) + .build(); + + let partitions_scroll = gtk::ScrolledWindow::builder() + .hexpand(true) + .vexpand(true) + .child(&partition_scroll_child) + .build(); + + // Create row + let row = DriveMountRow::new_with_scroll(&partitions_scroll); + + row.set_deletable(false); + + row.set_sizegroup(drive_rows_size_group); + + row.set_langaction(language_changed_action); + + row.set_mountpoint("/boot/efi"); + + let null_checkbutton = gtk::CheckButton::builder().build(); + + for partition in partition_array { + let part_name = &partition.part_name.to_owned(); + let partition_button = gtk::CheckButton::builder() + .valign(gtk::Align::Center) + .can_focus(false) + .build(); + partition_button.set_group(Some(&null_checkbutton)); + let partition_row_struct: PartitionRow = if partition.need_mapper { + PartitionRow { + widget: { + let prow = adw::ActionRow::builder() + .activatable_widget(&partition_button) + .title(part_name) + .subtitle( + t!("partition_row_subtitle_needs_mapper").to_string() + + " " + + &pretty_bytes::converter::convert(partition.part_size), + ) + .sensitive(false) + .build(); + prow + }, + swap_fs_error: Rc::new(RefCell::new(false)), + hardcode_fs_error: Rc::new(RefCell::new(false)), + used: Rc::new(RefCell::new(0)), + never: Rc::new(RefCell::new(true)), + } + } else if used_partition_array_refcell + .clone() + .borrow() + .iter() + .any(|e| part_name == e && part_name != &row.partition()) + { + PartitionRow { + widget: { + let prow = adw::ActionRow::builder() + .activatable_widget(&partition_button) + .title(part_name) + .subtitle( + String::from(&partition.part_fs) + + " " + + &pretty_bytes::converter::convert(partition.part_size), + ) + .sensitive(false) + .build(); + prow + }, + swap_fs_error: Rc::new(RefCell::new(false)), + hardcode_fs_error: Rc::new(RefCell::new(false)), + used: Rc::new(RefCell::new(1)), + never: Rc::new(RefCell::new(false)), + } + } else if partition.part_fs != "vfat" { + PartitionRow { + widget: { + let prow = adw::ActionRow::builder() + .activatable_widget(&partition_button) + .title(part_name) + .subtitle(t!("partition_row_subtitle_efi_fs_bad")) + .sensitive(false) + .build(); + prow + }, + swap_fs_error: Rc::new(RefCell::new(false)), + hardcode_fs_error: Rc::new(RefCell::new(true)), + used: Rc::new(RefCell::new(0)), + never: Rc::new(RefCell::new(true)), + } + } else if partition.part_size < MINIMUM_EFI_BYTE_SIZE { + PartitionRow { + widget: { + let prow = adw::ActionRow::builder() + .activatable_widget(&partition_button) + .title(part_name) + .subtitle(t!("partition_row_subtitle_efi_fs_small")) + .sensitive(false) + .build(); + prow + }, + swap_fs_error: Rc::new(RefCell::new(false)), + hardcode_fs_error: Rc::new(RefCell::new(true)), + used: Rc::new(RefCell::new(0)), + never: Rc::new(RefCell::new(true)), + } + } else { + PartitionRow { + widget: { + let prow = adw::ActionRow::builder() + .activatable_widget(&partition_button) + .title(part_name) + .subtitle( + String::from(&partition.part_fs) + + " " + + &pretty_bytes::converter::convert(partition.part_size), + ) + .sensitive(true) + .build(); + prow + }, + swap_fs_error: Rc::new(RefCell::new(false)), + hardcode_fs_error: Rc::new(RefCell::new(false)), + used: Rc::new(RefCell::new(0)), + never: Rc::new(RefCell::new(false)), + } + }; + post_check_drive_mount( + &row, + &partition_row_struct, + &partition_button, + &partition_changed_action, + &partition, + &used_partition_array_refcell, + &subvol_partition_array_refcell, + ); + partition_scroll_child.append(&partition_row_struct.widget); + } + + row.connect_mountopts_notify(clone!( + #[strong] + partition_changed_action, + #[strong] + subvol_partition_array_refcell, + #[strong] + row, + move |_| { + if row.mountopts().contains("subvol=") || row.mountopts().contains("subvolid") { + (*subvol_partition_array_refcell.borrow_mut()).push(row.partition()); + } else { + (*subvol_partition_array_refcell.borrow_mut()).retain(|x| x != &row.partition()); + } + partition_changed_action.activate(None); + } + )); + + listbox.append(&row); + + row.connect_closure( + "row-deleted", + false, + closure_local!( + #[weak] + listbox, + #[strong] + row, + #[strong] + used_partition_array_refcell, + #[strong] + partition_changed_action, + move |row: DriveMountRow| { + listbox.remove(&row); + (*used_partition_array_refcell.borrow_mut()).retain(|x| x != &row.partition()); + partition_changed_action.activate(None); + } + ), + ); +} + +pub fn create_boot_row( + listbox: >k::ListBox, + drive_rows_size_group: >k::SizeGroup, + partition_array: &Vec, + partition_changed_action: &gio::SimpleAction, + language_changed_action: &gio::SimpleAction, + used_partition_array_refcell: &Rc>>, + subvol_partition_array_refcell: &Rc>>, +) { + let partition_scroll_child = gtk::ListBox::builder() + .selection_mode(gtk::SelectionMode::None) + .build(); + + let partitions_scroll = gtk::ScrolledWindow::builder() + .hexpand(true) + .vexpand(true) + .child(&partition_scroll_child) + .build(); + + // Create row + let row = DriveMountRow::new_with_scroll(&partitions_scroll); + + row.set_deletable(false); + + row.set_sizegroup(drive_rows_size_group); + + row.set_langaction(language_changed_action); + + row.set_mountpoint("/boot"); + + let null_checkbutton = gtk::CheckButton::builder().build(); + + for partition in partition_array { + let part_name = &partition.part_name.to_owned(); + let partition_button = gtk::CheckButton::builder() + .valign(gtk::Align::Center) + .can_focus(false) + .build(); + partition_button.set_group(Some(&null_checkbutton)); + let partition_row_struct: PartitionRow = if partition.need_mapper { + PartitionRow { + widget: { + let prow = adw::ActionRow::builder() + .activatable_widget(&partition_button) + .title(part_name) + .subtitle( + t!("partition_row_subtitle_needs_mapper").to_string() + + " " + + &pretty_bytes::converter::convert(partition.part_size), + ) + .sensitive(false) + .build(); + prow + }, + swap_fs_error: Rc::new(RefCell::new(false)), + hardcode_fs_error: Rc::new(RefCell::new(false)), + used: Rc::new(RefCell::new(0)), + never: Rc::new(RefCell::new(true)), + } + } else if used_partition_array_refcell + .clone() + .borrow() + .iter() + .any(|e| part_name == e && part_name != &row.partition()) + { + PartitionRow { + widget: { + let prow = adw::ActionRow::builder() + .activatable_widget(&partition_button) + .title(part_name) + .subtitle( + String::from(&partition.part_fs) + + " " + + &pretty_bytes::converter::convert(partition.part_size), + ) + .sensitive(false) + .build(); + prow + }, + swap_fs_error: Rc::new(RefCell::new(false)), + hardcode_fs_error: Rc::new(RefCell::new(false)), + used: Rc::new(RefCell::new(1)), + never: Rc::new(RefCell::new(false)), + } + } else if partition.part_fs != "ext4" { + PartitionRow { + widget: { + let prow = adw::ActionRow::builder() + .activatable_widget(&partition_button) + .title(part_name) + .subtitle(t!("partition_row_subtitle_boot_fs_bad")) + .sensitive(false) + .build(); + prow + }, + swap_fs_error: Rc::new(RefCell::new(false)), + hardcode_fs_error: Rc::new(RefCell::new(true)), + used: Rc::new(RefCell::new(0)), + never: Rc::new(RefCell::new(true)), + } + } else if partition.part_size < MINIMUM_BOOT_BYTE_SIZE { + PartitionRow { + widget: { + let prow = adw::ActionRow::builder() + .activatable_widget(&partition_button) + .title(part_name) + .subtitle(t!("partition_row_subtitle_boot_fs_small")) + .sensitive(false) + .build(); + prow + }, + swap_fs_error: Rc::new(RefCell::new(false)), + hardcode_fs_error: Rc::new(RefCell::new(true)), + used: Rc::new(RefCell::new(0)), + never: Rc::new(RefCell::new(true)), + } + } else { + PartitionRow { + widget: { + let prow = adw::ActionRow::builder() + .activatable_widget(&partition_button) + .title(part_name) + .subtitle( + String::from(&partition.part_fs) + + " " + + &pretty_bytes::converter::convert(partition.part_size), + ) + .sensitive(true) + .build(); + prow + }, + swap_fs_error: Rc::new(RefCell::new(false)), + hardcode_fs_error: Rc::new(RefCell::new(false)), + used: Rc::new(RefCell::new(0)), + never: Rc::new(RefCell::new(false)), + } + }; + post_check_drive_mount( + &row, + &partition_row_struct, + &partition_button, + &partition_changed_action, + &partition, + &used_partition_array_refcell, + &subvol_partition_array_refcell, + ); + partition_scroll_child.append(&partition_row_struct.widget); + } + + row.connect_mountopts_notify(clone!( + #[strong] + partition_changed_action, + #[strong] + subvol_partition_array_refcell, + #[strong] + row, + move |_| { + if row.mountopts().contains("subvol=") || row.mountopts().contains("subvolid") { + (*subvol_partition_array_refcell.borrow_mut()).push(row.partition()); + } else { + (*subvol_partition_array_refcell.borrow_mut()).retain(|x| x != &row.partition()); + } + partition_changed_action.activate(None); + } + )); + + listbox.append(&row); + + row.connect_closure( + "row-deleted", + false, + closure_local!( + #[weak] + listbox, + #[strong] + row, + #[strong] + used_partition_array_refcell, + #[strong] + partition_changed_action, + move |row: DriveMountRow| { + listbox.remove(&row); + (*used_partition_array_refcell.borrow_mut()).retain(|x| x != &row.partition()); + partition_changed_action.activate(None); + } + ), + ); +} + +pub fn create_root_row( + listbox: >k::ListBox, + drive_rows_size_group: >k::SizeGroup, + partition_array: &Vec, + partition_changed_action: &gio::SimpleAction, + language_changed_action: &gio::SimpleAction, + used_partition_array_refcell: &Rc>>, + subvol_partition_array_refcell: &Rc>>, +) { + let partition_scroll_child = gtk::ListBox::builder() + .selection_mode(gtk::SelectionMode::None) + .build(); + + let partitions_scroll = gtk::ScrolledWindow::builder() + .hexpand(true) + .vexpand(true) + .child(&partition_scroll_child) + .build(); + + // Create row + let row = DriveMountRow::new_with_scroll(&partitions_scroll); + + row.set_deletable(false); + + row.set_sizegroup(drive_rows_size_group); + + row.set_langaction(language_changed_action); + + row.set_mountpoint("/"); + + let null_checkbutton = gtk::CheckButton::builder().build(); + + for partition in partition_array { + let part_name = &partition.part_name.to_owned(); + let partition_button = gtk::CheckButton::builder() + .valign(gtk::Align::Center) + .can_focus(false) + .build(); + partition_button.set_group(Some(&null_checkbutton)); + let partition_row_struct: PartitionRow = if partition.need_mapper { + PartitionRow { + widget: { + let prow = adw::ActionRow::builder() + .activatable_widget(&partition_button) + .title(part_name) + .subtitle( + t!("partition_row_subtitle_needs_mapper").to_string() + + " " + + &pretty_bytes::converter::convert(partition.part_size), + ) + .sensitive(false) + .build(); + prow + }, + swap_fs_error: Rc::new(RefCell::new(false)), + hardcode_fs_error: Rc::new(RefCell::new(false)), + used: Rc::new(RefCell::new(0)), + never: Rc::new(RefCell::new(true)), + } + } else if used_partition_array_refcell + .clone() + .borrow() + .iter() + .any(|e| part_name == e && part_name != &row.partition()) + { + PartitionRow { + widget: { + let prow = adw::ActionRow::builder() + .activatable_widget(&partition_button) + .title(part_name) + .subtitle( + String::from(&partition.part_fs) + + " " + + &pretty_bytes::converter::convert(partition.part_size), + ) + .sensitive(false) + .build(); + prow + }, + swap_fs_error: Rc::new(RefCell::new(false)), + hardcode_fs_error: Rc::new(RefCell::new(false)), + used: Rc::new(RefCell::new(1)), + never: Rc::new(RefCell::new(false)), + } + } else if partition.part_fs == "vfat" + || partition.part_fs == "ntfs" + || partition.part_fs == "swap" + || partition.part_fs == "exfat" + || partition.part_fs == "BitLocker" + { + PartitionRow { + widget: { + let prow = adw::ActionRow::builder() + .activatable_widget(&partition_button) + .title(part_name) + .subtitle(t!("partition_row_subtitle_root_fs_bad")) + .sensitive(false) + .build(); + prow + }, + swap_fs_error: Rc::new(RefCell::new(false)), + hardcode_fs_error: Rc::new(RefCell::new(true)), + used: Rc::new(RefCell::new(0)), + never: Rc::new(RefCell::new(true)), + } + } else if partition.part_size < MINIMUM_ROOT_BYTE_SIZE { + PartitionRow { + widget: { + let prow = adw::ActionRow::builder() + .activatable_widget(&partition_button) + .title(part_name) + .subtitle(t!("partition_row_subtitle_root_fs_small")) + .sensitive(false) + .build(); + prow + }, + swap_fs_error: Rc::new(RefCell::new(false)), + hardcode_fs_error: Rc::new(RefCell::new(true)), + used: Rc::new(RefCell::new(0)), + never: Rc::new(RefCell::new(true)), + } + } else { + PartitionRow { + widget: { + let prow = adw::ActionRow::builder() + .activatable_widget(&partition_button) + .title(part_name) + .subtitle( + String::from(&partition.part_fs) + + " " + + &pretty_bytes::converter::convert(partition.part_size), + ) + .sensitive(true) + .build(); + prow + }, + hardcode_fs_error: Rc::new(RefCell::new(false)), + swap_fs_error: Rc::new(RefCell::new(false)), + used: Rc::new(RefCell::new(0)), + never: Rc::new(RefCell::new(false)), + } + }; + post_check_drive_mount( + &row, + &partition_row_struct, + &partition_button, + &partition_changed_action, + &partition, + &used_partition_array_refcell, + &subvol_partition_array_refcell, + ); + partition_scroll_child.append(&partition_row_struct.widget); + } + + row.connect_mountopts_notify(clone!( + #[strong] + partition_changed_action, + #[strong] + subvol_partition_array_refcell, + #[strong] + row, + move |_| { + if row.mountopts().contains("subvol=") || row.mountopts().contains("subvolid") { + (*subvol_partition_array_refcell.borrow_mut()).push(row.partition()); + } else { + (*subvol_partition_array_refcell.borrow_mut()).retain(|x| x != &row.partition()); + } + partition_changed_action.activate(None); + } + )); + + listbox.append(&row); + + row.connect_closure( + "row-deleted", + false, + closure_local!( + #[weak] + listbox, + #[strong] + row, + #[strong] + used_partition_array_refcell, + #[strong] + partition_changed_action, + move |row: DriveMountRow| { + listbox.remove(&row); + (*used_partition_array_refcell.borrow_mut()).retain(|x| x != &row.partition()); + partition_changed_action.activate(None); + } + ), + ); +} + +pub fn create_mount_row( + listbox: >k::ListBox, + drive_rows_size_group: >k::SizeGroup, + partition_array: &Vec, + partition_changed_action: &gio::SimpleAction, + language_changed_action: &gio::SimpleAction, + used_partition_array_refcell: &Rc>>, + subvol_partition_array_refcell: &Rc>>, +) { + let partition_scroll_child = gtk::ListBox::builder() + .selection_mode(gtk::SelectionMode::None) + .build(); + + let partitions_scroll = gtk::ScrolledWindow::builder() + .hexpand(true) + .vexpand(true) + .child(&partition_scroll_child) + .build(); + + // Create row + let row = DriveMountRow::new_with_scroll(&partitions_scroll); + + row.set_deletable(true); + + row.set_sizegroup(drive_rows_size_group); + + row.set_langaction(language_changed_action); + + let null_checkbutton = gtk::CheckButton::builder().build(); + + for partition in partition_array { + let part_name = &partition.part_name.to_owned(); + let partition_button = gtk::CheckButton::builder() + .valign(gtk::Align::Center) + .can_focus(false) + .build(); + partition_button.set_group(Some(&null_checkbutton)); + let partition_row_struct: PartitionRow = if partition.need_mapper { + PartitionRow { + widget: { + let prow = adw::ActionRow::builder() + .activatable_widget(&partition_button) + .title(part_name) + .subtitle( + t!("partition_row_subtitle_needs_mapper").to_string() + + " " + + &pretty_bytes::converter::convert(partition.part_size), + ) + .sensitive(false) + .build(); + prow + }, + hardcode_fs_error: Rc::new(RefCell::new(false)), + swap_fs_error: Rc::new(RefCell::new(false)), + used: Rc::new(RefCell::new(0)), + never: Rc::new(RefCell::new(true)), + } + } else if used_partition_array_refcell + .clone() + .borrow() + .iter() + .any(|e| part_name == e && part_name != &row.partition()) + { + PartitionRow { + widget: { + let prow = adw::ActionRow::builder() + .activatable_widget(&partition_button) + .title(part_name) + .subtitle( + String::from(&partition.part_fs) + + " " + + &pretty_bytes::converter::convert(partition.part_size), + ) + .sensitive(false) + .build(); + prow + }, + hardcode_fs_error: Rc::new(RefCell::new(false)), + swap_fs_error: Rc::new(RefCell::new(false)), + used: Rc::new(RefCell::new(1)), + never: Rc::new(RefCell::new(false)), + } + } else { + PartitionRow { + widget: { + let prow = adw::ActionRow::builder() + .activatable_widget(&partition_button) + .title(part_name) + .subtitle( + String::from(&partition.part_fs) + + " " + + &pretty_bytes::converter::convert(partition.part_size), + ) + .sensitive(true) + .build(); + prow + }, + hardcode_fs_error: Rc::new(RefCell::new(false)), + swap_fs_error: Rc::new(RefCell::new(false)), + used: Rc::new(RefCell::new(0)), + never: Rc::new(RefCell::new(false)), + } + }; + post_check_drive_mount( + &row, + &partition_row_struct, + &partition_button, + &partition_changed_action, + &partition, + &used_partition_array_refcell, + &subvol_partition_array_refcell, + ); + partition_scroll_child.append(&partition_row_struct.widget); + } + + row.connect_mountopts_notify(clone!( + #[strong] + partition_changed_action, + #[strong] + subvol_partition_array_refcell, + #[strong] + row, + move |_| { + if row.mountopts().contains("subvol=") || row.mountopts().contains("subvolid") { + (*subvol_partition_array_refcell.borrow_mut()).push(row.partition()); + } else { + (*subvol_partition_array_refcell.borrow_mut()).retain(|x| x != &row.partition()); + } + partition_changed_action.activate(None); + } + )); + + listbox.append(&row); + + row.connect_closure( + "row-deleted", + false, + closure_local!( + #[weak] + listbox, + #[strong] + row, + #[strong] + used_partition_array_refcell, + #[strong] + partition_changed_action, + move |row: DriveMountRow| { + listbox.remove(&row); + (*used_partition_array_refcell.borrow_mut()).retain(|x| x != &row.partition()); + partition_changed_action.activate(None); + } + ), + ); +} + +fn post_check_drive_mount( + row: &DriveMountRow, + partition_row_struct: &PartitionRow, + partition_button: >k::CheckButton, + partition_changed_action: &gio::SimpleAction, + partition: &Partition, + used_partition_array_refcell: &Rc>>, + subvol_partition_array_refcell: &Rc>>, +) { + partition_row_struct.widget.add_prefix(partition_button); + partition_button.connect_toggled(clone!( + #[weak] + row, + #[weak] + partition_button, + #[strong] + partition_changed_action, + #[strong] + used_partition_array_refcell, + #[strong] + partition, + move |_| { + if partition_button.is_active() == true { + let part_name = &partition.part_name; + row.set_partition(part_name.to_string()); + (*used_partition_array_refcell.borrow_mut()).push(part_name.to_string()); + } else { + (*used_partition_array_refcell.borrow_mut()).retain(|x| x != &partition.part_name); + } + partition_changed_action.activate(None); + } + )); + row.connect_mountpoint_notify(clone!( + #[strong] + partition_row_struct, + #[strong] + partition, + #[strong] + row, + move |_| { + if row.mountpoint() == "[SWAP]" { + if partition.part_fs == "linux-swap" { + (*partition_row_struct.swap_fs_error.borrow_mut()) = false; + if *partition_row_struct.never.borrow() == false + && *partition_row_struct.swap_fs_error.borrow() == false + && *partition_row_struct.hardcode_fs_error.borrow() == false + { + partition_row_struct.widget.set_sensitive(true); + } + } else { + (*partition_row_struct.swap_fs_error.borrow_mut()) = true; + partition_row_struct.widget.set_sensitive(false); + } + } else if *partition_row_struct.used.borrow() != 1 + && *partition_row_struct.never.borrow() == false + && *partition_row_struct.hardcode_fs_error.borrow() == false + { + (*partition_row_struct.swap_fs_error.borrow_mut()) = false; + partition_row_struct.widget.set_sensitive(true); + } + } + )); + + partition_changed_action.connect_activate(clone!( + #[strong] + partition_row_struct, + #[strong] + row, + #[strong] + partition, + #[strong] + used_partition_array_refcell, + #[strong] + subvol_partition_array_refcell, + move |_, _| { + let part_name = &partition.part_name; + let used_partition_array = used_partition_array_refcell.borrow(); + let subvol_partition_array = subvol_partition_array_refcell.borrow(); + if used_partition_array + .iter() + .any(|e| part_name == e && part_name != &row.partition()) + { + if subvol_partition_array + .iter() + .any(|e| part_name == e && part_name != &row.partition()) + { + if *partition_row_struct.never.borrow() == false + && *partition_row_struct.swap_fs_error.borrow() == false + && *partition_row_struct.hardcode_fs_error.borrow() == false + { + partition_row_struct.widget.set_sensitive(true); + } + (*partition_row_struct.used.borrow_mut()) = 2; + } else { + partition_row_struct.widget.set_sensitive(false); + (*partition_row_struct.used.borrow_mut()) = 1; + } + } else if *partition_row_struct.never.borrow() == false + && *partition_row_struct.swap_fs_error.borrow() == false + && *partition_row_struct.hardcode_fs_error.borrow() == false + { + partition_row_struct.widget.set_sensitive(true); + (*partition_row_struct.used.borrow_mut()) = 0; + } + } + )); +} \ No newline at end of file diff --git a/src/manual_partitioning_page/mod.rs b/src/manual_partitioning_page/mod.rs index 827cdda..c89ca30 100644 --- a/src/manual_partitioning_page/mod.rs +++ b/src/manual_partitioning_page/mod.rs @@ -7,18 +7,7 @@ use glib::{clone, closure_local, ffi::gboolean}; use gtk::{glib, prelude::*}; use std::{cell::RefCell, rc::Rc}; -const MINIMUM_EFI_BYTE_SIZE: f64 = 500000000.0; -const MINIMUM_BOOT_BYTE_SIZE: f64 = 1000000000.0; -const MINIMUM_ROOT_BYTE_SIZE: f64 = 39000000000.0; - -#[derive(Clone)] -struct PartitionRow { - widget: adw::ActionRow, - swap_fs_error: Rc>, - hardcode_fs_error: Rc>, - used: Rc>, - never: Rc>, -} +mod func; pub fn manual_partitioning_page( partition_carousel: &adw::Carousel, @@ -141,841 +130,6 @@ pub fn manual_partitioning_page( // } -fn create_efi_row( - listbox: >k::ListBox, - drive_rows_size_group: >k::SizeGroup, - partition_array: &Vec, - partition_changed_action: &gio::SimpleAction, - language_changed_action: &gio::SimpleAction, - used_partition_array_refcell: &Rc>>, - subvol_partition_array_refcell: &Rc>>, -) { - let partition_scroll_child = gtk::ListBox::builder() - .selection_mode(gtk::SelectionMode::None) - .build(); - - let partitions_scroll = gtk::ScrolledWindow::builder() - .hexpand(true) - .vexpand(true) - .child(&partition_scroll_child) - .build(); - - // Create row - let row = DriveMountRow::new_with_scroll(&partitions_scroll); - - row.set_deletable(false); - - row.set_sizegroup(drive_rows_size_group); - - row.set_langaction(language_changed_action); - - row.set_mountpoint("/boot/efi"); - - let null_checkbutton = gtk::CheckButton::builder().build(); - - for partition in partition_array { - let part_name = &partition.part_name.to_owned(); - let partition_button = gtk::CheckButton::builder() - .valign(gtk::Align::Center) - .can_focus(false) - .build(); - partition_button.set_group(Some(&null_checkbutton)); - let partition_row_struct: PartitionRow = if partition.need_mapper { - PartitionRow { - widget: { - let prow = adw::ActionRow::builder() - .activatable_widget(&partition_button) - .title(part_name) - .subtitle( - t!("partition_row_subtitle_needs_mapper").to_string() - + " " - + &pretty_bytes::converter::convert(partition.part_size), - ) - .sensitive(false) - .build(); - prow - }, - swap_fs_error: Rc::new(RefCell::new(false)), - hardcode_fs_error: Rc::new(RefCell::new(false)), - used: Rc::new(RefCell::new(0)), - never: Rc::new(RefCell::new(true)), - } - } else if used_partition_array_refcell - .clone() - .borrow() - .iter() - .any(|e| part_name == e && part_name != &row.partition()) - { - PartitionRow { - widget: { - let prow = adw::ActionRow::builder() - .activatable_widget(&partition_button) - .title(part_name) - .subtitle( - String::from(&partition.part_fs) - + " " - + &pretty_bytes::converter::convert(partition.part_size), - ) - .sensitive(false) - .build(); - prow - }, - swap_fs_error: Rc::new(RefCell::new(false)), - hardcode_fs_error: Rc::new(RefCell::new(false)), - used: Rc::new(RefCell::new(1)), - never: Rc::new(RefCell::new(false)), - } - } else if partition.part_fs != "vfat" { - PartitionRow { - widget: { - let prow = adw::ActionRow::builder() - .activatable_widget(&partition_button) - .title(part_name) - .subtitle(t!("partition_row_subtitle_efi_fs_bad")) - .sensitive(false) - .build(); - prow - }, - swap_fs_error: Rc::new(RefCell::new(false)), - hardcode_fs_error: Rc::new(RefCell::new(true)), - used: Rc::new(RefCell::new(0)), - never: Rc::new(RefCell::new(true)), - } - } else if partition.part_size < MINIMUM_EFI_BYTE_SIZE { - PartitionRow { - widget: { - let prow = adw::ActionRow::builder() - .activatable_widget(&partition_button) - .title(part_name) - .subtitle(t!("partition_row_subtitle_efi_fs_small")) - .sensitive(false) - .build(); - prow - }, - swap_fs_error: Rc::new(RefCell::new(false)), - hardcode_fs_error: Rc::new(RefCell::new(true)), - used: Rc::new(RefCell::new(0)), - never: Rc::new(RefCell::new(true)), - } - } else { - PartitionRow { - widget: { - let prow = adw::ActionRow::builder() - .activatable_widget(&partition_button) - .title(part_name) - .subtitle( - String::from(&partition.part_fs) - + " " - + &pretty_bytes::converter::convert(partition.part_size), - ) - .sensitive(true) - .build(); - prow - }, - swap_fs_error: Rc::new(RefCell::new(false)), - hardcode_fs_error: Rc::new(RefCell::new(false)), - used: Rc::new(RefCell::new(0)), - never: Rc::new(RefCell::new(false)), - } - }; - post_check_drive_mount( - &row, - &partition_row_struct, - &partition_button, - &partition_changed_action, - &partition, - &used_partition_array_refcell, - &subvol_partition_array_refcell, - ); - partition_scroll_child.append(&partition_row_struct.widget); - } - - row.connect_mountopts_notify(clone!( - #[strong] - partition_changed_action, - #[strong] - subvol_partition_array_refcell, - #[strong] - row, - move |_| { - if row.mountopts().contains("subvol=") || row.mountopts().contains("subvolid") { - (*subvol_partition_array_refcell.borrow_mut()).push(row.partition()); - } else { - (*subvol_partition_array_refcell.borrow_mut()).retain(|x| x != &row.partition()); - } - partition_changed_action.activate(None); - } - )); - - listbox.append(&row); - - row.connect_closure( - "row-deleted", - false, - closure_local!( - #[weak] - listbox, - #[strong] - row, - #[strong] - used_partition_array_refcell, - #[strong] - partition_changed_action, - move |row: DriveMountRow| { - listbox.remove(&row); - (*used_partition_array_refcell.borrow_mut()).retain(|x| x != &row.partition()); - partition_changed_action.activate(None); - } - ), - ); -} - -fn create_boot_row( - listbox: >k::ListBox, - drive_rows_size_group: >k::SizeGroup, - partition_array: &Vec, - partition_changed_action: &gio::SimpleAction, - language_changed_action: &gio::SimpleAction, - used_partition_array_refcell: &Rc>>, - subvol_partition_array_refcell: &Rc>>, -) { - let partition_scroll_child = gtk::ListBox::builder() - .selection_mode(gtk::SelectionMode::None) - .build(); - - let partitions_scroll = gtk::ScrolledWindow::builder() - .hexpand(true) - .vexpand(true) - .child(&partition_scroll_child) - .build(); - - // Create row - let row = DriveMountRow::new_with_scroll(&partitions_scroll); - - row.set_deletable(false); - - row.set_sizegroup(drive_rows_size_group); - - row.set_langaction(language_changed_action); - - row.set_mountpoint("/boot"); - - let null_checkbutton = gtk::CheckButton::builder().build(); - - for partition in partition_array { - let part_name = &partition.part_name.to_owned(); - let partition_button = gtk::CheckButton::builder() - .valign(gtk::Align::Center) - .can_focus(false) - .build(); - partition_button.set_group(Some(&null_checkbutton)); - let partition_row_struct: PartitionRow = if partition.need_mapper { - PartitionRow { - widget: { - let prow = adw::ActionRow::builder() - .activatable_widget(&partition_button) - .title(part_name) - .subtitle( - t!("partition_row_subtitle_needs_mapper").to_string() - + " " - + &pretty_bytes::converter::convert(partition.part_size), - ) - .sensitive(false) - .build(); - prow - }, - swap_fs_error: Rc::new(RefCell::new(false)), - hardcode_fs_error: Rc::new(RefCell::new(false)), - used: Rc::new(RefCell::new(0)), - never: Rc::new(RefCell::new(true)), - } - } else if used_partition_array_refcell - .clone() - .borrow() - .iter() - .any(|e| part_name == e && part_name != &row.partition()) - { - PartitionRow { - widget: { - let prow = adw::ActionRow::builder() - .activatable_widget(&partition_button) - .title(part_name) - .subtitle( - String::from(&partition.part_fs) - + " " - + &pretty_bytes::converter::convert(partition.part_size), - ) - .sensitive(false) - .build(); - prow - }, - swap_fs_error: Rc::new(RefCell::new(false)), - hardcode_fs_error: Rc::new(RefCell::new(false)), - used: Rc::new(RefCell::new(1)), - never: Rc::new(RefCell::new(false)), - } - } else if partition.part_fs != "ext4" { - PartitionRow { - widget: { - let prow = adw::ActionRow::builder() - .activatable_widget(&partition_button) - .title(part_name) - .subtitle(t!("partition_row_subtitle_boot_fs_bad")) - .sensitive(false) - .build(); - prow - }, - swap_fs_error: Rc::new(RefCell::new(false)), - hardcode_fs_error: Rc::new(RefCell::new(true)), - used: Rc::new(RefCell::new(0)), - never: Rc::new(RefCell::new(true)), - } - } else if partition.part_size < MINIMUM_BOOT_BYTE_SIZE { - PartitionRow { - widget: { - let prow = adw::ActionRow::builder() - .activatable_widget(&partition_button) - .title(part_name) - .subtitle(t!("partition_row_subtitle_boot_fs_small")) - .sensitive(false) - .build(); - prow - }, - swap_fs_error: Rc::new(RefCell::new(false)), - hardcode_fs_error: Rc::new(RefCell::new(true)), - used: Rc::new(RefCell::new(0)), - never: Rc::new(RefCell::new(true)), - } - } else { - PartitionRow { - widget: { - let prow = adw::ActionRow::builder() - .activatable_widget(&partition_button) - .title(part_name) - .subtitle( - String::from(&partition.part_fs) - + " " - + &pretty_bytes::converter::convert(partition.part_size), - ) - .sensitive(true) - .build(); - prow - }, - swap_fs_error: Rc::new(RefCell::new(false)), - hardcode_fs_error: Rc::new(RefCell::new(false)), - used: Rc::new(RefCell::new(0)), - never: Rc::new(RefCell::new(false)), - } - }; - post_check_drive_mount( - &row, - &partition_row_struct, - &partition_button, - &partition_changed_action, - &partition, - &used_partition_array_refcell, - &subvol_partition_array_refcell, - ); - partition_scroll_child.append(&partition_row_struct.widget); - } - - row.connect_mountopts_notify(clone!( - #[strong] - partition_changed_action, - #[strong] - subvol_partition_array_refcell, - #[strong] - row, - move |_| { - if row.mountopts().contains("subvol=") || row.mountopts().contains("subvolid") { - (*subvol_partition_array_refcell.borrow_mut()).push(row.partition()); - } else { - (*subvol_partition_array_refcell.borrow_mut()).retain(|x| x != &row.partition()); - } - partition_changed_action.activate(None); - } - )); - - listbox.append(&row); - - row.connect_closure( - "row-deleted", - false, - closure_local!( - #[weak] - listbox, - #[strong] - row, - #[strong] - used_partition_array_refcell, - #[strong] - partition_changed_action, - move |row: DriveMountRow| { - listbox.remove(&row); - (*used_partition_array_refcell.borrow_mut()).retain(|x| x != &row.partition()); - partition_changed_action.activate(None); - } - ), - ); -} - -fn create_root_row( - listbox: >k::ListBox, - drive_rows_size_group: >k::SizeGroup, - partition_array: &Vec, - partition_changed_action: &gio::SimpleAction, - language_changed_action: &gio::SimpleAction, - used_partition_array_refcell: &Rc>>, - subvol_partition_array_refcell: &Rc>>, -) { - let partition_scroll_child = gtk::ListBox::builder() - .selection_mode(gtk::SelectionMode::None) - .build(); - - let partitions_scroll = gtk::ScrolledWindow::builder() - .hexpand(true) - .vexpand(true) - .child(&partition_scroll_child) - .build(); - - // Create row - let row = DriveMountRow::new_with_scroll(&partitions_scroll); - - row.set_deletable(false); - - row.set_sizegroup(drive_rows_size_group); - - row.set_langaction(language_changed_action); - - row.set_mountpoint("/"); - - let null_checkbutton = gtk::CheckButton::builder().build(); - - for partition in partition_array { - let part_name = &partition.part_name.to_owned(); - let partition_button = gtk::CheckButton::builder() - .valign(gtk::Align::Center) - .can_focus(false) - .build(); - partition_button.set_group(Some(&null_checkbutton)); - let partition_row_struct: PartitionRow = if partition.need_mapper { - PartitionRow { - widget: { - let prow = adw::ActionRow::builder() - .activatable_widget(&partition_button) - .title(part_name) - .subtitle( - t!("partition_row_subtitle_needs_mapper").to_string() - + " " - + &pretty_bytes::converter::convert(partition.part_size), - ) - .sensitive(false) - .build(); - prow - }, - swap_fs_error: Rc::new(RefCell::new(false)), - hardcode_fs_error: Rc::new(RefCell::new(false)), - used: Rc::new(RefCell::new(0)), - never: Rc::new(RefCell::new(true)), - } - } else if used_partition_array_refcell - .clone() - .borrow() - .iter() - .any(|e| part_name == e && part_name != &row.partition()) - { - PartitionRow { - widget: { - let prow = adw::ActionRow::builder() - .activatable_widget(&partition_button) - .title(part_name) - .subtitle( - String::from(&partition.part_fs) - + " " - + &pretty_bytes::converter::convert(partition.part_size), - ) - .sensitive(false) - .build(); - prow - }, - swap_fs_error: Rc::new(RefCell::new(false)), - hardcode_fs_error: Rc::new(RefCell::new(false)), - used: Rc::new(RefCell::new(1)), - never: Rc::new(RefCell::new(false)), - } - } else if partition.part_fs == "vfat" - || partition.part_fs == "ntfs" - || partition.part_fs == "swap" - || partition.part_fs == "exfat" - || partition.part_fs == "BitLocker" - { - PartitionRow { - widget: { - let prow = adw::ActionRow::builder() - .activatable_widget(&partition_button) - .title(part_name) - .subtitle(t!("partition_row_subtitle_root_fs_bad")) - .sensitive(false) - .build(); - prow - }, - swap_fs_error: Rc::new(RefCell::new(false)), - hardcode_fs_error: Rc::new(RefCell::new(true)), - used: Rc::new(RefCell::new(0)), - never: Rc::new(RefCell::new(true)), - } - } else if partition.part_size < MINIMUM_ROOT_BYTE_SIZE { - PartitionRow { - widget: { - let prow = adw::ActionRow::builder() - .activatable_widget(&partition_button) - .title(part_name) - .subtitle(t!("partition_row_subtitle_root_fs_small")) - .sensitive(false) - .build(); - prow - }, - swap_fs_error: Rc::new(RefCell::new(false)), - hardcode_fs_error: Rc::new(RefCell::new(true)), - used: Rc::new(RefCell::new(0)), - never: Rc::new(RefCell::new(true)), - } - } else { - PartitionRow { - widget: { - let prow = adw::ActionRow::builder() - .activatable_widget(&partition_button) - .title(part_name) - .subtitle( - String::from(&partition.part_fs) - + " " - + &pretty_bytes::converter::convert(partition.part_size), - ) - .sensitive(true) - .build(); - prow - }, - hardcode_fs_error: Rc::new(RefCell::new(false)), - swap_fs_error: Rc::new(RefCell::new(false)), - used: Rc::new(RefCell::new(0)), - never: Rc::new(RefCell::new(false)), - } - }; - post_check_drive_mount( - &row, - &partition_row_struct, - &partition_button, - &partition_changed_action, - &partition, - &used_partition_array_refcell, - &subvol_partition_array_refcell, - ); - partition_scroll_child.append(&partition_row_struct.widget); - } - - row.connect_mountopts_notify(clone!( - #[strong] - partition_changed_action, - #[strong] - subvol_partition_array_refcell, - #[strong] - row, - move |_| { - if row.mountopts().contains("subvol=") || row.mountopts().contains("subvolid") { - (*subvol_partition_array_refcell.borrow_mut()).push(row.partition()); - } else { - (*subvol_partition_array_refcell.borrow_mut()).retain(|x| x != &row.partition()); - } - partition_changed_action.activate(None); - } - )); - - listbox.append(&row); - - row.connect_closure( - "row-deleted", - false, - closure_local!( - #[weak] - listbox, - #[strong] - row, - #[strong] - used_partition_array_refcell, - #[strong] - partition_changed_action, - move |row: DriveMountRow| { - listbox.remove(&row); - (*used_partition_array_refcell.borrow_mut()).retain(|x| x != &row.partition()); - partition_changed_action.activate(None); - } - ), - ); -} - -fn create_mount_row( - listbox: >k::ListBox, - drive_rows_size_group: >k::SizeGroup, - partition_array: &Vec, - partition_changed_action: &gio::SimpleAction, - language_changed_action: &gio::SimpleAction, - used_partition_array_refcell: &Rc>>, - subvol_partition_array_refcell: &Rc>>, -) { - let partition_scroll_child = gtk::ListBox::builder() - .selection_mode(gtk::SelectionMode::None) - .build(); - - let partitions_scroll = gtk::ScrolledWindow::builder() - .hexpand(true) - .vexpand(true) - .child(&partition_scroll_child) - .build(); - - // Create row - let row = DriveMountRow::new_with_scroll(&partitions_scroll); - - row.set_deletable(true); - - row.set_sizegroup(drive_rows_size_group); - - row.set_langaction(language_changed_action); - - let null_checkbutton = gtk::CheckButton::builder().build(); - - for partition in partition_array { - let part_name = &partition.part_name.to_owned(); - let partition_button = gtk::CheckButton::builder() - .valign(gtk::Align::Center) - .can_focus(false) - .build(); - partition_button.set_group(Some(&null_checkbutton)); - let partition_row_struct: PartitionRow = if partition.need_mapper { - PartitionRow { - widget: { - let prow = adw::ActionRow::builder() - .activatable_widget(&partition_button) - .title(part_name) - .subtitle( - t!("partition_row_subtitle_needs_mapper").to_string() - + " " - + &pretty_bytes::converter::convert(partition.part_size), - ) - .sensitive(false) - .build(); - prow - }, - hardcode_fs_error: Rc::new(RefCell::new(false)), - swap_fs_error: Rc::new(RefCell::new(false)), - used: Rc::new(RefCell::new(0)), - never: Rc::new(RefCell::new(true)), - } - } else if used_partition_array_refcell - .clone() - .borrow() - .iter() - .any(|e| part_name == e && part_name != &row.partition()) - { - PartitionRow { - widget: { - let prow = adw::ActionRow::builder() - .activatable_widget(&partition_button) - .title(part_name) - .subtitle( - String::from(&partition.part_fs) - + " " - + &pretty_bytes::converter::convert(partition.part_size), - ) - .sensitive(false) - .build(); - prow - }, - hardcode_fs_error: Rc::new(RefCell::new(false)), - swap_fs_error: Rc::new(RefCell::new(false)), - used: Rc::new(RefCell::new(1)), - never: Rc::new(RefCell::new(false)), - } - } else { - PartitionRow { - widget: { - let prow = adw::ActionRow::builder() - .activatable_widget(&partition_button) - .title(part_name) - .subtitle( - String::from(&partition.part_fs) - + " " - + &pretty_bytes::converter::convert(partition.part_size), - ) - .sensitive(true) - .build(); - prow - }, - hardcode_fs_error: Rc::new(RefCell::new(false)), - swap_fs_error: Rc::new(RefCell::new(false)), - used: Rc::new(RefCell::new(0)), - never: Rc::new(RefCell::new(false)), - } - }; - post_check_drive_mount( - &row, - &partition_row_struct, - &partition_button, - &partition_changed_action, - &partition, - &used_partition_array_refcell, - &subvol_partition_array_refcell, - ); - partition_scroll_child.append(&partition_row_struct.widget); - } - - row.connect_mountopts_notify(clone!( - #[strong] - partition_changed_action, - #[strong] - subvol_partition_array_refcell, - #[strong] - row, - move |_| { - if row.mountopts().contains("subvol=") || row.mountopts().contains("subvolid") { - (*subvol_partition_array_refcell.borrow_mut()).push(row.partition()); - } else { - (*subvol_partition_array_refcell.borrow_mut()).retain(|x| x != &row.partition()); - } - partition_changed_action.activate(None); - } - )); - - listbox.append(&row); - - row.connect_closure( - "row-deleted", - false, - closure_local!( - #[weak] - listbox, - #[strong] - row, - #[strong] - used_partition_array_refcell, - #[strong] - partition_changed_action, - move |row: DriveMountRow| { - listbox.remove(&row); - (*used_partition_array_refcell.borrow_mut()).retain(|x| x != &row.partition()); - partition_changed_action.activate(None); - } - ), - ); -} - -fn post_check_drive_mount( - row: &DriveMountRow, - partition_row_struct: &PartitionRow, - partition_button: >k::CheckButton, - partition_changed_action: &gio::SimpleAction, - partition: &Partition, - used_partition_array_refcell: &Rc>>, - subvol_partition_array_refcell: &Rc>>, -) { - partition_row_struct.widget.add_prefix(partition_button); - partition_button.connect_toggled(clone!( - #[weak] - row, - #[weak] - partition_button, - #[strong] - partition_changed_action, - #[strong] - used_partition_array_refcell, - #[strong] - partition, - move |_| { - if partition_button.is_active() == true { - let part_name = &partition.part_name; - row.set_partition(part_name.to_string()); - (*used_partition_array_refcell.borrow_mut()).push(part_name.to_string()); - } else { - (*used_partition_array_refcell.borrow_mut()).retain(|x| x != &partition.part_name); - } - partition_changed_action.activate(None); - } - )); - row.connect_mountpoint_notify(clone!( - #[strong] - partition_row_struct, - #[strong] - partition, - #[strong] - row, - move |_| { - if row.mountpoint() == "[SWAP]" { - if partition.part_fs == "linux-swap" { - (*partition_row_struct.swap_fs_error.borrow_mut()) = false; - if *partition_row_struct.never.borrow() == false - && *partition_row_struct.swap_fs_error.borrow() == false - && *partition_row_struct.hardcode_fs_error.borrow() == false - { - partition_row_struct.widget.set_sensitive(true); - } - } else { - (*partition_row_struct.swap_fs_error.borrow_mut()) = true; - partition_row_struct.widget.set_sensitive(false); - } - } else if *partition_row_struct.used.borrow() != 1 - && *partition_row_struct.never.borrow() == false - && *partition_row_struct.hardcode_fs_error.borrow() == false - { - (*partition_row_struct.swap_fs_error.borrow_mut()) = false; - partition_row_struct.widget.set_sensitive(true); - } - } - )); - - partition_changed_action.connect_activate(clone!( - #[strong] - partition_row_struct, - #[strong] - row, - #[strong] - partition, - #[strong] - used_partition_array_refcell, - #[strong] - subvol_partition_array_refcell, - move |_, _| { - let part_name = &partition.part_name; - let used_partition_array = used_partition_array_refcell.borrow(); - let subvol_partition_array = subvol_partition_array_refcell.borrow(); - if used_partition_array - .iter() - .any(|e| part_name == e && part_name != &row.partition()) - { - if subvol_partition_array - .iter() - .any(|e| part_name == e && part_name != &row.partition()) - { - if *partition_row_struct.never.borrow() == false - && *partition_row_struct.swap_fs_error.borrow() == false - && *partition_row_struct.hardcode_fs_error.borrow() == false - { - partition_row_struct.widget.set_sensitive(true); - } - (*partition_row_struct.used.borrow_mut()) = 2; - } else { - partition_row_struct.widget.set_sensitive(false); - (*partition_row_struct.used.borrow_mut()) = 1; - } - } else if *partition_row_struct.never.borrow() == false - && *partition_row_struct.swap_fs_error.borrow() == false - && *partition_row_struct.hardcode_fs_error.borrow() == false - { - partition_row_struct.widget.set_sensitive(true); - (*partition_row_struct.used.borrow_mut()) = 0; - } - } - )); -} - fn create_hardcoded_rows( drive_mounts_adw_listbox: >k::ListBox, drive_rows_size_group: >k::SizeGroup, @@ -1007,7 +161,7 @@ fn create_hardcoded_rows( .hexpand(true) .build(); - create_efi_row( + func::create_efi_row( &drive_mounts_adw_listbox, &drive_rows_size_group, &partition_array_refcell.borrow(), @@ -1016,7 +170,7 @@ fn create_hardcoded_rows( &used_partition_array_refcell, &subvol_partition_array_refcell, ); - create_boot_row( + func::create_boot_row( &drive_mounts_adw_listbox, &drive_rows_size_group, &partition_array_refcell.borrow(), @@ -1025,7 +179,7 @@ fn create_hardcoded_rows( &used_partition_array_refcell, &subvol_partition_array_refcell, ); - create_root_row( + func::create_root_row( &drive_mounts_adw_listbox, &drive_rows_size_group, &partition_array_refcell.borrow(), @@ -1053,7 +207,7 @@ fn create_hardcoded_rows( #[strong] subvol_partition_array_refcell, move |_| { - create_mount_row( + func::create_mount_row( &drive_mounts_adw_listbox, &drive_rows_size_group, &partition_array_refcell.borrow(),