Compare commits
3 commits
1d0b692028
...
46e53ef105
| Author | SHA1 | Date | |
|---|---|---|---|
| 46e53ef105 | |||
| 3340114522 | |||
| 3fafcc4292 |
5 changed files with 54 additions and 4 deletions
|
|
@ -630,7 +630,6 @@ impl App {
|
|||
"Program Files",
|
||||
"Program Files (x86)",
|
||||
"ProgramData",
|
||||
"Haha.....no",
|
||||
"Windows\\System32\\config",
|
||||
]
|
||||
.iter()
|
||||
|
|
|
|||
|
|
@ -27,7 +27,10 @@ use core::{
|
|||
config::Config,
|
||||
state::Mode,
|
||||
};
|
||||
use std::sync::{Arc, Mutex};
|
||||
use std::{
|
||||
cmp::min,
|
||||
sync::{Arc, Mutex},
|
||||
};
|
||||
|
||||
use crate::diags::DiagGroup;
|
||||
|
||||
|
|
@ -75,11 +78,51 @@ impl Component for LogView {
|
|||
}
|
||||
Action::KeyDown => {
|
||||
if self.mode == Mode::LogView {
|
||||
self.line_index = self.line_index + 1;
|
||||
let new_index = self.line_index + 1;
|
||||
if let Some(log_text) = self.list.get_selected() {
|
||||
let lines: Vec<&str> = log_text.split('\n').collect();
|
||||
if new_index as usize > lines.len() {
|
||||
self.line_index = lines.len() as u16;
|
||||
} else {
|
||||
self.line_index = new_index;
|
||||
}
|
||||
}
|
||||
} else {
|
||||
self.list.next();
|
||||
}
|
||||
}
|
||||
Action::KeyPageUp => {
|
||||
if self.mode == Mode::LogView {
|
||||
if self.line_index > 10 {
|
||||
self.line_index -= 10;
|
||||
} else {
|
||||
self.line_index = 0;
|
||||
}
|
||||
}
|
||||
}
|
||||
Action::KeyPageDown => {
|
||||
if self.mode == Mode::LogView {
|
||||
let new_index = self.line_index + 10;
|
||||
if let Some(log_text) = self.list.get_selected() {
|
||||
let lines: Vec<&str> = log_text.split('\n').collect();
|
||||
let new_index: u16 = min((lines.len() - 3) as u16, new_index);
|
||||
self.line_index = new_index;
|
||||
}
|
||||
}
|
||||
}
|
||||
Action::KeyHome => {
|
||||
if self.mode == Mode::LogView {
|
||||
self.line_index = 0;
|
||||
}
|
||||
}
|
||||
Action::KeyEnd => {
|
||||
if self.mode == Mode::LogView {
|
||||
if let Some(log_text) = self.list.get_selected() {
|
||||
let lines: Vec<&str> = log_text.split('\n').collect();
|
||||
self.line_index = (lines.len() - 3) as u16;
|
||||
}
|
||||
}
|
||||
}
|
||||
Action::Process => {
|
||||
if self.mode == Mode::LogView {
|
||||
if let Some(command_tx) = self.command_tx.clone() {
|
||||
|
|
|
|||
|
|
@ -356,7 +356,7 @@ pub fn parse_dism(diag_group: &mut DiagGroup, task_result: TaskResult) {
|
|||
format!("{stdout}\n\n-------\n\n{stderr}")
|
||||
};
|
||||
|
||||
if output_text.contains("no component store corruption detected") {
|
||||
if output_text.contains("No component store corruption detected") {
|
||||
diag_group.passed.push(true);
|
||||
diag_group.result = String::from("OK");
|
||||
diag_group.logs.push(Log {
|
||||
|
|
|
|||
|
|
@ -137,6 +137,10 @@
|
|||
"<Esc>": "Process",
|
||||
"<Up>": "KeyUp",
|
||||
"<Down>": "KeyDown",
|
||||
"<PageUp>": "KeyPageUp",
|
||||
"<PageDown>": "KeyPageDown",
|
||||
"<Home>": "KeyHome",
|
||||
"<End>": "KeyEnd",
|
||||
"<q>": "Quit",
|
||||
"<Ctrl-d>": "Quit",
|
||||
"<Ctrl-c>": "Quit",
|
||||
|
|
|
|||
|
|
@ -69,6 +69,10 @@ pub enum Action {
|
|||
KeyUp,
|
||||
KeyLeft,
|
||||
KeyRight,
|
||||
KeyPageUp,
|
||||
KeyPageDown,
|
||||
KeyHome,
|
||||
KeyEnd,
|
||||
Quit,
|
||||
Render,
|
||||
Resize(u16, u16),
|
||||
|
|
|
|||
Loading…
Reference in a new issue