Mirrors/mmtc
2
0
Fork 0
mirror of https://github.com/figsoda/mmtc synced 2024-11-22 15:13:03 +00:00
Code Issues Projects Releases Packages Wiki Activity

simplify cleanups

Browse source
This commit is contained in:
figsoda 2022-11-07 14:18:07 -05:00
parent 9ad8a7fa6e
commit dbd4a70e76
1 changed files with 28 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

42
src/main.rs
View file

@ -44,26 +44,39 @@ use crate::{
mpd::{Client, PlayerState},
};
fn cleanup() -> Result<()> {
fn cleanup() {
let mut stdout = stdout();
stdout
if let Err(e) = stdout
.execute(LeaveAlternateScreen)
.context("Failed to leave alternate screen")?;
stdout
.context("Failed to leave alternate screen")
{
eprintln!("{e:?}");
}
if let Err(e) = stdout
.execute(DisableMouseCapture)
.context("Failed to disable mouse capture")?;
disable_raw_mode().context("Failed to disable raw mode")?;
Ok(())
.context("Failed to disable mouse capture")
{
eprintln!("{e:?}");
}
if let Err(e) = disable_raw_mode().context("Failed to disable raw mode") {
eprintln!("{e:?}");
}
}
fn main() {
let res = block_on(run());
if let Err(e) = cleanup().and(res) {
eprintln!("{e:?}");
exit(1);
struct Cleanup;
impl Drop for Cleanup {
fn drop(&mut self) {
cleanup();
}
}
fn main() -> Result<()> {
block_on(run())
}
async fn run() -> Result<()> {
let opts = Opts::parse();
@ -100,7 +113,7 @@ async fn run() -> Result<()> {
for cmd in cmd {
cl.command_stdout(&cmd).await?;
}
exit(0); // skip cleanup
return Ok(());
}
let status = cl.status().await?;
@ -125,6 +138,7 @@ async fn run() -> Result<()> {
stdout
.execute(EnterAlternateScreen)
.context("Failed to enter alternate screen")?;
let __ = Cleanup;
let mut term =
Terminal::new(CrosstermBackend::new(stdout)).context("Failed to initialize terminal")?;
@ -169,7 +183,7 @@ async fn run() -> Result<()> {
Ok((false, true)) => 0b011,
Ok(_) => continue,
Err(e) => {
eprintln!("{:?}", cleanup().map_or_else(|x| x, |_| e));
eprintln!("{e:?}");
exit(1);
}
},