Skip to content

fix: Exit non-zero if killed #4

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
DeflateAwning wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix: Exit non-zero if killed #4

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 17 additions & 7 deletions src/main.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -160,7 +160,7 @@ fn main() -> io::Result<()> {

let mut stdout = stdout();

if eff.inline {
let finished = if eff.inline {
if has_explicit_duration {
stdout.execute(Print("\r\n"))?;
}
Expand All @@ -174,7 +174,7 @@ fn main() -> io::Result<()> {
&audio_path,
&url,
eff.silent,
)?;
)?
} else {
run_fullscreen_timer(
&mut stdout,
Expand All @@ -185,7 +185,11 @@ fn main() -> io::Result<()> {
&audio_path,
&url,
eff.silent,
)?;
)?
};

if !finished {
std::process::exit(render::QUIT_EXIT_CODE);
}

Ok(())
Expand All @@ -210,7 +214,7 @@ fn run_fullscreen_timer(
audio_path: &Option<PathBuf>,
url: &Option<String>,
silent: bool,
) -> io::Result<()> {
) -> io::Result<bool> {
terminal::enable_raw_mode()?;
stdout.execute(cursor::Hide)?;
stdout.execute(Clear(ClearType::All))?;
Expand All @@ -233,6 +237,9 @@ fn run_fullscreen_timer(
thread::sleep(Duration::from_millis(50));
}

// Capture completion status before audio playback can flip `running`.
let finished = running.load(Ordering::Relaxed) && Instant::now() >= end;

let (_, rows) = size()?;
let center_row = rows / 2;

Expand All @@ -253,7 +260,7 @@ fn run_fullscreen_timer(
stdout.execute(Print("\n"))?;
terminal::disable_raw_mode()?;

Ok(())
Ok(finished)
}

fn run_inline_timer(
Expand All @@ -265,7 +272,7 @@ fn run_inline_timer(
audio_path: &Option<PathBuf>,
url: &Option<String>,
silent: bool,
) -> io::Result<()> {
) -> io::Result<bool> {
terminal::enable_raw_mode()?;
stdout.execute(cursor::Hide)?;

Expand All @@ -290,6 +297,9 @@ fn run_inline_timer(
thread::sleep(Duration::from_millis(50));
}

// Capture completion status before audio playback can flip `running`.
let finished = running.load(Ordering::Relaxed) && Instant::now() >= end;

handle_finish(
stdout,
running,
Expand All @@ -306,7 +316,7 @@ fn run_inline_timer(
stdout.execute(cursor::Show)?;
terminal::disable_raw_mode()?;

Ok(())
Ok(finished)
}

fn handle_finish<F, G>(
Expand Down
11 changes: 7 additions & 4 deletions src/render.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,9 @@ use std::{
time::{Duration, Instant},
};

/// Exit code used when the user cancels via Ctrl+C or Esc (128 + SIGINT).
pub const QUIT_EXIT_CODE: i32 = 130;

/// Returns true if the event is Ctrl+C or Esc.
pub fn is_quit_event(key: &event::KeyEvent) -> bool {
key.code == KeyCode::Esc
Expand All @@ -23,7 +26,7 @@ fn cleanup_and_exit(stdout: &mut io::Stdout) -> ! {
let _ = stdout.execute(cursor::MoveTo(0, 0));
let _ = stdout.execute(cursor::Show);
let _ = terminal::disable_raw_mode();
std::process::exit(0);
std::process::exit(QUIT_EXIT_CODE);
}

/// Print a message centered horizontally at the given row.
Expand Down Expand Up @@ -182,7 +185,7 @@ pub fn inline_interactive_prompt(
.flush()?;
stdout.execute(cursor::Show)?;
terminal::disable_raw_mode()?;
std::process::exit(0);
std::process::exit(QUIT_EXIT_CODE);
}
match key_event.code {
KeyCode::Char(c) if c.is_ascii_digit() && cursor_pos < 6 => {
Expand Down Expand Up @@ -375,7 +378,7 @@ fn inline_prompt_audio_path(stdout: &mut io::Stdout, row: u16) -> io::Result<Opt
.flush()?;
stdout.execute(cursor::Show)?;
terminal::disable_raw_mode()?;
std::process::exit(0);
std::process::exit(QUIT_EXIT_CODE);
}
match key_event.code {
KeyCode::Enter => {
Expand Down Expand Up @@ -855,7 +858,7 @@ fn inline_prompt_url(stdout: &mut io::Stdout, row: u16) -> io::Result<Option<Str
.flush()?;
stdout.execute(cursor::Show)?;
terminal::disable_raw_mode()?;
std::process::exit(0);
std::process::exit(QUIT_EXIT_CODE);
}
match key_event.code {
KeyCode::Enter => {
Expand Down