": "Restart",
+ "": "Shutdown",
"": "OpenTerminal",
"": "Quit",
"": "Quit",
diff --git a/core/Cargo.toml b/core/Cargo.toml
index e724ecf..8d99e89 100644
--- a/core/Cargo.toml
+++ b/core/Cargo.toml
@@ -1,17 +1,17 @@
-# This file is part of Deja-vu.
+# This file is part of Deja-Vu.
#
-# Deja-vu is free software: you can redistribute it and/or modify it
+# Deja-Vu is free software: you can redistribute it and/or modify it
# under the terms of the GNU General Public License as published by
# the Free Software Foundation, either version 3 of the License, or
# (at your option) any later version.
#
-# Deja-vu is distributed in the hope that it will be useful, but
+# Deja-Vu is distributed in the hope that it will be useful, but
# WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
# See the GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with Deja-vu. If not, see .
+# along with Deja-Vu. If not, see .
[package]
name = "core"
@@ -42,6 +42,7 @@ lazy_static = "1.5.0"
libc = "0.2.158"
once_cell = "1.20.2"
pretty_assertions = "1.4.0"
+rand = "0.9.0"
ratatui = { version = "0.29.0", features = ["serde", "macros"] }
raw-cpuid = "11.2.0"
regex = "1.11.1"
diff --git a/core/build.rs b/core/build.rs
index c3ced6b..8988d39 100644
--- a/core/build.rs
+++ b/core/build.rs
@@ -1,17 +1,17 @@
-// This file is part of Deja-vu.
+// This file is part of Deja-Vu.
//
-// Deja-vu is free software: you can redistribute it and/or modify it
+// Deja-Vu is free software: you can redistribute it and/or modify it
// under the terms of the GNU General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version.
//
-// Deja-vu is distributed in the hope that it will be useful, but
+// Deja-Vu is distributed in the hope that it will be useful, but
// WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
// See the GNU General Public License for more details.
//
// You should have received a copy of the GNU General Public License
-// along with Deja-vu. If not, see .
+// along with Deja-Vu. If not, see .
//
use anyhow::Result;
use vergen_gix::{BuildBuilder, CargoBuilder, Emitter, GixBuilder};
diff --git a/core/src/action.rs b/core/src/action.rs
index 604edd7..486cdbb 100644
--- a/core/src/action.rs
+++ b/core/src/action.rs
@@ -1,17 +1,17 @@
-// This file is part of Deja-vu.
+// This file is part of Deja-Vu.
//
-// Deja-vu is free software: you can redistribute it and/or modify it
+// Deja-Vu is free software: you can redistribute it and/or modify it
// under the terms of the GNU General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version.
//
-// Deja-vu is distributed in the hope that it will be useful, but
+// Deja-Vu is distributed in the hope that it will be useful, but
// WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
// See the GNU General Public License for more details.
//
// You should have received a copy of the GNU General Public License
-// along with Deja-vu. If not, see .
+// along with Deja-Vu. If not, see .
//
use serde::{Deserialize, Serialize};
use strum::Display;
@@ -20,6 +20,8 @@ use crate::{components::popup::Type, line::DVLine, state::Mode, system::disk::Di
#[derive(Debug, Clone, PartialEq, Eq, Display, Serialize, Deserialize)]
pub enum Action {
+ // App (Boot-Diags)
+ BootScan,
// App (Clone)
Highlight(usize),
InstallDriver,
@@ -27,6 +29,7 @@ pub enum Action {
ScanDisks,
Select(Option, Option), // indicies for (source, dest) etc
SelectRight(Option, Option), // indicies for right info pane
+ TasksComplete,
UpdateDiskList(Vec),
UpdateFooter(String),
UpdateLeft(String, Vec, Vec, usize), // (title, labels, items, select_num)
@@ -35,8 +38,10 @@ pub enum Action {
// 1: For a single choice
// 2: For two selections (obviously)
UpdateRight(Vec>, usize, Vec>), // (labels, start_index, items) - items before start are always shown
- // App (PEMenu)
+ // App (PE-Menu)
OpenTerminal,
+ Restart,
+ Shutdown,
// Screens
DismissPopup,
DisplayPopup(Type, String),
diff --git a/core/src/cli.rs b/core/src/cli.rs
index be4d597..f154dfe 100644
--- a/core/src/cli.rs
+++ b/core/src/cli.rs
@@ -1,17 +1,17 @@
-// This file is part of Deja-vu.
+// This file is part of Deja-Vu.
//
-// Deja-vu is free software: you can redistribute it and/or modify it
+// Deja-Vu is free software: you can redistribute it and/or modify it
// under the terms of the GNU General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version.
//
-// Deja-vu is distributed in the hope that it will be useful, but
+// Deja-Vu is distributed in the hope that it will be useful, but
// WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
// See the GNU General Public License for more details.
//
// You should have received a copy of the GNU General Public License
-// along with Deja-vu. If not, see .
+// along with Deja-Vu. If not, see .
//
use clap::Parser;
diff --git a/core/src/components.rs b/core/src/components.rs
index 6d1fd97..e46c56a 100644
--- a/core/src/components.rs
+++ b/core/src/components.rs
@@ -1,17 +1,17 @@
-// This file is part of Deja-vu.
+// This file is part of Deja-Vu.
//
-// Deja-vu is free software: you can redistribute it and/or modify it
+// Deja-Vu is free software: you can redistribute it and/or modify it
// under the terms of the GNU General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version.
//
-// Deja-vu is distributed in the hope that it will be useful, but
+// Deja-Vu is distributed in the hope that it will be useful, but
// WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
// See the GNU General Public License for more details.
//
// You should have received a copy of the GNU General Public License
-// along with Deja-vu. If not, see .
+// along with Deja-Vu. If not, see .
//
use color_eyre::Result;
use crossterm::event::{KeyEvent, MouseEvent};
diff --git a/core/src/components/footer.rs b/core/src/components/footer.rs
index 7355961..d266be2 100644
--- a/core/src/components/footer.rs
+++ b/core/src/components/footer.rs
@@ -1,17 +1,17 @@
-// This file is part of Deja-vu.
+// This file is part of Deja-Vu.
//
-// Deja-vu is free software: you can redistribute it and/or modify it
+// Deja-Vu is free software: you can redistribute it and/or modify it
// under the terms of the GNU General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version.
//
-// Deja-vu is distributed in the hope that it will be useful, but
+// Deja-Vu is distributed in the hope that it will be useful, but
// WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
// See the GNU General Public License for more details.
//
// You should have received a copy of the GNU General Public License
-// along with Deja-vu. If not, see .
+// along with Deja-Vu. If not, see .
//
use color_eyre::Result;
use ratatui::{
diff --git a/core/src/components/fps.rs b/core/src/components/fps.rs
index cdb822e..32e4770 100644
--- a/core/src/components/fps.rs
+++ b/core/src/components/fps.rs
@@ -1,17 +1,17 @@
-// This file is part of Deja-vu.
+// This file is part of Deja-Vu.
//
-// Deja-vu is free software: you can redistribute it and/or modify it
+// Deja-Vu is free software: you can redistribute it and/or modify it
// under the terms of the GNU General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version.
//
-// Deja-vu is distributed in the hope that it will be useful, but
+// Deja-Vu is distributed in the hope that it will be useful, but
// WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
// See the GNU General Public License for more details.
//
// You should have received a copy of the GNU General Public License
-// along with Deja-vu. If not, see .
+// along with Deja-Vu. If not, see .
//
use std::time::Instant;
diff --git a/core/src/components/left.rs b/core/src/components/left.rs
index 0f1c833..eb27244 100644
--- a/core/src/components/left.rs
+++ b/core/src/components/left.rs
@@ -1,17 +1,17 @@
-// This file is part of Deja-vu.
+// This file is part of Deja-Vu.
//
-// Deja-vu is free software: you can redistribute it and/or modify it
+// Deja-Vu is free software: you can redistribute it and/or modify it
// under the terms of the GNU General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version.
//
-// Deja-vu is distributed in the hope that it will be useful, but
+// Deja-Vu is distributed in the hope that it will be useful, but
// WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
// See the GNU General Public License for more details.
//
// You should have received a copy of the GNU General Public License
-// along with Deja-vu. If not, see .
+// along with Deja-Vu. If not, see .
//
use color_eyre::Result;
use crossterm::event::KeyEvent;
@@ -138,14 +138,10 @@ impl Component for Left {
.areas(area);
// Title
- let title_text = if self.selections[1].is_some() || self.select_num == 1 {
- "Confirm Selections"
- } else {
- self.title_text.as_str()
- };
- let title =
- Paragraph::new(Line::from(Span::styled(title_text, Style::default())).centered())
- .block(Block::default().borders(Borders::NONE));
+ let title = Paragraph::new(
+ Line::from(Span::styled(self.title_text.as_str(), Style::default())).centered(),
+ )
+ .block(Block::default().borders(Borders::NONE));
frame.render_widget(title, title_area);
// Body (Blank)
diff --git a/core/src/components/popup.rs b/core/src/components/popup.rs
index c2c0980..4b951a7 100644
--- a/core/src/components/popup.rs
+++ b/core/src/components/popup.rs
@@ -1,19 +1,20 @@
-// This file is part of Deja-vu.
+// This file is part of Deja-Vu.
//
-// Deja-vu is free software: you can redistribute it and/or modify it
+// Deja-Vu is free software: you can redistribute it and/or modify it
// under the terms of the GNU General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version.
//
-// Deja-vu is distributed in the hope that it will be useful, but
+// Deja-Vu is distributed in the hope that it will be useful, but
// WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
// See the GNU General Public License for more details.
//
// You should have received a copy of the GNU General Public License
-// along with Deja-vu. If not, see .
+// along with Deja-Vu. If not, see .
//
use color_eyre::Result;
+use rand::random;
use ratatui::{
prelude::*,
widgets::{Block, Borders, Clear, Paragraph, Wrap},
@@ -95,3 +96,19 @@ impl Component for Popup {
Ok(())
}
}
+
+pub fn fortune() -> String {
+ String::from(match random::() / 4 {
+ 0 => "FUN FACT\n\n\nComputers barely work.",
+ 1 => "CRASH OVERRIDE\n\n\n\"Hack the planet!\"",
+ 2 => "CATS\n\n\n\"All your base are belong to us!\"",
+ 3 => "HMM\n\n\nThis has all happened before...\n\nThis will all happen again.",
+ 4 => "CYPHER\n\n\n\"I don’t even see the code. All I see is blonde, brunette, red-head.\"",
+ 5 => "CONGRATULATIONS\n\n\nYour did it!",
+ 6 => "DID YOU KNOW?\n\n\nmacOS includes a built-in screen reader!",
+ 7 => "TIP OF THE DAY\n\n\nNever go full Snappy!",
+ 8 => "WORDS OF WISDOM\n\n\n\nIt’s not DNS,\n\nThere’s no way it’s DNS,\n\nIt was DNS.",
+ 9 => "HAL 9000\n\n\n\"I'm sorry Dave, I'm afraid I can't do that.\"",
+ _ => "COMPLETE\n\n\nThank you for using this tool!",
+ })
+}
diff --git a/core/src/components/right.rs b/core/src/components/right.rs
index 569d0a1..e7c18b6 100644
--- a/core/src/components/right.rs
+++ b/core/src/components/right.rs
@@ -1,17 +1,17 @@
-// This file is part of Deja-vu.
+// This file is part of Deja-Vu.
//
-// Deja-vu is free software: you can redistribute it and/or modify it
+// Deja-Vu is free software: you can redistribute it and/or modify it
// under the terms of the GNU General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version.
//
-// Deja-vu is distributed in the hope that it will be useful, but
+// Deja-Vu is distributed in the hope that it will be useful, but
// WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
// See the GNU General Public License for more details.
//
// You should have received a copy of the GNU General Public License
-// along with Deja-vu. If not, see .
+// along with Deja-Vu. If not, see .
//
use color_eyre::Result;
use crossterm::event::KeyEvent;
diff --git a/core/src/components/state.rs b/core/src/components/state.rs
index b7b139c..d2862a9 100644
--- a/core/src/components/state.rs
+++ b/core/src/components/state.rs
@@ -1,17 +1,17 @@
-// This file is part of Deja-vu.
+// This file is part of Deja-Vu.
//
-// Deja-vu is free software: you can redistribute it and/or modify it
+// Deja-Vu is free software: you can redistribute it and/or modify it
// under the terms of the GNU General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version.
//
-// Deja-vu is distributed in the hope that it will be useful, but
+// Deja-Vu is distributed in the hope that it will be useful, but
// WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
// See the GNU General Public License for more details.
//
// You should have received a copy of the GNU General Public License
-// along with Deja-vu. If not, see .
+// along with Deja-Vu. If not, see .
//
use std::collections::HashMap;
@@ -55,7 +55,7 @@ impl StatefulList {
self.state.selected()
}
- fn select_first_item(&mut self) {
+ pub fn select_first_item(&mut self) {
if self.items.is_empty() {
self.state.select(None);
} else {
diff --git a/core/src/components/title.rs b/core/src/components/title.rs
index ee4f088..f8e7dee 100644
--- a/core/src/components/title.rs
+++ b/core/src/components/title.rs
@@ -1,17 +1,17 @@
-// This file is part of Deja-vu.
+// This file is part of Deja-Vu.
//
-// Deja-vu is free software: you can redistribute it and/or modify it
+// Deja-Vu is free software: you can redistribute it and/or modify it
// under the terms of the GNU General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version.
//
-// Deja-vu is distributed in the hope that it will be useful, but
+// Deja-Vu is distributed in the hope that it will be useful, but
// WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
// See the GNU General Public License for more details.
//
// You should have received a copy of the GNU General Public License
-// along with Deja-vu. If not, see .
+// along with Deja-Vu. If not, see .
//
use color_eyre::Result;
use ratatui::{
diff --git a/core/src/config.rs b/core/src/config.rs
index 49eb824..2878c20 100644
--- a/core/src/config.rs
+++ b/core/src/config.rs
@@ -1,17 +1,17 @@
-// This file is part of Deja-vu.
+// This file is part of Deja-Vu.
//
-// Deja-vu is free software: you can redistribute it and/or modify it
+// Deja-Vu is free software: you can redistribute it and/or modify it
// under the terms of the GNU General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version.
//
-// Deja-vu is distributed in the hope that it will be useful, but
+// Deja-Vu is distributed in the hope that it will be useful, but
// WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
// See the GNU General Public License for more details.
//
// You should have received a copy of the GNU General Public License
-// along with Deja-vu. If not, see .
+// along with Deja-Vu. If not, see .
//
#![allow(dead_code)] // Remove this once you start using the code
@@ -149,8 +149,8 @@ pub fn get_config_dir() -> PathBuf {
}
fn project_directory() -> Option {
- ProjectDirs::from("com", "Deja-vu", "deja-vu")
- //ProjectDirs::from("com", "Deja-vu", env!("CARGO_PKG_NAME"))
+ ProjectDirs::from("com", "Deja-Vu", "deja-vu")
+ //ProjectDirs::from("com", "Deja-Vu", env!("CARGO_PKG_NAME"))
}
#[derive(Clone, Debug, Default, Deref, DerefMut)]
diff --git a/core/src/errors.rs b/core/src/errors.rs
index 6d1753f..6285edc 100644
--- a/core/src/errors.rs
+++ b/core/src/errors.rs
@@ -1,17 +1,17 @@
-// This file is part of Deja-vu.
+// This file is part of Deja-Vu.
//
-// Deja-vu is free software: you can redistribute it and/or modify it
+// Deja-Vu is free software: you can redistribute it and/or modify it
// under the terms of the GNU General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version.
//
-// Deja-vu is distributed in the hope that it will be useful, but
+// Deja-Vu is distributed in the hope that it will be useful, but
// WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
// See the GNU General Public License for more details.
//
// You should have received a copy of the GNU General Public License
-// along with Deja-vu. If not, see .
+// along with Deja-Vu. If not, see .
//
use std::env;
diff --git a/core/src/lib.rs b/core/src/lib.rs
index 2e49e5e..f954f22 100644
--- a/core/src/lib.rs
+++ b/core/src/lib.rs
@@ -1,17 +1,17 @@
-// This file is part of Deja-vu.
+// This file is part of Deja-Vu.
//
-// Deja-vu is free software: you can redistribute it and/or modify it
+// Deja-Vu is free software: you can redistribute it and/or modify it
// under the terms of the GNU General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version.
//
-// Deja-vu is distributed in the hope that it will be useful, but
+// Deja-Vu is distributed in the hope that it will be useful, but
// WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
// See the GNU General Public License for more details.
//
// You should have received a copy of the GNU General Public License
-// along with Deja-vu. If not, see .
+// along with Deja-Vu. If not, see .
//
pub mod action;
pub mod cli;
diff --git a/core/src/line.rs b/core/src/line.rs
index 038a848..c618451 100644
--- a/core/src/line.rs
+++ b/core/src/line.rs
@@ -1,17 +1,17 @@
-// This file is part of Deja-vu.
+// This file is part of Deja-Vu.
//
-// Deja-vu is free software: you can redistribute it and/or modify it
+// Deja-Vu is free software: you can redistribute it and/or modify it
// under the terms of the GNU General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version.
//
-// Deja-vu is distributed in the hope that it will be useful, but
+// Deja-Vu is distributed in the hope that it will be useful, but
// WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
// See the GNU General Public License for more details.
//
// You should have received a copy of the GNU General Public License
-// along with Deja-vu. If not, see .
+// along with Deja-Vu. If not, see .
//
use ratatui::{
style::{Color, Style},
@@ -45,7 +45,10 @@ impl DVLine {
}
}
-pub fn get_disk_description_right(disk: &Disk) -> Vec {
+pub fn get_disk_description_right(
+ disk: &Disk,
+ boot_os_indicies: Option>,
+) -> Vec {
let mut description: Vec = vec![
DVLine {
line_parts: vec![format!(
@@ -67,12 +70,29 @@ pub fn get_disk_description_right(disk: &Disk) -> Vec {
line_colors: vec![Color::Blue],
},
];
- for line in &disk.parts_description {
- description.push(DVLine {
- line_parts: vec![line.clone()],
- line_colors: vec![Color::Reset],
+ disk.parts_description
+ .iter()
+ .enumerate()
+ .for_each(|(index, line)| {
+ let mut line_parts = vec![line.clone()];
+ let mut line_colors = vec![Color::Reset];
+ if let Some(indicies) = &boot_os_indicies {
+ let boot_index = indicies.get(0);
+ if boot_index.is_some_and(|i| i == &index) {
+ line_parts.push(String::from(" <-- Boot Partition"));
+ line_colors.push(Color::Cyan);
+ }
+ let boot_index = indicies.get(1);
+ if boot_index.is_some_and(|i| i == &index) {
+ line_parts.push(String::from(" <-- OS Partition"));
+ line_colors.push(Color::Cyan);
+ }
+ }
+ description.push(DVLine {
+ line_parts,
+ line_colors,
+ });
});
- }
description
}
diff --git a/core/src/logging.rs b/core/src/logging.rs
index 741e981..02c8b3a 100644
--- a/core/src/logging.rs
+++ b/core/src/logging.rs
@@ -1,17 +1,17 @@
-// This file is part of Deja-vu.
+// This file is part of Deja-Vu.
//
-// Deja-vu is free software: you can redistribute it and/or modify it
+// Deja-Vu is free software: you can redistribute it and/or modify it
// under the terms of the GNU General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version.
//
-// Deja-vu is distributed in the hope that it will be useful, but
+// Deja-Vu is distributed in the hope that it will be useful, but
// WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
// See the GNU General Public License for more details.
//
// You should have received a copy of the GNU General Public License
-// along with Deja-vu. If not, see .
+// along with Deja-Vu. If not, see .
//
use color_eyre::Result;
use tracing_error::ErrorLayer;
diff --git a/core/src/state.rs b/core/src/state.rs
index fab9ede..8c8eb8d 100644
--- a/core/src/state.rs
+++ b/core/src/state.rs
@@ -1,17 +1,17 @@
-// This file is part of Deja-vu.
+// This file is part of Deja-Vu.
//
-// Deja-vu is free software: you can redistribute it and/or modify it
+// Deja-Vu is free software: you can redistribute it and/or modify it
// under the terms of the GNU General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version.
//
-// Deja-vu is distributed in the hope that it will be useful, but
+// Deja-Vu is distributed in the hope that it will be useful, but
// WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
// See the GNU General Public License for more details.
//
// You should have received a copy of the GNU General Public License
-// along with Deja-vu. If not, see .
+// along with Deja-Vu. If not, see .
//
use std::sync::{Arc, Mutex};
@@ -30,6 +30,13 @@ pub enum Mode {
Home,
Done,
Failed,
+ // Boot Diags
+ DiagMenu,
+ BootDiags,
+ BootScan,
+ BootSetup,
+ InjectDrivers,
+ SetBootMode,
// Clone
ScanDisks,
InstallDrivers,
diff --git a/core/src/system.rs b/core/src/system.rs
index 1d9692d..f8c5db1 100644
--- a/core/src/system.rs
+++ b/core/src/system.rs
@@ -1,17 +1,17 @@
-// This file is part of Deja-vu.
+// This file is part of Deja-Vu.
//
-// Deja-vu is free software: you can redistribute it and/or modify it
+// Deja-Vu is free software: you can redistribute it and/or modify it
// under the terms of the GNU General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version.
//
-// Deja-vu is distributed in the hope that it will be useful, but
+// Deja-Vu is distributed in the hope that it will be useful, but
// WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
// See the GNU General Public License for more details.
//
// You should have received a copy of the GNU General Public License
-// along with Deja-vu. If not, see .
+// along with Deja-Vu. If not, see .
//
pub mod boot;
pub mod cpu;
diff --git a/core/src/system/boot.rs b/core/src/system/boot.rs
index 2bc098f..3a87d2d 100644
--- a/core/src/system/boot.rs
+++ b/core/src/system/boot.rs
@@ -1,33 +1,40 @@
-// This file is part of Deja-vu.
+// This file is part of Deja-Vu.
//
-// Deja-vu is free software: you can redistribute it and/or modify it
+// Deja-Vu is free software: you can redistribute it and/or modify it
// under the terms of the GNU General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version.
//
-// Deja-vu is distributed in the hope that it will be useful, but
+// Deja-Vu is distributed in the hope that it will be useful, but
// WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
// See the GNU General Public License for more details.
//
// You should have received a copy of the GNU General Public License
-// along with Deja-vu. If not, see .
+// along with Deja-Vu. If not, see .
//
use super::{disk::PartitionTableType, drivers::Driver};
-use crate::tasks::Task;
+use crate::tasks::TaskType;
use color_eyre::Result;
use std::path::PathBuf;
+#[derive(Clone, Debug, Default)]
+pub enum SafeMode {
+ #[default]
+ Disable,
+ Enable,
+}
+
pub fn configure_disk(
letter_boot: &str,
letter_os: &str,
system32: &str,
table_type: PartitionTableType,
-) -> Vec {
+) -> Vec {
let mut tasks = Vec::new();
// Create
- tasks.push(Task::Command(
+ tasks.push(TaskType::CommandWait(
PathBuf::from(format!("{system32}/bcdboot.exe")),
vec![
format!("{letter_os}:\\Windows"),
@@ -43,7 +50,7 @@ pub fn configure_disk(
// Update boot sector (for legacy setups)
if table_type == PartitionTableType::Legacy {
- tasks.push(Task::Command(
+ tasks.push(TaskType::CommandWait(
PathBuf::from(format!("{system32}/bootsect.exe")),
vec![
String::from("/nt60"),
@@ -55,34 +62,19 @@ pub fn configure_disk(
}
// Lock in safe mode
- let bcd_path = match table_type {
- PartitionTableType::Guid => {
- format!("{letter_boot}:\\EFI\\Microsoft\\Boot\\BCD")
- }
- PartitionTableType::Legacy => {
- format!("{letter_boot}:\\Boot\\BCD")
- }
- };
- tasks.push(Task::Command(
- PathBuf::from(format!("{system32}/bcdedit.exe")),
- vec![
- String::from("/store"),
- bcd_path,
- String::from("/set"),
- String::from("{default}"),
- String::from("safeboot"),
- String::from("minimal"),
- ],
- ));
+ tasks.push(
+ set_mode(letter_boot, SafeMode::Enable, system32, &table_type)
+ .expect("Failed to create set_mode task."),
+ );
// Done
tasks
}
-pub fn inject_driver(driver: &Driver, letter_os: &str, system32: &str) -> Result {
+pub fn inject_driver(driver: &Driver, letter_os: &str, system32: &str) -> Result {
//if let Some(driver_path_str) = driver.path.to_str() {
let driver_path = driver.path.to_str().unwrap();
- Ok(Task::Command(
+ Ok(TaskType::CommandWait(
PathBuf::from(format!("{system32}/dism.exe")),
vec![
format!("/image:{letter_os}:\\"),
@@ -92,3 +84,39 @@ pub fn inject_driver(driver: &Driver, letter_os: &str, system32: &str) -> Result
],
))
}
+
+pub fn set_mode(
+ letter_boot: &str,
+ mode: SafeMode,
+ system32: &str,
+ table_type: &PartitionTableType,
+) -> Result {
+ let bcd_path = match table_type {
+ PartitionTableType::Guid => {
+ format!("{letter_boot}:\\EFI\\Microsoft\\Boot\\BCD")
+ }
+ PartitionTableType::Legacy => {
+ format!("{letter_boot}:\\Boot\\BCD")
+ }
+ };
+
+ // Build CommandWait
+ let mut cmd_args = vec![String::from("/store"), bcd_path];
+ match mode {
+ SafeMode::Disable => {
+ cmd_args.push(String::from("/deletevalue"));
+ cmd_args.push(String::from("{default}"));
+ cmd_args.push(String::from("safeboot"));
+ }
+ SafeMode::Enable => {
+ cmd_args.push(String::from("/set"));
+ cmd_args.push(String::from("{default}"));
+ cmd_args.push(String::from("safeboot"));
+ cmd_args.push(String::from("minimal"));
+ }
+ }
+ Ok(TaskType::CommandWait(
+ PathBuf::from(format!("{system32}/bcdedit.exe")),
+ cmd_args,
+ ))
+}
diff --git a/core/src/system/cpu.rs b/core/src/system/cpu.rs
index 1187d2c..0e2a316 100644
--- a/core/src/system/cpu.rs
+++ b/core/src/system/cpu.rs
@@ -1,17 +1,17 @@
-// This file is part of Deja-vu.
+// This file is part of Deja-Vu.
//
-// Deja-vu is free software: you can redistribute it and/or modify it
+// Deja-Vu is free software: you can redistribute it and/or modify it
// under the terms of the GNU General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version.
//
-// Deja-vu is distributed in the hope that it will be useful, but
+// Deja-Vu is distributed in the hope that it will be useful, but
// WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
// See the GNU General Public License for more details.
//
// You should have received a copy of the GNU General Public License
-// along with Deja-vu. If not, see .
+// along with Deja-Vu. If not, see .
//
#[must_use]
pub fn get_cpu_name() -> String {
diff --git a/core/src/system/disk.rs b/core/src/system/disk.rs
index 96a8ae0..3450add 100644
--- a/core/src/system/disk.rs
+++ b/core/src/system/disk.rs
@@ -1,17 +1,17 @@
-// This file is part of Deja-vu.
+// This file is part of Deja-Vu.
//
-// Deja-vu is free software: you can redistribute it and/or modify it
+// Deja-Vu is free software: you can redistribute it and/or modify it
// under the terms of the GNU General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version.
//
-// Deja-vu is distributed in the hope that it will be useful, but
+// Deja-Vu is distributed in the hope that it will be useful, but
// WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
// See the GNU General Public License for more details.
//
// You should have received a copy of the GNU General Public License
-// along with Deja-vu. If not, see .
+// along with Deja-Vu. If not, see .
//
use serde::{Deserialize, Serialize};
use std::{
diff --git a/core/src/system/diskpart.rs b/core/src/system/diskpart.rs
index 9521982..ae1c97a 100644
--- a/core/src/system/diskpart.rs
+++ b/core/src/system/diskpart.rs
@@ -1,17 +1,17 @@
-// This file is part of Deja-vu.
+// This file is part of Deja-Vu.
//
-// Deja-vu is free software: you can redistribute it and/or modify it
+// Deja-Vu is free software: you can redistribute it and/or modify it
// under the terms of the GNU General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version.
//
-// Deja-vu is distributed in the hope that it will be useful, but
+// Deja-Vu is distributed in the hope that it will be useful, but
// WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
// See the GNU General Public License for more details.
//
// You should have received a copy of the GNU General Public License
-// along with Deja-vu. If not, see .
+// along with Deja-Vu. If not, see .
//
use std::{
collections::HashMap,
@@ -129,7 +129,7 @@ pub fn get_partition_details(
#[must_use]
pub fn build_dest_format_script(disk_id: usize, part_type: &PartitionTableType) -> String {
let disk_id = format!("{disk_id}");
- let mut script = vec!["select disk {disk_id}", "clean"];
+ let mut script = vec!["automount enable noerr", "select disk {disk_id}", "clean"];
match part_type {
PartitionTableType::Guid => {
script.push("convert gpt");
diff --git a/core/src/system/drivers.rs b/core/src/system/drivers.rs
index a95c342..8ddfa6c 100644
--- a/core/src/system/drivers.rs
+++ b/core/src/system/drivers.rs
@@ -1,17 +1,17 @@
-// This file is part of Deja-vu.
+// This file is part of Deja-Vu.
//
-// Deja-vu is free software: you can redistribute it and/or modify it
+// Deja-Vu is free software: you can redistribute it and/or modify it
// under the terms of the GNU General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version.
//
-// Deja-vu is distributed in the hope that it will be useful, but
+// Deja-Vu is distributed in the hope that it will be useful, but
// WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
// See the GNU General Public License for more details.
//
// You should have received a copy of the GNU General Public License
-// along with Deja-vu. If not, see .
+// along with Deja-Vu. If not, see .
//
use std::{env, fmt, fs::read_dir, path::PathBuf, process::Command};
diff --git a/core/src/tasks.rs b/core/src/tasks.rs
index 50bca0d..b0bd7a9 100644
--- a/core/src/tasks.rs
+++ b/core/src/tasks.rs
@@ -1,21 +1,22 @@
-// This file is part of Deja-vu.
+// This file is part of Deja-Vu.
//
-// Deja-vu is free software: you can redistribute it and/or modify it
+// Deja-Vu is free software: you can redistribute it and/or modify it
// under the terms of the GNU General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version.
//
-// Deja-vu is distributed in the hope that it will be useful, but
+// Deja-Vu is distributed in the hope that it will be useful, but
// WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
// See the GNU General Public License for more details.
//
// You should have received a copy of the GNU General Public License
-// along with Deja-vu. If not, see .
+// along with Deja-Vu. If not, see .
//
use std::{
collections::VecDeque,
+ fmt,
path::PathBuf,
process::{Command, Stdio},
sync::{Arc, Mutex},
@@ -34,23 +35,69 @@ use crate::{
};
#[derive(Clone, Debug)]
-pub enum Task {
- Command(PathBuf, Vec), // (command, args)
- Diskpart(String), // (script_as_string)
+pub enum TaskResult {
+ Error(String),
+ Output(String, String, bool), // stdout, stderr, success
+}
+
+#[derive(Clone, Debug)]
+pub enum TaskType {
+ CommandNoWait(PathBuf, Vec), // (command, args)
+ CommandWait(PathBuf, Vec), // (command, args)
+ Diskpart(String), // (script_as_string)
ScanDisks,
Sleep,
UpdateDestDisk(usize), // (disk_index)
UpdateDiskList,
}
+impl fmt::Display for TaskType {
+ fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+ match self {
+ TaskType::CommandNoWait(cmd_path, _) | TaskType::CommandWait(cmd_path, _) => {
+ write!(
+ f,
+ "Command(\"{}\")",
+ cmd_path.file_name().unwrap().to_string_lossy()
+ )
+ }
+ TaskType::Diskpart(_) => {
+ write!(f, "Diskpart")
+ }
+ TaskType::ScanDisks => write!(f, "ScanDisks"),
+ TaskType::Sleep => write!(f, "Sleep"),
+ TaskType::UpdateDestDisk(_) => write!(f, "UpdateDestDisk"),
+ TaskType::UpdateDiskList => write!(f, "UpdateDiskList"),
+ }
+ }
+}
+
+#[derive(Debug)]
+pub struct Task {
+ pub handle: Option>,
+ pub result: Option,
+ pub task_type: TaskType,
+}
+
+impl Task {
+ pub fn new(task_type: TaskType) -> Task {
+ Task {
+ handle: None,
+ result: None,
+ task_type,
+ }
+ }
+}
+
#[derive(Debug)]
pub struct Tasks {
action_tx: mpsc::UnboundedSender,
disk_list: Arc>>,
- handle: Option>,
+ cur_handle: Option>,
+ cur_task: Option,
task_list: VecDeque,
- task_rx: mpsc::UnboundedReceiver, // Used to forward Actions from Tasks to App
- task_tx: mpsc::UnboundedSender, // Used to forward Actions from Tasks to App
+ task_rx: mpsc::UnboundedReceiver,
+ task_tx: mpsc::UnboundedSender,
}
impl Tasks {
@@ -62,159 +109,181 @@ impl Tasks {
Tasks {
action_tx,
disk_list: disk_list_arc,
- handle: None,
+ cur_handle: None,
+ cur_task: None,
task_list: VecDeque::new(),
task_rx,
task_tx,
}
}
- pub fn add(&mut self, task: Task) {
- info!("Adding task: {:?}", &task);
- self.task_list.push_back(task);
+ pub fn add(&mut self, task_type: TaskType) {
+ info!("Adding task: {:?}", &task_type);
+ self.task_list.push_back(Task::new(task_type));
}
pub fn idle(&self) -> bool {
- self.handle.is_none()
+ self.cur_handle.is_none()
}
- pub fn poll(&mut self) -> Result<()> {
- // Forward any actions to main app
- if let Ok(action) = self.task_rx.try_recv() {
- let result = self.action_tx.send(action.clone());
- assert!(result.is_ok(), "Failed to send Action: {action:?}");
+ pub fn poll(&mut self) -> Result> {
+ let mut return_task: Option = None;
+ // Handle task channel item(s)
+ if let Ok(result) = self.task_rx.try_recv() {
+ if let Some(mut task) = self.cur_task.take() {
+ task.result.replace(result);
+ self.cur_task.replace(task);
+ }
}
// Check status of current task (if one is running).
- // NOTE: Action::NextScreen is sent once all tasks are complete
- if let Some(handle) = self.handle.take() {
- if handle.is_finished() {
+ // NOTE: Action::TasksComplete is sent once all tasks are complete
+ if let Some(task_handle) = self.cur_handle.take() {
+ if task_handle.is_finished() {
+ // Need to return task with handle
+ if let Some(mut cur_task) = self.cur_task.take() {
+ cur_task.handle = Some(task_handle);
+ return_task = Some(cur_task);
+ }
if self.task_list.is_empty() {
// No tasks remain
- self.task_tx.send(Action::NextScreen)?;
+ self.action_tx.send(Action::TasksComplete)?;
} else {
// Start next task
self.start()?;
}
} else {
- // Task not complete, return handle
- self.handle = Some(handle);
+ // TaskType not complete, return handle
+ self.cur_handle.replace(task_handle);
}
} else if !self.task_list.is_empty() {
// No current task but one is available
self.start()?;
}
- Ok(())
+ Ok(return_task)
}
pub fn start(&mut self) -> Result<()> {
- if let Some(task) = self.task_list.pop_front() {
- let task_str = format!("{task:?}");
+ self.cur_task = self.task_list.pop_front();
+ if let Some(task) = self.cur_task.take() {
let task_tx = self.task_tx.clone();
- match task {
- Task::Command(ref cmd_path, ref cmd_args) => {
- let cmd_path = cmd_path.clone();
- let cmd_args = cmd_args.clone();
- if cfg!(windows) {
- self.handle = Some(thread::spawn(move || {
- let result = Command::new(cmd_path)
- .args(cmd_args)
- .stdout(Stdio::piped())
- .output();
- if let Some(action) = match result {
- Ok(output) => {
- if output.status.success() {
- None
- } else {
- // Command returned an error status
- let mut msg = String::new();
- if let Ok(stdout) = String::from_utf8(output.stdout) {
- msg = String::from(stdout.trim());
- }
- if msg.is_empty() {
- msg = String::from("Generic error");
- }
- Some(Action::Error(format!("Command failed: {msg}",)))
- }
- }
- Err(err) => {
- Some(Action::Error(format!("Failed to run command: {err:?}")))
- }
- } {
- let msg = format!("{:?}", &action);
- let result = task_tx.send(action);
- assert!(result.is_ok(), "Failed to send Action: {msg}");
- }
- }));
- } else {
- // Simulate task if not running under Windows
- self.handle = Some(thread::spawn(|| sleep(Duration::from_millis(250))));
- }
+ match task.task_type {
+ TaskType::CommandNoWait(ref cmd_path, ref cmd_args) => {
+ self.cur_handle = None;
+ run_task_command(cmd_path.clone(), cmd_args.clone(), task_tx);
}
- Task::Diskpart(ref script) => {
- if cfg!(windows) {
- let script = String::from(script);
- self.handle = Some(thread::spawn(move || {
- let output = diskpart::run_script_raw(script.as_str());
- if !output.status.success()
- && task_tx
- .send(Action::Error(String::from(
- "Diskpart script returned an error",
- )))
- .is_err()
- {
- panic!("Failed to send Action: {task_str:?}");
- }
- }));
- } else {
- // Simulate task if not running under Windows
- self.handle = Some(thread::spawn(|| sleep(Duration::from_millis(250))));
- }
+ TaskType::CommandWait(ref cmd_path, ref cmd_args) => {
+ self.cur_handle = Some(run_task_command(
+ cmd_path.clone(),
+ cmd_args.clone(),
+ task_tx,
+ ));
}
- Task::ScanDisks => {
+ TaskType::Diskpart(ref script) => {
+ self.cur_handle = Some(run_task_diskpart(&script, task_tx));
+ }
+ TaskType::ScanDisks => {
let disk_list_arc = self.disk_list.clone();
// Queue UpdateDiskList for various components
- self.add(Task::UpdateDiskList);
+ self.add(TaskType::UpdateDiskList);
- self.handle = Some(thread::spawn(move || {
+ self.cur_handle = Some(thread::spawn(move || {
let mut disks = disk_list_arc.lock().unwrap();
- *disks = disk::get_disks();
+ *disks = disk::get_disks()
}));
}
- Task::Sleep => {
- self.handle = Some(thread::spawn(|| sleep(Duration::from_millis(250))));
+ TaskType::Sleep => {
+ self.cur_handle = Some(thread::spawn(|| sleep(Duration::from_millis(250))));
}
- Task::UpdateDestDisk(index) => {
+ TaskType::UpdateDestDisk(index) => {
self.action_tx.send(Action::DisplayPopup(
popup::Type::Info,
String::from("Refreshing disk info"),
))?;
// Queue UpdateDiskList for various components
- self.add(Task::Sleep);
- self.add(Task::UpdateDiskList);
+ self.add(TaskType::Sleep);
+ self.add(TaskType::UpdateDiskList);
// Update destination disk ~in-place
let disk_list_arc = self.disk_list.clone();
- self.handle = Some(thread::spawn(move || {
+ self.cur_handle = Some(thread::spawn(move || {
let mut disks = disk_list_arc.lock().unwrap();
let old_disk = &mut disks[index];
disks[index] = disk::refresh_disk_info(old_disk);
}));
}
- Task::UpdateDiskList => {
+ TaskType::UpdateDiskList => {
let disks = self.disk_list.lock().unwrap();
let disks_copy = disks.clone();
let action_tx = self.action_tx.clone();
- self.handle = Some(thread::spawn(move || {
+ self.cur_handle = Some(thread::spawn(move || {
if let Err(err) = action_tx.send(Action::UpdateDiskList(disks_copy)) {
panic!("Failed to send Action: {err:?}");
}
}));
}
}
+ // Done
+ self.cur_task.replace(task);
}
Ok(())
}
}
+
+fn parse_bytes_as_str(bytes: Vec) -> String {
+ match String::from_utf8(bytes) {
+ Ok(s) => s.trim().to_string(),
+ Err(_) => String::from("Failed to parse bytes as UTF-8 text"),
+ }
+}
+
+fn run_task_command(
+ cmd_path: PathBuf,
+ cmd_args: Vec,
+ task_tx: mpsc::UnboundedSender,
+) -> JoinHandle<()> {
+ if cfg!(windows) {
+ thread::spawn(move || {
+ let result = Command::new(cmd_path)
+ .args(cmd_args)
+ .stdout(Stdio::piped())
+ .output();
+ match result {
+ Err(e) => {
+ task_tx
+ .send(TaskResult::Error(format!("{:?}", &e)))
+ .expect("Failed to propegate error?");
+ }
+ Ok(output) => {
+ let stderr = parse_bytes_as_str(output.stderr.to_owned());
+ let stdout = parse_bytes_as_str(output.stdout.to_owned());
+ let task_result = TaskResult::Output(stdout, stderr, output.status.success());
+ let err_str = format!("Failed to send TaskResult: {:?}", &task_result);
+ task_tx.send(task_result).expect(err_str.as_str());
+ }
+ }
+ })
+ } else {
+ // Simulate task if not running under Windows
+ thread::spawn(|| sleep(Duration::from_millis(250)))
+ }
+}
+
+fn run_task_diskpart(script: &str, task_tx: mpsc::UnboundedSender) -> JoinHandle<()> {
+ if cfg!(windows) {
+ let script = script.to_owned();
+ thread::spawn(move || {
+ let output = diskpart::run_script_raw(&script);
+ let stderr = parse_bytes_as_str(output.stderr.to_owned());
+ let stdout = parse_bytes_as_str(output.stdout.to_owned());
+ let task_result = TaskResult::Output(stdout, stderr, output.status.success());
+ let err_str = format!("Failed to send TaskResult: {:?}", &task_result);
+ task_tx.send(task_result).expect(err_str.as_str());
+ })
+ } else {
+ // Simulate task if not running under Windows
+ thread::spawn(|| sleep(Duration::from_millis(250)))
+ }
+}
diff --git a/core/src/tests/mod.rs b/core/src/tests/mod.rs
index cf96690..6750d5d 100644
--- a/core/src/tests/mod.rs
+++ b/core/src/tests/mod.rs
@@ -1,17 +1,17 @@
-// This file is part of Deja-vu.
+// This file is part of Deja-Vu.
//
-// Deja-vu is free software: you can redistribute it and/or modify it
+// Deja-Vu is free software: you can redistribute it and/or modify it
// under the terms of the GNU General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version.
//
-// Deja-vu is distributed in the hope that it will be useful, but
+// Deja-Vu is distributed in the hope that it will be useful, but
// WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
// See the GNU General Public License for more details.
//
// You should have received a copy of the GNU General Public License
-// along with Deja-vu. If not, see .
+// along with Deja-Vu. If not, see .
//
pub mod sample_output;
diff --git a/core/src/tests/sample_output.rs b/core/src/tests/sample_output.rs
index 2d2681b..4ffdfda 100644
--- a/core/src/tests/sample_output.rs
+++ b/core/src/tests/sample_output.rs
@@ -1,17 +1,17 @@
-// This file is part of Deja-vu.
+// This file is part of Deja-Vu.
//
-// Deja-vu is free software: you can redistribute it and/or modify it
+// Deja-Vu is free software: you can redistribute it and/or modify it
// under the terms of the GNU General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version.
//
-// Deja-vu is distributed in the hope that it will be useful, but
+// Deja-Vu is distributed in the hope that it will be useful, but
// WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
// See the GNU General Public License for more details.
//
// You should have received a copy of the GNU General Public License
-// along with Deja-vu. If not, see .
+// along with Deja-Vu. If not, see .
//
#[allow(dead_code)]
pub static DETAIL_DISK_GPT: &str = "Disk 2 is now the selected disk.
diff --git a/core/src/tui.rs b/core/src/tui.rs
index 9bc93c7..cf563b0 100644
--- a/core/src/tui.rs
+++ b/core/src/tui.rs
@@ -1,17 +1,17 @@
-// This file is part of Deja-vu.
+// This file is part of Deja-Vu.
//
-// Deja-vu is free software: you can redistribute it and/or modify it
+// Deja-Vu is free software: you can redistribute it and/or modify it
// under the terms of the GNU General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version.
//
-// Deja-vu is distributed in the hope that it will be useful, but
+// Deja-Vu is distributed in the hope that it will be useful, but
// WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
// See the GNU General Public License for more details.
//
// You should have received a copy of the GNU General Public License
-// along with Deja-vu. If not, see .
+// along with Deja-Vu. If not, see .
//
#![allow(dead_code)] // Remove this once you start using the code
diff --git a/deja_vu/Cargo.toml b/deja_vu/Cargo.toml
index 7756600..13af3e8 100644
--- a/deja_vu/Cargo.toml
+++ b/deja_vu/Cargo.toml
@@ -1,17 +1,17 @@
-# This file is part of Deja-vu.
+# This file is part of Deja-Vu.
#
-# Deja-vu is free software: you can redistribute it and/or modify it
+# Deja-Vu is free software: you can redistribute it and/or modify it
# under the terms of the GNU General Public License as published by
# the Free Software Foundation, either version 3 of the License, or
# (at your option) any later version.
#
-# Deja-vu is distributed in the hope that it will be useful, but
+# Deja-Vu is distributed in the hope that it will be useful, but
# WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
# See the GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with Deja-vu. If not, see .
+# along with Deja-Vu. If not, see .
[package]
name = "deja-vu"
@@ -39,7 +39,7 @@ tokio-util = "0.7.11"
tracing = "0.1.41"
tracing-error = "0.2.0"
tracing-subscriber = { version = "0.3.18", features = ["env-filter", "serde"] }
-rand = "0.8.5"
+check_elevation = "0.2.4"
[build-dependencies]
anyhow = "1.0.86"
diff --git a/deja_vu/build.rs b/deja_vu/build.rs
index c3ced6b..8988d39 100644
--- a/deja_vu/build.rs
+++ b/deja_vu/build.rs
@@ -1,17 +1,17 @@
-// This file is part of Deja-vu.
+// This file is part of Deja-Vu.
//
-// Deja-vu is free software: you can redistribute it and/or modify it
+// Deja-Vu is free software: you can redistribute it and/or modify it
// under the terms of the GNU General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version.
//
-// Deja-vu is distributed in the hope that it will be useful, but
+// Deja-Vu is distributed in the hope that it will be useful, but
// WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
// See the GNU General Public License for more details.
//
// You should have received a copy of the GNU General Public License
-// along with Deja-vu. If not, see .
+// along with Deja-Vu. If not, see .
//
use anyhow::Result;
use vergen_gix::{BuildBuilder, CargoBuilder, Emitter, GixBuilder};
diff --git a/deja_vu/src/app.rs b/deja_vu/src/app.rs
index ae6ef72..635b62a 100644
--- a/deja_vu/src/app.rs
+++ b/deja_vu/src/app.rs
@@ -1,17 +1,17 @@
-// This file is part of Deja-vu.
+// This file is part of Deja-Vu.
//
-// Deja-vu is free software: you can redistribute it and/or modify it
+// Deja-Vu is free software: you can redistribute it and/or modify it
// under the terms of the GNU General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version.
//
-// Deja-vu is distributed in the hope that it will be useful, but
+// Deja-Vu is distributed in the hope that it will be useful, but
// WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
// See the GNU General Public License for more details.
//
// You should have received a copy of the GNU General Public License
-// along with Deja-vu. If not, see .
+// along with Deja-Vu. If not, see .
use core::{
action::Action,
@@ -26,17 +26,17 @@ use core::{
boot, cpu::get_cpu_name, disk::PartitionTableType, diskpart::build_dest_format_script,
drivers,
},
- tasks::{Task, Tasks},
+ tasks::{Task, TaskResult, TaskType, Tasks},
tui::{Event, Tui},
};
use std::{
env,
iter::zip,
+ path::PathBuf,
sync::{Arc, Mutex},
};
use color_eyre::Result;
-use rand::random;
use ratatui::{
crossterm::event::KeyEvent,
layout::{Constraint, Direction, Layout},
@@ -115,7 +115,13 @@ impl App {
| Mode::Clone
| Mode::PostClone => None,
// Invalid states
- Mode::PEMenu => panic!("This shouldn't happen?"),
+ Mode::BootDiags
+ | Mode::BootScan
+ | Mode::BootSetup
+ | Mode::DiagMenu
+ | Mode::InjectDrivers
+ | Mode::PEMenu
+ | Mode::SetBootMode => panic!("This shouldn't happen?"),
};
new_mode
}
@@ -134,7 +140,13 @@ impl App {
Mode::PostClone | Mode::Done => Mode::Done,
Mode::Failed => Mode::Failed,
// Invalid states
- Mode::PEMenu => panic!("This shouldn't happen?"),
+ Mode::BootDiags
+ | Mode::BootScan
+ | Mode::BootSetup
+ | Mode::DiagMenu
+ | Mode::InjectDrivers
+ | Mode::PEMenu
+ | Mode::SetBootMode => panic!("This shouldn't happen?"),
};
if new_mode == self.cur_mode {
@@ -153,7 +165,7 @@ impl App {
Mode::ScanDisks => {
self.prev_mode = self.cur_mode;
if self.tasks.idle() {
- self.tasks.add(Task::ScanDisks);
+ self.tasks.add(TaskType::ScanDisks);
}
self.action_tx.send(Action::DisplayPopup(
popup::Type::Info,
@@ -166,13 +178,33 @@ impl App {
String::from("Formatting destination disk"),
))?;
+ // Get System32 path
+ let system32 = if cfg!(windows) {
+ if let Ok(path) = env::var("SYSTEMROOT") {
+ format!("{path}/System32")
+ } else {
+ self.action_tx.send(Action::Error(String::from(
+ "ERROR\n\n\nFailed to find SYSTEMROOT",
+ )))?;
+ return Ok(());
+ }
+ } else {
+ String::from(".")
+ };
+
+ // (Re)Enable volume mounting
+ self.tasks.add(TaskType::CommandWait(
+ PathBuf::from(format!("{system32}/mountvol.exe")),
+ vec![String::from("/e")],
+ ));
+
// Build Diskpart script to format destination disk
let disk_list = self.clone.disk_list.lock().unwrap();
if let Some(disk_index) = self.clone.disk_index_dest {
if let Some(disk) = disk_list.get(disk_index) {
let table_type = self.clone.table_type.clone().unwrap();
let diskpart_script = build_dest_format_script(disk.id, &table_type);
- self.tasks.add(Task::Diskpart(diskpart_script));
+ self.tasks.add(TaskType::Diskpart(diskpart_script));
}
}
}
@@ -181,12 +213,12 @@ impl App {
popup::Type::Info,
String::from("Running Clone Tool"),
))?;
- self.tasks.add(Task::Command(
+ self.tasks.add(TaskType::CommandWait(
self.config.clone_app_path.clone(),
Vec::new(),
));
if let Some(dest_index) = self.clone.disk_index_dest {
- self.tasks.add(Task::UpdateDestDisk(dest_index));
+ self.tasks.add(TaskType::UpdateDestDisk(dest_index));
}
}
Mode::PostClone => {
@@ -248,7 +280,7 @@ impl App {
}
Mode::Done => {
self.action_tx
- .send(Action::DisplayPopup(popup::Type::Success, fortune()))?;
+ .send(Action::DisplayPopup(popup::Type::Success, popup::fortune()))?;
}
_ => {}
}
@@ -343,12 +375,9 @@ impl App {
match action {
Action::Tick => {
self.last_tick_key_events.drain(..);
- match self.cur_mode {
- Mode::ScanDisks | Mode::PreClone | Mode::Clone | Mode::PostClone => {
- // Check background task
- self.tasks.poll()?; // Once all are complete Action::NextScreen is sent
- }
- _ => {}
+ // Check background task(s)
+ if let Some(task) = self.tasks.poll()? {
+ self.handle_task(&task)?;
}
}
Action::Quit => self.should_quit = true,
@@ -369,6 +398,9 @@ impl App {
Mode::Confirm => {
self.action_tx.send(Action::NextScreen)?;
}
+ Mode::Done => {
+ self.action_tx.send(Action::Quit)?;
+ }
_ => {}
},
Action::Resize(w, h) => self.handle_resize(tui, w, h)?,
@@ -468,6 +500,7 @@ impl App {
_ => {}
};
}
+ Action::TasksComplete => self.action_tx.send(Action::NextScreen)?,
_ => {}
}
for component in &mut self.components {
@@ -485,6 +518,39 @@ impl App {
Ok(())
}
+ fn handle_task(&mut self, task: &Task) -> Result<()> {
+ match task.task_type {
+ TaskType::CommandWait(_, _) | TaskType::Diskpart(_) => {
+ // Check result
+ if let Some(result) = &task.result {
+ match result {
+ TaskResult::Error(msg) => {
+ self.action_tx
+ .send(Action::Error(format!("{} Failed: {msg}", task.task_type)))?;
+ }
+ TaskResult::Output(stdout, stderr, success) => {
+ if !success {
+ let msg = if !stdout.is_empty() {
+ stdout.clone()
+ } else if !stderr.is_empty() {
+ stderr.clone()
+ } else {
+ String::from("Unknown Error")
+ };
+ self.action_tx.send(Action::Error(format!(
+ "{} Failed: {msg}",
+ task.task_type
+ )))?;
+ }
+ }
+ }
+ }
+ }
+ _ => {}
+ }
+ Ok(())
+ }
+
fn render(&mut self, tui: &mut Tui) -> Result<()> {
tui.draw(|frame| {
if let [header, _body, footer, left, right, popup] = get_chunks(frame.area())[..] {
@@ -566,14 +632,21 @@ fn build_footer_string(cur_mode: Mode) -> String {
String::from("(q) to quit")
}
Mode::SelectParts => String::from("(Enter) to select / (s) to start over / (q) to quit"),
+ Mode::InstallDrivers => String::from("(Enter) to select / (q) to quit"),
Mode::SelectDisks => String::from(
"(Enter) to select / / (i) to install driver / (r) to rescan / (q) to quit",
),
Mode::SelectTableType => String::from("(Enter) to select / (b) to go back / (q) to quit"),
Mode::Confirm => String::from("(Enter) to confirm / (b) to go back / (q) to quit"),
- Mode::Done | Mode::Failed | Mode::InstallDrivers => String::from("(Enter) or (q) to quit"),
+ Mode::Done | Mode::Failed => String::from("(Enter) or (q) to quit"),
// Invalid states
- Mode::PEMenu => panic!("This shouldn't happen?"),
+ Mode::BootDiags
+ | Mode::BootScan
+ | Mode::BootSetup
+ | Mode::DiagMenu
+ | Mode::InjectDrivers
+ | Mode::PEMenu
+ | Mode::SetBootMode => panic!("This shouldn't happen?"),
}
}
@@ -638,7 +711,13 @@ fn build_left_items(app: &App, cur_mode: Mode) -> Action {
title = String::from("Done");
}
// Invalid states
- Mode::PEMenu => panic!("This shouldn't happen?"),
+ Mode::BootDiags
+ | Mode::BootScan
+ | Mode::BootSetup
+ | Mode::DiagMenu
+ | Mode::InjectDrivers
+ | Mode::PEMenu
+ | Mode::SetBootMode => panic!("This shouldn't happen?"),
};
Action::UpdateLeft(title, labels, items, select_num)
}
@@ -691,7 +770,7 @@ fn build_right_items(app: &App, cur_mode: Mode) -> Action {
let disk_list = app.clone.disk_list.lock().unwrap();
disk_list
.iter()
- .for_each(|disk| items.push(get_disk_description_right(&disk)));
+ .for_each(|disk| items.push(get_disk_description_right(&disk, None)));
}
Mode::SelectParts => {
vec!["Boot", "OS"].iter().for_each(|s| {
@@ -705,7 +784,7 @@ fn build_right_items(app: &App, cur_mode: Mode) -> Action {
let disk_list = app.clone.disk_list.lock().unwrap();
if let Some(disk) = disk_list.get(index) {
// Disk Details
- items.push(get_disk_description_right(&disk));
+ items.push(get_disk_description_right(&disk, None));
// Partition Details
disk.parts
@@ -718,19 +797,3 @@ fn build_right_items(app: &App, cur_mode: Mode) -> Action {
}
Action::UpdateRight(labels, start_index, items)
}
-
-fn fortune() -> String {
- String::from(match random::() / 4 {
- 0 => "FUN FACT\n\n\nComputers barely work.",
- 1 => "CRASH OVERRIDE\n\n\n\"Hack the planet!\"",
- 2 => "CATS\n\n\n\"All your base are belong to us!\"",
- 3 => "HMM\n\n\nThis has all happened before...\n\nThis will all happen again.",
- 4 => "CYPHER\n\n\n\"I don’t even see the code. All I see is blonde, brunette, red-head.\"",
- 5 => "CONGRATULATIONS\n\n\nYour did it!",
- 6 => "DID YOU KNOW?\n\n\nmacOS includes a built-in screen reader!",
- 7 => "TIP OF THE DAY\n\n\nNever go full Snappy!",
- 8 => "WORDS OF WISDOM\n\n\n\nIt’s not DNS,\n\nThere’s no way it’s DNS,\n\nIt was DNS.",
- 9 => "HAL 9000\n\n\n\"I'm sorry Dave, I'm afraid I can't do that.\"",
- _ => "COMPLETE\n\n\nThank you for using this tool!",
- })
-}
diff --git a/deja_vu/src/main.rs b/deja_vu/src/main.rs
index 8bcfda9..39999d2 100644
--- a/deja_vu/src/main.rs
+++ b/deja_vu/src/main.rs
@@ -1,17 +1,17 @@
-// This file is part of Deja-vu.
+// This file is part of Deja-Vu.
//
-// Deja-vu is free software: you can redistribute it and/or modify it
+// Deja-Vu is free software: you can redistribute it and/or modify it
// under the terms of the GNU General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version.
//
-// Deja-vu is distributed in the hope that it will be useful, but
+// Deja-Vu is distributed in the hope that it will be useful, but
// WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
// See the GNU General Public License for more details.
//
// You should have received a copy of the GNU General Public License
-// along with Deja-vu. If not, see .
+// along with Deja-Vu. If not, see .
//
use clap::Parser;
use color_eyre::Result;
@@ -23,11 +23,25 @@ mod app;
#[tokio::main]
async fn main() -> Result<()> {
- core::errors::init()?;
- core::logging::init()?;
+ let mut msg = None;
+ if cfg!(windows) {
+ use check_elevation::is_elevated;
+ if !is_elevated().expect("Failed to get elevation status.") {
+ msg.replace("Administrator privedges required for Deja-Vu.");
+ }
+ };
+ match msg {
+ Some(text) => {
+ println!("{text}");
+ }
+ None => {
+ core::errors::init()?;
+ core::logging::init()?;
- let args = core::cli::Cli::parse();
- let mut app = App::new(args.tick_rate, args.frame_rate)?;
- app.run().await?;
+ let args = core::cli::Cli::parse();
+ let mut app = App::new(args.tick_rate, args.frame_rate)?;
+ app.run().await?;
+ }
+ }
Ok(())
}
diff --git a/include/menu_entries/01_deja-vu.toml b/include/menu_entries/10_deja-vu.toml
similarity index 100%
rename from include/menu_entries/01_deja-vu.toml
rename to include/menu_entries/10_deja-vu.toml
diff --git a/include/menu_entries/11_boot-diags.toml b/include/menu_entries/11_boot-diags.toml
new file mode 100644
index 0000000..1f30f6f
--- /dev/null
+++ b/include/menu_entries/11_boot-diags.toml
@@ -0,0 +1,5 @@
+name = 'Boot-Diagnostics'
+command = 'X:\tools\boot-diags.exe'
+description = "Boot issue assessment tool"
+use_conemu = true
+separator = false
diff --git a/include/menu_entries/02_separator.toml b/include/menu_entries/20_separator.toml
similarity index 100%
rename from include/menu_entries/02_separator.toml
rename to include/menu_entries/20_separator.toml
diff --git a/include/menu_entries/03_ntpwedit.toml b/include/menu_entries/30_ntpwedit.toml
similarity index 100%
rename from include/menu_entries/03_ntpwedit.toml
rename to include/menu_entries/30_ntpwedit.toml
diff --git a/include/menu_entries/04_clone-tool.toml b/include/menu_entries/31_clone-tool.toml
similarity index 100%
rename from include/menu_entries/04_clone-tool.toml
rename to include/menu_entries/31_clone-tool.toml
diff --git a/include/menu_entries/05_taskmgr.toml b/include/menu_entries/32_taskmgr.toml
similarity index 100%
rename from include/menu_entries/05_taskmgr.toml
rename to include/menu_entries/32_taskmgr.toml
diff --git a/pe_menu/Cargo.toml b/pe_menu/Cargo.toml
index cf7bcfb..a3f1a55 100644
--- a/pe_menu/Cargo.toml
+++ b/pe_menu/Cargo.toml
@@ -1,17 +1,17 @@
-# This file is part of Deja-vu.
+# This file is part of Deja-Vu.
#
-# Deja-vu is free software: you can redistribute it and/or modify it
+# Deja-Vu is free software: you can redistribute it and/or modify it
# under the terms of the GNU General Public License as published by
# the Free Software Foundation, either version 3 of the License, or
# (at your option) any later version.
#
-# Deja-vu is distributed in the hope that it will be useful, but
+# Deja-Vu is distributed in the hope that it will be useful, but
# WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
# See the GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with Deja-vu. If not, see .
+# along with Deja-Vu. If not, see .
[package]
name = "pe-menu"
diff --git a/pe_menu/build.rs b/pe_menu/build.rs
index c3ced6b..8988d39 100644
--- a/pe_menu/build.rs
+++ b/pe_menu/build.rs
@@ -1,17 +1,17 @@
-// This file is part of Deja-vu.
+// This file is part of Deja-Vu.
//
-// Deja-vu is free software: you can redistribute it and/or modify it
+// Deja-Vu is free software: you can redistribute it and/or modify it
// under the terms of the GNU General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version.
//
-// Deja-vu is distributed in the hope that it will be useful, but
+// Deja-Vu is distributed in the hope that it will be useful, but
// WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
// See the GNU General Public License for more details.
//
// You should have received a copy of the GNU General Public License
-// along with Deja-vu. If not, see .
+// along with Deja-Vu. If not, see .
//
use anyhow::Result;
use vergen_gix::{BuildBuilder, CargoBuilder, Emitter, GixBuilder};
diff --git a/pe_menu/src/app.rs b/pe_menu/src/app.rs
index 5f9c060..b817f2f 100644
--- a/pe_menu/src/app.rs
+++ b/pe_menu/src/app.rs
@@ -1,17 +1,17 @@
-// This file is part of Deja-vu.
+// This file is part of Deja-Vu.
//
-// Deja-vu is free software: you can redistribute it and/or modify it
+// Deja-Vu is free software: you can redistribute it and/or modify it
// under the terms of the GNU General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version.
//
-// Deja-vu is distributed in the hope that it will be useful, but
+// Deja-Vu is distributed in the hope that it will be useful, but
// WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
// See the GNU General Public License for more details.
//
// You should have received a copy of the GNU General Public License
-// along with Deja-vu. If not, see .
+// along with Deja-Vu. If not, see .
//
use core::{
action::Action,
@@ -22,7 +22,7 @@ use core::{
config::Config,
line::DVLine,
state::Mode,
- tasks::{Task, Tasks},
+ tasks::{TaskType, Tasks},
tui::{Event, Tui},
};
use std::{
@@ -230,25 +230,55 @@ impl App {
// Run selected tool
if let Some(tool) = self.list.get_selected() {
info!("Run tool: {:?}", &tool);
- self.tasks.add(build_command(&self, &tool));
+ self.tasks.add(build_tool_command(&self, &tool));
}
}
Action::Resize(w, h) => self.handle_resize(tui, w, h)?,
Action::Render => self.render(tui)?,
Action::SetMode(mode) => {
self.mode = mode;
- self.action_tx
- .send(Action::UpdateFooter(String::from("(Enter) to select")))?;
+ self.action_tx.send(Action::UpdateFooter(String::from(
+ "(Enter) to select / (t) for terminal / (p) to power off / (r) to restart",
+ )))?;
self.action_tx.send(build_left_items(self))?;
self.action_tx.send(build_right_items(self))?;
self.action_tx.send(Action::Select(None, None))?;
}
Action::OpenTerminal => {
- self.tasks.add(Task::Command(
+ self.tasks.add(TaskType::CommandNoWait(
PathBuf::from("cmd.exe"),
vec![String::from("-new_console:n")],
));
}
+ Action::Restart => {
+ self.action_tx.send(Action::DisplayPopup(
+ popup::Type::Info,
+ String::from("Restarting..."),
+ ))?;
+ self.tasks.add(TaskType::CommandWait(
+ PathBuf::from("X:/Windows/System32/sync64.exe"),
+ vec![String::from("-r")],
+ ));
+ self.tasks.add(TaskType::CommandWait(
+ PathBuf::from("X:/Windows/System32/wpeutil.exe"),
+ vec![String::from("reboot")],
+ ));
+ }
+ Action::Shutdown => {
+ // NOTE: Using 'Powering off' to match the key pressed
+ self.action_tx.send(Action::DisplayPopup(
+ popup::Type::Info,
+ String::from("Powering off..."),
+ ))?;
+ self.tasks.add(TaskType::CommandWait(
+ PathBuf::from("X:/Windows/System32/sync64.exe"),
+ vec![String::from("-r")],
+ ));
+ self.tasks.add(TaskType::CommandWait(
+ PathBuf::from("X:/Windows/System32/wpeutil.exe"),
+ vec![String::from("shutdown")],
+ ));
+ }
_ => {}
}
for component in &mut self.components {
@@ -341,14 +371,15 @@ fn get_chunks(r: Rect) -> Vec {
chunks
}
-pub fn build_command(app: &App, tool: &Tool) -> Task {
+pub fn build_tool_command(app: &App, tool: &Tool) -> TaskType {
let cmd_path: PathBuf;
let mut cmd_args: Vec = Vec::new();
let start_index: usize;
if tool.use_conemu {
cmd_path = app.config.conemu_path.clone();
- cmd_args.push(String::from("-new_console:n"));
+ cmd_args.push(String::from("-run"));
cmd_args.push(tool.command.clone());
+ cmd_args.push(String::from("-new_console:n"));
start_index = 1;
} else {
cmd_path = PathBuf::from(tool.command.clone());
@@ -361,7 +392,7 @@ pub fn build_command(app: &App, tool: &Tool) -> Task {
});
}
}
- Task::Command(cmd_path, cmd_args)
+ TaskType::CommandNoWait(cmd_path, cmd_args)
}
fn build_left_items(app: &App) -> Action {
diff --git a/pe_menu/src/main.rs b/pe_menu/src/main.rs
index 8bcfda9..82b0996 100644
--- a/pe_menu/src/main.rs
+++ b/pe_menu/src/main.rs
@@ -1,17 +1,17 @@
-// This file is part of Deja-vu.
+// This file is part of Deja-Vu.
//
-// Deja-vu is free software: you can redistribute it and/or modify it
+// Deja-Vu is free software: you can redistribute it and/or modify it
// under the terms of the GNU General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version.
//
-// Deja-vu is distributed in the hope that it will be useful, but
+// Deja-Vu is distributed in the hope that it will be useful, but
// WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
// See the GNU General Public License for more details.
//
// You should have received a copy of the GNU General Public License
-// along with Deja-vu. If not, see .
+// along with Deja-Vu. If not, see .
//
use clap::Parser;
use color_eyre::Result;