2Shirt/deja-vu
1
0
Fork 0
Code Issues 1 Pull requests Projects Releases Packages Wiki Activity Actions

Rename variable names to match usage

Browse source 
Disk/Partition IDs aren't necessarily going to match the Vec index
This commit is contained in:
2Shirt 2024-11-09 23:30:43 -08:00
parent 3251a22836
commit a2cfe4baf8
Signed by: 2Shirt
GPG key ID: 152FAC923B0E132C
1 changed files with 14 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
src/app.rs
View file

@ -58,11 +58,11 @@ pub struct App {
tick_rate: f64, tick_rate: f64,
// App // App
cur_mode: Mode, cur_mode: Mode,
disk_id_dest: Option<usize>, disk_index_dest: Option<usize>,
disk_id_source: Option<usize>, disk_index_source: Option<usize>,
disk_list: Arc<Mutex<Vec<Disk>>>, disk_list: Arc<Mutex<Vec<Disk>>>,
part_num_boot: Option<usize>, part_index_boot: Option<usize>,
part_num_os: Option<usize>, part_index_os: Option<usize>,
driver: Option<Driver>, driver: Option<Driver>,
prev_mode: Mode, prev_mode: Mode,
selections: Vec<Option<usize>>, selections: Vec<Option<usize>>,
@ -108,12 +108,12 @@ impl App {
tick_rate, tick_rate,
// App // App
cur_mode: Mode::ScanDisks, cur_mode: Mode::ScanDisks,
disk_id_dest: None, disk_index_dest: None,
disk_id_source: None, disk_index_source: None,
disk_list: Arc::new(Mutex::new(Vec::new())), disk_list: Arc::new(Mutex::new(Vec::new())),
driver: None, driver: None,
part_num_boot: None, part_index_boot: None,
part_num_os: None, part_index_os: None,
prev_mode: Mode::ScanDisks, prev_mode: Mode::ScanDisks,
selections: vec![None, None], selections: vec![None, None],
table_type: None, table_type: None,
@ -321,12 +321,12 @@ impl App {
Action::Select(one, two) => { Action::Select(one, two) => {
match self.cur_mode { match self.cur_mode {
Mode::SelectDisks => { Mode::SelectDisks => {
self.disk_id_source = one.clone(); self.disk_index_source = one.clone();
self.disk_id_dest = two.clone(); self.disk_index_dest = two.clone();
} }
Mode::SelectParts => { Mode::SelectParts => {
self.part_num_boot = one.clone(); self.part_index_boot = one.clone();
self.part_num_os = two.clone(); self.part_index_os = two.clone();
} }
_ => {} _ => {}
} }
@ -377,9 +377,9 @@ impl App {
} }
Action::UpdateDestDisk => { Action::UpdateDestDisk => {
let disk_list_arc = Arc::clone(&self.disk_list); let disk_list_arc = Arc::clone(&self.disk_list);
if let Some(dest_id_index) = self.disk_id_dest { if let Some(dest_index) = self.disk_index_dest {
self.task_handles self.task_handles
.push(lazy_update_dest_disk(disk_list_arc, dest_id_index)); .push(lazy_update_dest_disk(disk_list_arc, dest_index));
} }
} }
_ => {} _ => {}