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

Fix zero-based vs one-based indexing

Browse source
This commit is contained in:
2Shirt 2025-12-13 16:57:10 -08:00
parent 8a65313039
commit 4a306b56d9
Signed by: 2Shirt
GPG key ID: 152FAC923B0E132C
2 changed files with 18 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
win_installer/src/app.rs
View file

@ -195,7 +195,7 @@ impl App {
// Get image info // Get image info
let wim_sources = self.state.wim_sources.lock().unwrap(); let wim_sources = self.state.wim_sources.lock().unwrap();
let wim_file = wim_sources.get_file(self.state.wim_file_index.unwrap()); let wim_file = wim_sources.get_file(self.state.wim_file_index.unwrap());
let wim_index = format!("{}", self.state.wim_image_index.unwrap()); let wim_index = self.state.wim_image_index.unwrap() + 1; // wimapply uses 1-based index
// Add actions // Add actions
let disk_list = self.state.disk_list.lock().unwrap(); let disk_list = self.state.disk_list.lock().unwrap();
@ -206,7 +206,12 @@ impl App {
let dest_path = format!("{}:\\", disk.get_part_letter(num_parts - 1)); let dest_path = format!("{}:\\", disk.get_part_letter(num_parts - 1));
self.tasks.add(TaskType::CommandWait( self.tasks.add(TaskType::CommandWait(
wimlib_imagex, wimlib_imagex,
vec![String::from("apply"), wim_file.path, wim_index, dest_path], vec![
String::from("apply"),
wim_file.path,
format!("{wim_index}"),
dest_path,
],
)); ));
} }
} }

15
win_installer/src/wim.rs
View file

@ -176,13 +176,20 @@ impl WimSources {
} }
pub fn get_file(&self, index: usize) -> WimFile { pub fn get_file(&self, index: usize) -> WimFile {
let rel_index: usize;
let num_local = self.local.len(); let num_local = self.local.len();
let index = if index < num_local { let mut use_local = true;
index if index < num_local {
rel_index = index;
} else { } else {
index - num_local rel_index = index - num_local;
use_local = false;
}; };
self.local.get(index).unwrap().clone() if use_local {
self.local.get(rel_index).unwrap().clone()
} else {
self.network.get(rel_index).unwrap().clone()
}
} }
pub fn get_file_list(&self) -> Vec<WimFile> { pub fn get_file_list(&self) -> Vec<WimFile> {