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

Misc fixes

Browse source 
Code was written several weeks ago
This commit is contained in:
2Shirt 2025-04-05 15:17:10 -07:00
parent 7e08ca5f72
commit 59b9ddbee6
Signed by: 2Shirt
GPG key ID: 152FAC923B0E132C
3 changed files with 20 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
boot_diags/src/app.rs
View file

@ -161,7 +161,7 @@ impl App {
if let Some(boot_index) = self.clone.part_index_boot { if let Some(boot_index) = self.clone.part_index_boot {
if let Ok(task) = boot::set_mode( if let Ok(task) = boot::set_mode(
disk.get_part_letter(boot_index).as_str(), disk.get_part_letter(boot_index).as_str(),
boot_mode, &boot_mode,
&self.system32, &self.system32,
&disk.part_type, &disk.part_type,
) { ) {
@ -894,7 +894,7 @@ fn build_right_items(app: &App) -> Action {
line_colors: vec![Color::Reset], line_colors: vec![Color::Reset],
}, },
]); ]);
header_lines.append(&mut get_disk_description_right(disk, Some(parts))); header_lines.append(&mut get_disk_description_right(disk, &Some(parts)));
// Add header // Add header
if !header_lines.is_empty() { if !header_lines.is_empty() {
@ -957,7 +957,7 @@ fn build_right_items(app: &App) -> Action {
let disk_list = app.clone.disk_list.lock().unwrap(); let disk_list = app.clone.disk_list.lock().unwrap();
disk_list disk_list
.iter() .iter()
.for_each(|disk| items.push(get_disk_description_right(disk, None))); .for_each(|disk| items.push(get_disk_description_right(disk, &None)));
} }
Mode::SelectParts => { Mode::SelectParts => {
["Boot", "OS"].iter().for_each(|s| { ["Boot", "OS"].iter().for_each(|s| {
@ -971,7 +971,7 @@ fn build_right_items(app: &App) -> Action {
let disk_list = app.clone.disk_list.lock().unwrap(); let disk_list = app.clone.disk_list.lock().unwrap();
if let Some(disk) = disk_list.get(index) { if let Some(disk) = disk_list.get(index) {
// Disk Details // Disk Details
items.push(get_disk_description_right(disk, None)); items.push(get_disk_description_right(disk, &None));
// Partition Details // Partition Details
disk.parts disk.parts

17
deja_vu/src/app.rs
View file

@ -127,8 +127,7 @@ impl App {
pub fn next_mode(&mut self) -> Option<Mode> { pub fn next_mode(&mut self) -> Option<Mode> {
let new_mode = match self.cur_mode { let new_mode = match self.cur_mode {
Mode::Home => Mode::ScanDisks, Mode::Home | Mode::InstallDrivers => Mode::ScanDisks,
Mode::InstallDrivers => Mode::ScanDisks,
Mode::ScanDisks => Mode::SelectDisks, Mode::ScanDisks => Mode::SelectDisks,
Mode::SelectDisks => Mode::SelectTableType, Mode::SelectDisks => Mode::SelectTableType,
Mode::SelectTableType => Mode::Confirm, Mode::SelectTableType => Mode::Confirm,
@ -236,7 +235,7 @@ impl App {
// Create boot files // Create boot files
for task in for task in
boot::configure_disk(&letter_boot, &letter_os, &system32, table_type) boot::configure_disk(&letter_boot, &letter_os, &system32, &table_type)
{ {
self.tasks.add(task); self.tasks.add(task);
} }
@ -424,7 +423,7 @@ impl App {
0 => Some(PartitionTableType::Guid), 0 => Some(PartitionTableType::Guid),
1 => Some(PartitionTableType::Legacy), 1 => Some(PartitionTableType::Legacy),
index => { index => {
panic!("Failed to select PartitionTableType: {}", index) panic!("Failed to select PartitionTableType: {index}")
} }
} }
} else { } else {
@ -747,21 +746,21 @@ fn build_right_items(app: &App, cur_mode: Mode) -> Action {
let disk_list = app.clone.disk_list.lock().unwrap(); let disk_list = app.clone.disk_list.lock().unwrap();
disk_list disk_list
.iter() .iter()
.for_each(|disk| items.push(get_disk_description_right(disk, None))); .for_each(|disk| items.push(get_disk_description_right(disk, &None)));
} }
Mode::SelectParts => { Mode::SelectParts => {
["Boot", "OS"].iter().for_each(|s| { for s in &["Boot", "OS"] {
labels.push(vec![DVLine { labels.push(vec![DVLine {
line_parts: vec![String::from(*s)], line_parts: vec![String::from(*s)],
line_colors: vec![Color::Cyan], line_colors: vec![Color::Cyan],
}]) }]);
}); }
if let Some(index) = app.clone.disk_index_dest { if let Some(index) = app.clone.disk_index_dest {
start_index = 1; start_index = 1;
let disk_list = app.clone.disk_list.lock().unwrap(); let disk_list = app.clone.disk_list.lock().unwrap();
if let Some(disk) = disk_list.get(index) { if let Some(disk) = disk_list.get(index) {
// Disk Details // Disk Details
items.push(get_disk_description_right(disk, None)); items.push(get_disk_description_right(disk, &None));
// Partition Details // Partition Details
disk.parts disk.parts

19
deja_vu/src/main.rs
View file

@ -29,18 +29,15 @@ async fn main() -> Result<()> {
msg.replace("Administrator privedges required for Deja-Vu."); msg.replace("Administrator privedges required for Deja-Vu.");
} }
}; };
match msg { if let Some(text) = msg {
Some(text) => { println!("{text}");
println!("{text}"); } else {
} core::errors::init()?;
None => { core::logging::init()?;
core::errors::init()?;
core::logging::init()?;
let args = core::cli::Cli::parse(); let args = core::cli::Cli::parse();
let mut app = App::new(args.tick_rate, args.frame_rate)?; let mut app = App::new(args.tick_rate, args.frame_rate)?;
app.run().await?; app.run().await?;
}
} }
Ok(()) Ok(())
} }