Jonathan McCumber
6c41e0704e
- Replace non-blocking try_recv() event loop with blocking recv() to eliminate idle spin; the sender tick timeout still drives minimum wakeup rate so the UI stays responsive - Lower default tick rate from 50 ms to 100 ms (10 ticks/sec vs 20); add MANAGARR_TICK_RATE_MS env var for runtime tuning - Move terminal draws to event boundaries (key + tick) instead of every loop pass, reducing unnecessary redraws - In network error handling, prefer concise JSON fields (message / errorMessage / error) over the raw HTTP body, so Radarr ASP.NET stack traces don't flood the TUI banner; full body still logged - Add unit tests for tick-rate parsing and Radarr-style JSON error body Observed: ~0.6% total CPU at idle vs measurably higher with prod defaults
99 lines
2.4 KiB
Rust
99 lines
2.4 KiB
Rust
use anyhow::Result;
|
|
use std::env;
|
|
use std::sync::mpsc;
|
|
use std::sync::mpsc::Receiver;
|
|
use std::thread;
|
|
use std::time::{Duration, Instant};
|
|
|
|
use crossterm::event;
|
|
use crossterm::event::{Event as CrosstermEvent, KeyEventKind};
|
|
|
|
use crate::event::Key;
|
|
|
|
pub enum InputEvent<T> {
|
|
KeyEvent(T),
|
|
Tick,
|
|
}
|
|
|
|
pub struct Events {
|
|
rx: Receiver<InputEvent<Key>>,
|
|
}
|
|
|
|
const DEFAULT_TICK_RATE_MS: u64 = 100;
|
|
|
|
fn configured_tick_rate_ms_from(raw: Option<&str>) -> u64 {
|
|
raw
|
|
.and_then(|value| value.parse::<u64>().ok())
|
|
.filter(|ms| *ms > 0)
|
|
.unwrap_or(DEFAULT_TICK_RATE_MS)
|
|
}
|
|
|
|
fn configured_tick_rate_ms() -> u64 {
|
|
let raw = env::var("MANAGARR_TICK_RATE_MS").ok();
|
|
configured_tick_rate_ms_from(raw.as_deref())
|
|
}
|
|
|
|
impl Events {
|
|
pub fn new() -> Self {
|
|
let (tx, rx) = mpsc::channel();
|
|
let tick_rate: Duration = Duration::from_millis(configured_tick_rate_ms());
|
|
|
|
thread::spawn(move || {
|
|
let mut last_tick = Instant::now();
|
|
loop {
|
|
let timeout = tick_rate
|
|
.checked_sub(last_tick.elapsed())
|
|
.unwrap_or_else(|| Duration::from_secs(0));
|
|
if event::poll(timeout).unwrap()
|
|
&& let CrosstermEvent::Key(key_event) = event::read().unwrap()
|
|
{
|
|
// Only process the key event if it's a press event
|
|
// Source: https://ratatui.rs/faq/ Why am I getting duplicate key events on Windows?
|
|
if key_event.kind == KeyEventKind::Press {
|
|
let key = Key::from(key_event);
|
|
tx.send(InputEvent::KeyEvent(key)).unwrap();
|
|
}
|
|
}
|
|
|
|
if last_tick.elapsed() >= tick_rate {
|
|
tx.send(InputEvent::Tick).unwrap();
|
|
last_tick = Instant::now();
|
|
}
|
|
}
|
|
});
|
|
|
|
Events { rx }
|
|
}
|
|
|
|
pub fn next(&self) -> Result<Option<InputEvent<Key>>> {
|
|
match self.rx.recv() {
|
|
Ok(event) => Ok(Some(event)),
|
|
_ => Ok(None),
|
|
}
|
|
}
|
|
}
|
|
|
|
#[cfg(test)]
|
|
mod tests {
|
|
use super::*;
|
|
|
|
#[test]
|
|
fn defaults_to_a_slower_idle_tick_rate() {
|
|
assert_eq!(DEFAULT_TICK_RATE_MS, 100);
|
|
assert_eq!(configured_tick_rate_ms_from(None), 100);
|
|
}
|
|
|
|
#[test]
|
|
fn parses_positive_tick_rates_and_rejects_invalid_values() {
|
|
assert_eq!(configured_tick_rate_ms_from(Some("250")), 250);
|
|
assert_eq!(
|
|
configured_tick_rate_ms_from(Some("0")),
|
|
DEFAULT_TICK_RATE_MS
|
|
);
|
|
assert_eq!(
|
|
configured_tick_rate_ms_from(Some("abc")),
|
|
DEFAULT_TICK_RATE_MS
|
|
);
|
|
}
|
|
}
|