refactor: move terminal guard to own file

src/main.rs

@@ -1,17 +1,18 @@
-use std::io::{self, Read, Stdout};
+use std::io::{self, Read};
 use std::time::Duration;
 
 use crossterm::event::{self, Event, KeyCode};
 use crossterm::execute;
-use crossterm::terminal::{
+use crossterm::terminal::{EnterAlternateScreen, enable_raw_mode};
-    EnterAlternateScreen, LeaveAlternateScreen, disable_raw_mode, enable_raw_mode,
-};
 use ratatui::Terminal;
 use ratatui::backend::CrosstermBackend;
 use ratatui::layout::{Constraint, Direction, Layout};
 use ratatui::style::Style;
 use ratatui::widgets::{Block, Borders, List, ListItem, ListState};
 
+mod terminal_guard;
+use terminal_guard::TerminalModeGuard;
+
 fn main() -> Result<(), Box<dyn std::error::Error>> {
     let mut input = String::new();
     io::stdin().read_to_string(&mut input)?;
@@ -27,6 +28,9 @@ fn main() -> Result<(), Box<dyn std::error::Error>> {
     enable_raw_mode()?;
     let mut stdout = std::io::stdout();
     execute!(stdout, EnterAlternateScreen)?;
+
+    let mut _mode_guard = TerminalModeGuard::new();
+
     let backend = CrosstermBackend::new(stdout);
     let mut terminal = Terminal::new(backend)?;
 
@@ -47,8 +51,8 @@ fn main() -> Result<(), Box<dyn std::error::Error>> {
                 .iter()
                 .enumerate()
                 .map(|(i, l)| {
-                    let prefix = if marked[i] { "[x]" } else { "[ ]" };
+                    let prefix = if marked[i] { 'x' } else { ' ' };
-                    ListItem::new(format!("{} {}", prefix, l))
+                    ListItem::new(format!("[{prefix}] {l}"))
                 })
                 .collect();
 
@@ -63,11 +67,9 @@ fn main() -> Result<(), Box<dyn std::error::Error>> {
             f.render_stateful_widget(list, chunks[0], &mut state);
         })?;
 
-        // Event handling
         if event::poll(Duration::from_millis(100))? {
             match event::read()? {
-                Event::Key(key) => {
+                Event::Key(key) => match key.code {
-                    match key.code {
                     KeyCode::Char('q') => break,
                     KeyCode::Up => {
                         if let Some(i) = state.selected()
@@ -88,24 +90,18 @@ fn main() -> Result<(), Box<dyn std::error::Error>> {
                             && i < marked.len()
                         {
                             assert!(i < marked.len());
-                                if marked[i] {
+                            if !marked[i] {
-                                    marked[i] = false;
-                                } else {
-                                    marked[i] = true;
-                                    // move cursor down
                                 let next = lines.len().min(i + 1);
                                 state.select(Some(next));
                             }
+                            marked[i] = !marked[i];
                         }
                     }
-                        KeyCode::Char('c')
+                    KeyCode::Char('c') if key.modifiers.contains(event::KeyModifiers::CONTROL) => {
-                            if key.modifiers.contains(event::KeyModifiers::CONTROL) =>
-                        {
                         break;
                     }
                     _ => {}
-                    }
+                },
-                }
                 Event::Mouse(s) => {
                     if let event::MouseEventKind::Down(event::MouseButton::Left) = s.kind {
                         let area = terminal.size()?;
@@ -122,9 +118,7 @@ fn main() -> Result<(), Box<dyn std::error::Error>> {
         }
     }
 
-    disable_raw_mode()?;
+    _mode_guard.cleanup();
-    let mut stdout: Stdout = std::io::stdout();
-    execute!(stdout, LeaveAlternateScreen)?;
     terminal.show_cursor()?;
 
     Ok(())

src/terminal_guard.rs

@@ -0,0 +1,29 @@
+use crossterm::cursor::Show;
+use crossterm::execute;
+use crossterm::terminal::{LeaveAlternateScreen, disable_raw_mode};
+
+pub struct TerminalModeGuard {
+    active: bool,
+}
+
+impl TerminalModeGuard {
+    pub fn new() -> Self {
+        Self { active: true }
+    }
+
+    pub fn cleanup(&mut self) {
+        if !self.active {
+            return;
+        }
+        let _ = disable_raw_mode();
+        let mut stdout = std::io::stdout();
+        let _ = execute!(stdout, LeaveAlternateScreen, Show);
+        self.active = false;
+    }
+}
+
+impl Drop for TerminalModeGuard {
+    fn drop(&mut self) {
+        self.cleanup();
+    }
+}