custom-gui-packages/pika-installer-gtk4
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix small annoynce with subvols

Browse Source
This commit is contained in:
Ward from fusion-voyager-3 2024-08-20 23:57:29 +03:00
parent 6e7717bae7
commit c34958f256
3 changed files with 44 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

56
src/manual_partitioning_page/func.rs
View File

@ -1,6 +1,6 @@
use crate::drive_mount_row::DriveMountRow; use crate::drive_mount_row::DriveMountRow;
use crate::installer_stack_page; use crate::installer_stack_page;
use crate::partitioning_page::{get_partitions, CrypttabEntry, FstabEntry, Partition}; use crate::partitioning_page::{get_partitions, CrypttabEntry, FstabEntry, Partition, SubvolDeclaration};
use adw::gio; use adw::gio;
use adw::prelude::*; use adw::prelude::*;
use glib::{clone, closure_local, ffi::gboolean}; use glib::{clone, closure_local, ffi::gboolean};
@ -27,7 +27,7 @@ pub fn create_efi_row(
partition_changed_action: &gio::SimpleAction, partition_changed_action: &gio::SimpleAction,
language_changed_action: &gio::SimpleAction, language_changed_action: &gio::SimpleAction,
used_partition_array_refcell: &Rc<RefCell<Vec<FstabEntry>>>, used_partition_array_refcell: &Rc<RefCell<Vec<FstabEntry>>>,
subvol_partition_array_refcell: &Rc<RefCell<Vec<String>>>, subvol_partition_array_refcell: &Rc<RefCell<Vec<SubvolDeclaration>>>,
) { ) {
let partition_scroll_child = gtk::ListBox::builder() let partition_scroll_child = gtk::ListBox::builder()
.selection_mode(gtk::SelectionMode::None) .selection_mode(gtk::SelectionMode::None)
@ -90,7 +90,7 @@ pub fn create_efi_row(
&& (subvol_partition_array_refcell && (subvol_partition_array_refcell
.borrow() .borrow()
.iter() .iter()
.any(|e| part_name == e)) .any(|e| *e.part_name.borrow() == *part_name))
}) })
{ {
PartitionRow { PartitionRow {
@ -212,9 +212,13 @@ pub fn create_efi_row(
row, row,
move |_| { move |_| {
if row.mountopts().contains("subvol=") || row.mountopts().contains("subvolid") { if row.mountopts().contains("subvol=") || row.mountopts().contains("subvolid") {
(*subvol_partition_array_refcell.borrow_mut()).push(row.partition()); (*subvol_partition_array_refcell.borrow_mut()).push(SubvolDeclaration{
part_name: Rc::new(RefCell::new(row.partition())),
made_by: Rc::new(RefCell::new(row.id()))
}
);
} else { } else {
(*subvol_partition_array_refcell.borrow_mut()).retain(|x| x != &row.partition()); (*subvol_partition_array_refcell.borrow_mut()).retain(|x| *x.made_by.borrow() != row.id());
} }
partition_changed_action.activate(None); partition_changed_action.activate(None);
} }
@ -250,7 +254,7 @@ pub fn create_boot_row(
partition_changed_action: &gio::SimpleAction, partition_changed_action: &gio::SimpleAction,
language_changed_action: &gio::SimpleAction, language_changed_action: &gio::SimpleAction,
used_partition_array_refcell: &Rc<RefCell<Vec<FstabEntry>>>, used_partition_array_refcell: &Rc<RefCell<Vec<FstabEntry>>>,
subvol_partition_array_refcell: &Rc<RefCell<Vec<String>>>, subvol_partition_array_refcell: &Rc<RefCell<Vec<SubvolDeclaration>>>,
) { ) {
let partition_scroll_child = gtk::ListBox::builder() let partition_scroll_child = gtk::ListBox::builder()
.selection_mode(gtk::SelectionMode::None) .selection_mode(gtk::SelectionMode::None)
@ -313,7 +317,7 @@ pub fn create_boot_row(
&& (subvol_partition_array_refcell && (subvol_partition_array_refcell
.borrow() .borrow()
.iter() .iter()
.any(|e| part_name == e)) .any(|e| *e.part_name.borrow() == *part_name))
}) })
{ {
PartitionRow { PartitionRow {
@ -435,9 +439,13 @@ pub fn create_boot_row(
row, row,
move |_| { move |_| {
if row.mountopts().contains("subvol=") || row.mountopts().contains("subvolid") { if row.mountopts().contains("subvol=") || row.mountopts().contains("subvolid") {
(*subvol_partition_array_refcell.borrow_mut()).push(row.partition()); (*subvol_partition_array_refcell.borrow_mut()).push(SubvolDeclaration{
part_name: Rc::new(RefCell::new(row.partition())),
made_by: Rc::new(RefCell::new(row.id()))
}
);
} else { } else {
(*subvol_partition_array_refcell.borrow_mut()).retain(|x| x != &row.partition()); (*subvol_partition_array_refcell.borrow_mut()).retain(|x| *x.made_by.borrow() != row.id());
} }
partition_changed_action.activate(None); partition_changed_action.activate(None);
} }
@ -473,7 +481,7 @@ pub fn create_root_row(
partition_changed_action: &gio::SimpleAction, partition_changed_action: &gio::SimpleAction,
language_changed_action: &gio::SimpleAction, language_changed_action: &gio::SimpleAction,
used_partition_array_refcell: &Rc<RefCell<Vec<FstabEntry>>>, used_partition_array_refcell: &Rc<RefCell<Vec<FstabEntry>>>,
subvol_partition_array_refcell: &Rc<RefCell<Vec<String>>>, subvol_partition_array_refcell: &Rc<RefCell<Vec<SubvolDeclaration>>>,
) { ) {
let partition_scroll_child = gtk::ListBox::builder() let partition_scroll_child = gtk::ListBox::builder()
.selection_mode(gtk::SelectionMode::None) .selection_mode(gtk::SelectionMode::None)
@ -536,7 +544,7 @@ pub fn create_root_row(
&& (subvol_partition_array_refcell && (subvol_partition_array_refcell
.borrow() .borrow()
.iter() .iter()
.any(|e| part_name == e)) .any(|e| *e.part_name.borrow() == *part_name))
}) })
{ {
PartitionRow { PartitionRow {
@ -663,9 +671,13 @@ pub fn create_root_row(
row, row,
move |_| { move |_| {
if row.mountopts().contains("subvol=") || row.mountopts().contains("subvolid") { if row.mountopts().contains("subvol=") || row.mountopts().contains("subvolid") {
(*subvol_partition_array_refcell.borrow_mut()).push(row.partition()); (*subvol_partition_array_refcell.borrow_mut()).push(SubvolDeclaration{
part_name: Rc::new(RefCell::new(row.partition())),
made_by: Rc::new(RefCell::new(row.id()))
}
);
} else { } else {
(*subvol_partition_array_refcell.borrow_mut()).retain(|x| x != &row.partition()); (*subvol_partition_array_refcell.borrow_mut()).retain(|x| *x.made_by.borrow() != row.id());
} }
partition_changed_action.activate(None); partition_changed_action.activate(None);
} }
@ -701,7 +713,7 @@ pub fn create_mount_row(
partition_changed_action: &gio::SimpleAction, partition_changed_action: &gio::SimpleAction,
language_changed_action: &gio::SimpleAction, language_changed_action: &gio::SimpleAction,
used_partition_array_refcell: &Rc<RefCell<Vec<FstabEntry>>>, used_partition_array_refcell: &Rc<RefCell<Vec<FstabEntry>>>,
subvol_partition_array_refcell: &Rc<RefCell<Vec<String>>>, subvol_partition_array_refcell: &Rc<RefCell<Vec<SubvolDeclaration>>>,
extra_mount_id_refcell: &Rc<RefCell<i32>>, extra_mount_id_refcell: &Rc<RefCell<i32>>,
) { ) {
let partition_scroll_child = gtk::ListBox::builder() let partition_scroll_child = gtk::ListBox::builder()
@ -765,7 +777,7 @@ pub fn create_mount_row(
&& (subvol_partition_array_refcell && (subvol_partition_array_refcell
.borrow() .borrow()
.iter() .iter()
.any(|e| part_name == e)) .any(|e| *e.part_name.borrow() == *part_name))
}) })
{ {
PartitionRow { PartitionRow {
@ -855,9 +867,13 @@ pub fn create_mount_row(
row, row,
move |_| { move |_| {
if row.mountopts().contains("subvol=") || row.mountopts().contains("subvolid") { if row.mountopts().contains("subvol=") || row.mountopts().contains("subvolid") {
(*subvol_partition_array_refcell.borrow_mut()).push(row.partition()); (*subvol_partition_array_refcell.borrow_mut()).push(SubvolDeclaration{
part_name: Rc::new(RefCell::new(row.partition())),
made_by: Rc::new(RefCell::new(row.id()))
}
);
} else { } else {
(*subvol_partition_array_refcell.borrow_mut()).retain(|x| x != &row.partition()); (*subvol_partition_array_refcell.borrow_mut()).retain(|x| *x.made_by.borrow() != row.id());
} }
partition_changed_action.activate(None); partition_changed_action.activate(None);
} }
@ -894,7 +910,7 @@ fn post_check_drive_mount(
partition_changed_action: &gio::SimpleAction, partition_changed_action: &gio::SimpleAction,
partition: &Partition, partition: &Partition,
used_partition_array_refcell: &Rc<RefCell<Vec<FstabEntry>>>, used_partition_array_refcell: &Rc<RefCell<Vec<FstabEntry>>>,
subvol_partition_array_refcell: &Rc<RefCell<Vec<String>>>, subvol_partition_array_refcell: &Rc<RefCell<Vec<SubvolDeclaration>>>,
) { ) {
partition_row_struct.widget.add_prefix(partition_button); partition_row_struct.widget.add_prefix(partition_button);
partition_button.connect_toggled(clone!( partition_button.connect_toggled(clone!(
@ -1027,7 +1043,7 @@ fn post_check_drive_mount(
if used_partition_array.iter().any(|e| { if used_partition_array.iter().any(|e| {
(part_name == &e.partition.part_name && part_name != &row.partition()) (part_name == &e.partition.part_name && part_name != &row.partition())
&& (subvol_partition_array.iter().any(|e| part_name == e)) && (subvol_partition_array.iter().any(|e| *e.part_name.borrow() == *part_name))
}) { }) {
if *partition_row_struct.never.borrow() == false if *partition_row_struct.never.borrow() == false
&& *partition_row_struct.swap_fs_error.borrow() == false && *partition_row_struct.swap_fs_error.borrow() == false
@ -1039,7 +1055,7 @@ fn post_check_drive_mount(
} else if used_partition_array.iter().any(|e| { } else if used_partition_array.iter().any(|e| {
part_name == &e.partition.part_name part_name == &e.partition.part_name
&& e.used_by != row.id() && e.used_by != row.id()
&& !subvol_partition_array.iter().any(|e| part_name == e) && !subvol_partition_array.iter().any(|e| *e.part_name.borrow() == *part_name)
}) { }) {
if &row.partition() == part_name { if &row.partition() == part_name {
null_checkbutton.set_active(true); null_checkbutton.set_active(true);

6
src/manual_partitioning_page/mod.rs
View File

@ -2,7 +2,7 @@ use crate::drive_mount_row::DriveMountRow;
use crate::installer_stack_page; use crate::installer_stack_page;
use crate::partitioning_page; use crate::partitioning_page;
use crate::partitioning_page::get_luks_uuid; use crate::partitioning_page::get_luks_uuid;
use crate::partitioning_page::{get_partitions, CrypttabEntry, FstabEntry, Partition}; use crate::partitioning_page::{get_partitions, CrypttabEntry, FstabEntry, Partition, SubvolDeclaration};
use adw::gio; use adw::gio;
use adw::prelude::*; use adw::prelude::*;
use glib::{clone, closure_local, ffi::gboolean}; use glib::{clone, closure_local, ffi::gboolean};
@ -33,7 +33,7 @@ pub fn manual_partitioning_page(
let partition_array_refcell = Rc::new(RefCell::new(get_partitions())); let partition_array_refcell = Rc::new(RefCell::new(get_partitions()));
let used_partition_array_refcell: Rc<RefCell<Vec<FstabEntry>>> = Rc::new(RefCell::default()); let used_partition_array_refcell: Rc<RefCell<Vec<FstabEntry>>> = Rc::new(RefCell::default());
let subvol_partition_array_refcell: Rc<RefCell<Vec<String>>> = Rc::new(RefCell::default()); let subvol_partition_array_refcell: Rc<RefCell<Vec<SubvolDeclaration>>> = Rc::new(RefCell::default());
let extra_mount_id_refcell: Rc<RefCell<i32>> = Rc::new(RefCell::new(3)); let extra_mount_id_refcell: Rc<RefCell<i32>> = Rc::new(RefCell::new(3));
// //
@ -391,7 +391,7 @@ fn create_hardcoded_rows(
partition_changed_action: &gio::SimpleAction, partition_changed_action: &gio::SimpleAction,
language_changed_action: &gio::SimpleAction, language_changed_action: &gio::SimpleAction,
used_partition_array_refcell: &Rc<RefCell<Vec<FstabEntry>>>, used_partition_array_refcell: &Rc<RefCell<Vec<FstabEntry>>>,
subvol_partition_array_refcell: &Rc<RefCell<Vec<String>>>, subvol_partition_array_refcell: &Rc<RefCell<Vec<SubvolDeclaration>>>,
extra_mount_id_refcell: &Rc<RefCell<i32>>, extra_mount_id_refcell: &Rc<RefCell<i32>>,
) { ) {
let drive_mount_add_button_icon = gtk::Image::builder() let drive_mount_add_button_icon = gtk::Image::builder()

5
src/partitioning_page/mod.rs
View File

@ -202,6 +202,11 @@ pub struct CrypttabEntry {
pub password: Option<String>, pub password: Option<String>,
} }
pub struct SubvolDeclaration {
pub part_name: Rc<std::cell::RefCell<String>>,
pub made_by: Rc<std::cell::RefCell<i32>>,
}
pub fn get_block_devices() -> Vec<BlockDevice> { pub fn get_block_devices() -> Vec<BlockDevice> {
let mut block_devices = Vec::new(); let mut block_devices = Vec::new();