feat: print summary and run post commands when (q)uit is used (#1254)
This commit is contained in:
@@ -201,10 +201,11 @@ impl Terminal {
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
#[allow(unused_variables)]
|
||||
fn should_retry(&mut self, interrupted: bool, step_name: &str) -> eyre::Result<bool> {
|
||||
fn should_retry(&mut self, step_name: &str) -> eyre::Result<ShouldRetry> {
|
||||
if self.width.is_none() {
|
||||
return Ok(false);
|
||||
return Ok(ShouldRetry::No);
|
||||
}
|
||||
|
||||
if self.set_title {
|
||||
@@ -223,7 +224,7 @@ impl Terminal {
|
||||
|
||||
let answer = loop {
|
||||
match self.term.read_key() {
|
||||
Ok(Key::Char('y' | 'Y')) => break Ok(true),
|
||||
Ok(Key::Char('y' | 'Y')) => break Ok(ShouldRetry::Yes),
|
||||
Ok(Key::Char('s' | 'S')) => {
|
||||
println!(
|
||||
"\n\n{}\n",
|
||||
@@ -232,16 +233,16 @@ impl Terminal {
|
||||
if let Err(err) = run_shell().context("Failed to run shell") {
|
||||
self.term.write_fmt(format_args!("{err:?}\n{prompt_inner}")).ok();
|
||||
} else {
|
||||
break Ok(true);
|
||||
break Ok(ShouldRetry::Yes);
|
||||
}
|
||||
}
|
||||
Ok(Key::Char('n' | 'N') | Key::Enter) => break Ok(false),
|
||||
Ok(Key::Char('n' | 'N') | Key::Enter) => break Ok(ShouldRetry::No),
|
||||
Err(e) => {
|
||||
error!("Error reading from terminal: {}", e);
|
||||
break Ok(false);
|
||||
break Ok(ShouldRetry::No);
|
||||
}
|
||||
Ok(Key::Char('q' | 'Q')) => {
|
||||
return Err(io::Error::from(io::ErrorKind::Interrupted)).context("Quit from user input")
|
||||
break Ok(ShouldRetry::Quit);
|
||||
}
|
||||
_ => (),
|
||||
}
|
||||
@@ -257,14 +258,21 @@ impl Terminal {
|
||||
}
|
||||
}
|
||||
|
||||
#[derive(Clone, Copy)]
|
||||
pub enum ShouldRetry {
|
||||
Yes,
|
||||
No,
|
||||
Quit,
|
||||
}
|
||||
|
||||
impl Default for Terminal {
|
||||
fn default() -> Self {
|
||||
Self::new()
|
||||
}
|
||||
}
|
||||
|
||||
pub fn should_retry(interrupted: bool, step_name: &str) -> eyre::Result<bool> {
|
||||
TERMINAL.lock().unwrap().should_retry(interrupted, step_name)
|
||||
pub fn should_retry(step_name: &str) -> eyre::Result<ShouldRetry> {
|
||||
TERMINAL.lock().unwrap().should_retry(step_name)
|
||||
}
|
||||
|
||||
pub fn print_separator<P: AsRef<str>>(message: P) {
|
||||
|
||||
Reference in New Issue
Block a user