Terminal interface to find, download, and stream movies, TV shows, and live TV using local media players.
fix(tui): harden download organization, signal handling, and terminal lifecycle
Samir Hossainsdbe493773c10
diff --git a/Cargo.lock b/Cargo.lockindex 665028c..64c8bc7 100644--- a/Cargo.lock+++ b/Cargo.lock@@ -3189,6 +3189,7 @@ dependencies = ["libc","mio","pin-project-lite",+ "signal-hook-registry","socket2","tokio-macros","windows-sys 0.61.2",diff --git a/Cargo.toml b/Cargo.tomlindex 1cc445e..ffc0cab 100644--- a/Cargo.toml+++ b/Cargo.toml@@ -37,7 +37,7 @@ semver = "1.0.28"serde = { version = "1.0.228", features = ["derive"] }serde_json = "1.0.150"thiserror = "2.0.18"-tokio = { version = "1.52.3", features = ["rt-multi-thread", "macros", "sync", "time", "fs", "io-util"] }+tokio = { version = "1.52.3", features = ["rt-multi-thread", "macros", "sync", "time", "fs", "io-util", "signal"] }url = "2.5.8"unicode-segmentation = "1.12.0"unicode-width = "0.2.0"diff --git a/docs/downloads.md b/docs/downloads.mdindex 019d4d6..23a1a76 100644--- a/docs/downloads.md+++ b/docs/downloads.md@@ -22,6 +22,8 @@ and optional segmentation. Orchestration lives in `app/download.rs`.characters are replaced, Windows reserved names (`CON`, `COM1`-`COM9`, …) are avoided,and length is capped.+- **Series downloads:** Saved under `<base_dir>/Series/<Title>/Season <N>/<Title>_S<N:02>E<E:02>.<ext>` (and subtitle `<Title>_S<N:02>E<E:02>.<sub_ext>`).+- **Movie downloads:** Saved under `<base_dir>/Movies/<Title>/<Title>.<ext>` (and subtitle `<Title>.<sub_ext>`).- **Default path:** Files go to the user's OS download directory (`~/Downloads/MovieBox-TUI`). On Android-family environments the code prefers shared `storage/downloads` when present.- **Custom path:** Users can set a custom download directory using `/download-dir <path>` or revert with `/download-dir reset`. Target directories are validated with active write probes before saving, and the engine automatically falls back to default if custom storage becomes unavailable at runtime.diff --git a/src/logging.rs b/src/logging.rsindex e2d3a70..f028b42 100644--- a/src/logging.rs+++ b/src/logging.rs@@ -46,11 +46,6 @@ pub fn init() {std::env::consts::OS,display_path());- eprintln!(- "[moviebox-tui] logging to {} (MOVIEBOX_LOG={})",- display_path(),- spec- );}pub fn log_file_path() -> std::path::PathBuf {diff --git a/src/main.rs b/src/main.rsindex 5c27946..840772c 100644--- a/src/main.rs+++ b/src/main.rs@@ -29,7 +29,9 @@ fn purge_stale_subtitles() {}for dir in dirs {- if let Ok(entries) = std::fs::read_dir(dir) {+ if dir.exists()+ && let Ok(entries) = std::fs::read_dir(&dir)+ {for entry in entries.flatten() {if let Ok(metadata) = entry.metadata()&& let Ok(modified) = metadata.modified()@@ -53,6 +55,23 @@ impl Drop for TerminalGuard {#[tokio::main]async fn main() -> std::io::Result<()> {let args: Vec<String> = std::env::args().collect();+ if args.iter().any(|arg| arg == "--help" || arg == "-h") {+ println!("moviebox-tui {}", env!("CARGO_PKG_VERSION"));+ println!("A terminal client for finding and streaming movies, TV shows, and anime.\n");+ println!("USAGE:");+ println!(" moviebox-tui [OPTIONS]\n");+ println!("OPTIONS:");+ println!(" -h, --help Print help information");+ println!(" -v, -V, --version Print version information\n");+ println!("ENVIRONMENT VARIABLES:");+ println!(" MOVIEBOX_LOG Log level (info, warn, error, debug, trace)");+ println!(" MOVIEBOX_THEME Theme name (e.g. catppuccin, dracula, nord, etc.)");+ println!(" MOVIEBOX_PLAYER Preferred player (mpv, iina, vlc, android)");+ println!(" MOVIEBOX_MPV_PATH Custom mpv binary path");+ println!(" MOVIEBOX_VLC_PATH Custom vlc binary path");+ println!(" MOVIEBOX_IINA_PATH Custom iina-cli binary path");+ return Ok(());+ }if args.iter().any(|arg| arg == "--version" || arg == "-v" || arg == "-V")diff --git a/src/providers/fourkhdhub/parser.rs b/src/providers/fourkhdhub/parser.rsindex 02d2cb4..50ea964 100644--- a/src/providers/fourkhdhub/parser.rs+++ b/src/providers/fourkhdhub/parser.rs@@ -514,14 +514,16 @@ fn detect_language(value: &str) -> Option<String> {let actual_pos = search_idx + pos;let end_pos = actual_pos + pattern.len();- let prev_ok = actual_pos == 0 || {- let prev_char = lower[..actual_pos].chars().last().unwrap();- !prev_char.is_alphabetic()- };- let next_ok = end_pos >= lower.len() || {- let next_char = lower[end_pos..].chars().next().unwrap();- !next_char.is_alphabetic()- };+ let prev_ok = actual_pos == 0+ || lower+ .get(..actual_pos)+ .and_then(|s| s.chars().last())+ .is_none_or(|c| !c.is_alphabetic());+ let next_ok = end_pos >= lower.len()+ || lower+ .get(end_pos..)+ .and_then(|s| s.chars().next())+ .is_none_or(|c| !c.is_alphabetic());if prev_ok && next_ok {if !found_langs.iter().any(|(_, name)| *name == *lang_name) {diff --git a/src/tui/app/download.rs b/src/tui/app/download.rsindex bcb27b6..df4f862 100644--- a/src/tui/app/download.rs+++ b/src/tui/app/download.rs@@ -5,10 +5,26 @@ use crate::tui::{action::Action, overlay::NotificationKind, state::Screen};impl App {pub(super) fn resolve_download_base_dir(&self) -> std::path::PathBuf {if let Some(ref custom_dir) = self.state.download_dir {+ static LAST_PROBE: std::sync::Mutex<Option<(std::path::PathBuf, std::time::Instant)>> =+ std::sync::Mutex::new(None);+ let mut cached_ok = false;+ if let Ok(guard) = LAST_PROBE.lock() {+ if let Some((ref path, time)) = *guard {+ if path == custom_dir && time.elapsed().as_secs() < 60 {+ cached_ok = true;+ }+ }+ }+ if cached_ok {+ return custom_dir.clone();+ }if std::fs::create_dir_all(custom_dir).is_ok() {let probe = custom_dir.join(format!(".mb_probe_{}", std::process::id()));if std::fs::write(&probe, b"ok").is_ok() {let _ = std::fs::remove_file(&probe);+ if let Ok(mut guard) = LAST_PROBE.lock() {+ *guard = Some((custom_dir.clone(), std::time::Instant::now()));+ }return custom_dir.clone();}}@@ -66,15 +82,15 @@ impl App {.and_then(|details| details.get("title")).and_then(|title| title.as_str()).unwrap_or("MovieBox-Tui_Stream");- let media_type = self+ let is_series = self.state.selected_details.as_ref()- .and_then(|details| details.get("type"))- .and_then(|t| t.as_i64())- .unwrap_or(1);- let season = self.state.selected_season.saturating_add(1);- let episode = self.state.selected_episode.saturating_add(1);+ .map(crate::tui::state::stype)+ .is_some_and(|s| s == 2)+ || !self.state.available_seasons.is_empty();+ let season = self.state.selected_season;+ let episode = self.state.selected_episode;let safe_title = title.chars().map(|c| {@@ -94,13 +110,13 @@ impl App {.and_then(|path| path.rsplit('.').next()).filter(|ext| {let lower = ext.to_ascii_lowercase();- lower == "mp4" || lower == "mkv" || lower == "webm" || lower == "ts"+ matches!(lower.as_str(), "mp4" | "mkv" | "webm" | "ts")}).unwrap_or("mp4").to_ascii_lowercase();let base_dir = self.resolve_download_base_dir();- let (target_dir, base_name) = if media_type == 2 {+ let (target_dir, base_name) = if is_series {(base_dir.join("Series")@@ -109,7 +125,10 @@ impl App {format!("{safe_title}_S{season:02}E{episode:02}"),)} else {- (base_dir.join("Movies"), safe_title)+ (+ base_dir.join("Movies").join(&safe_title),+ safe_title.clone(),+ )};let mut destination = target_dir.join(format!("{base_name}.{extension}"));let mut counter = 2;diff --git a/src/tui/app/keyboard.rs b/src/tui/app/keyboard.rsindex f7ddb8a..971c5c2 100644--- a/src/tui/app/keyboard.rs+++ b/src/tui/app/keyboard.rs@@ -10,6 +10,10 @@ impl App {use crossterm::event::{KeyCode, KeyModifiers};if key.modifiers.contains(KeyModifiers::CONTROL) {+ if let KeyCode::Char('c') = key.code {+ self.action_sender.send(Action::Quit).ok();+ return None;+ }if let KeyCode::Char('t') = key.code {self.action_sender.send(Action::ToggleTvMode).ok();return None;diff --git a/src/tui/app/run.rs b/src/tui/app/run.rsindex 1011406..026f874 100644--- a/src/tui/app/run.rs+++ b/src/tui/app/run.rs@@ -13,8 +13,12 @@ impl App {std::io::Error: From<<B as ratatui::backend::Backend>::Error>,{if self.state.image_picker.is_none() && self.state.image_supported {- let picker = ratatui_image::picker::Picker::from_query_stdio()- .unwrap_or_else(|_| ratatui_image::picker::Picker::halfblocks());+ let picker = if crate::tui::terminal::should_query_images() {+ ratatui_image::picker::Picker::from_query_stdio()+ .unwrap_or_else(|_| ratatui_image::picker::Picker::halfblocks())+ } else {+ ratatui_image::picker::Picker::halfblocks()+ };let cell_h = picker.font_size().height;if cell_h > 0 {self.state.poster_rows = (96_u16.div_ceil(cell_h)).max(3);@@ -226,7 +230,8 @@ impl App {let area = frame.area();if let Some((_, w, h)) = self.state.last_resize_time {- let label = format!("{} × {}", w, h);+ let sep = if self.state.basic_terminal { "x" } else { "×" };+ let label = format!("{} {} {}", w, sep, h);let label_len = label.chars().count() as u16 + 4;let badge_w = label_len.min(area.width);let badge_h = 1_u16;diff --git a/src/tui/event.rs b/src/tui/event.rsindex eac6159..29e74bc 100644--- a/src/tui/event.rs+++ b/src/tui/event.rs@@ -12,9 +12,17 @@ impl EventHandler {let (sender, receiver) = mpsc::channel(128);let event_sender = sender.clone();- let mut tick_interval = tokio::time::interval(tick_rate);+ tokio::spawn({+ let signal_sender = sender.clone();+ async move {+ if tokio::signal::ctrl_c().await.is_ok() {+ let _ = signal_sender.send(Action::Quit).await;+ }+ }+ });tokio::spawn(async move {+ let mut tick_interval = tokio::time::interval(tick_rate);let mut reader = crossterm::event::EventStream::new();use futures::StreamExt;diff --git a/src/tui/state.rs b/src/tui/state.rsindex 428a79b..8f19f6a 100644--- a/src/tui/state.rs+++ b/src/tui/state.rs@@ -275,6 +275,13 @@ pub struct AppState {pub history: crate::history::HistoryManager,}+const fn non_zero(n: usize) -> std::num::NonZeroUsize {+ match std::num::NonZeroUsize::new(n) {+ Some(v) => v,+ None => panic!("non-zero constant required"),+ }+}+impl Default for AppState {fn default() -> Self {Self {@@ -292,9 +299,9 @@ impl Default for AppState {is_homepage_mode: false,current_tab_id: String::new(),current_page: 1,- search_posters: lru::LruCache::new(std::num::NonZeroUsize::new(300).unwrap()),- failed_posters: lru::LruCache::new(std::num::NonZeroUsize::new(300).unwrap()),- search_poster_protocols: lru::LruCache::new(std::num::NonZeroUsize::new(300).unwrap()),+ search_posters: lru::LruCache::new(non_zero(300)),+ failed_posters: lru::LruCache::new(non_zero(300)),+ search_poster_protocols: lru::LruCache::new(non_zero(300)),in_flight_posters: std::collections::HashSet::new(),search_list_state: TableState::default(),basic_terminal: crate::tui::terminal::uses_basic_ui(),@@ -310,7 +317,7 @@ impl Default for AppState {is_waiting_for_download_stream: false,is_fetching_streams: false,stream_error: None,- preview_cache: lru::LruCache::new(std::num::NonZeroUsize::new(30).unwrap()),+ preview_cache: lru::LruCache::new(non_zero(30)),resource_list_state: ListState::default(),details_pane: DetailsPane::default(),@@ -339,7 +346,7 @@ impl Default for AppState {image_supported: crate::tui::terminal::should_query_images(),clear_terminal_before_draw: false,poster_rows: 3,- image_cache: lru::LruCache::new(std::num::NonZeroUsize::new(10).unwrap()),+ image_cache: lru::LruCache::new(non_zero(10)),show_help: false,visible_items: 10,active_resource_request: 0,