Terminal interface to find, download, and stream movies, TV shows, and live TV using local media players.
refactor(player): centralize executable probing and cache resolution
Samir Hossains1669d986f0e2
diff --git a/CHANGELOG.md b/CHANGELOG.mdindex 668c744..45e877a 100644--- a/CHANGELOG.md+++ b/CHANGELOG.md@@ -18,6 +18,11 @@- Prevented raw Kitty APC escape sequence leak (`Gi=31...`) on macOS `Terminal.app` and legacy non-graphics consoles by skipping graphics stdio probes.- Removed unsafe mid-session stdio graphics re-probing on `FocusChange` events.+- **High-Performance Player Detection Engine (`src/player.rs`)**:+ - Centralized OS executable probing (`mpv`, `vlc`, `IINA`) into a single `probe_player_executable` engine, stripping ~150 lines of duplicate path traversal.+ - Added static caching (`OnceLock`) to `IINA` resolution and Android Termux Intent detection, eliminating repeated expensive filesystem IO and PATH lookups during playback launches.+ - Expanded candidate resolution: added macOS MacPorts (`/opt/local/bin/*`) and standard `/bin/*` locations.+ - Aligned installer (`install.sh`, `install.ps1`) player detection with the app engine, explicitly probing standard `/Applications/*.app` and `C:\Program Files` deployments so GUI installations are correctly discovered immediately post-install.- **Responsive Mobile Installer Headers (`install.sh` & `install.ps1`)**:- Implemented dynamic terminal column detection (`tput cols`, `stty size`, and `$COLUMNS` in `install.sh`; `$Host.UI.RawUI.WindowSize.Width` in `install.ps1`) with automatic multi-tier banner sizing.- Eliminated ASCII art banner wrapping and visual corruption on narrow mobile viewports (e.g. Android Termux portrait mode at 40–55 columns) by rendering an adaptive 31-column compact half-block banner (`█▀▄▀█...`) and dynamic horizontal centering.diff --git a/docs/players.md b/docs/players.mdindex 8f84a58..178d10b 100644--- a/docs/players.md+++ b/docs/players.md@@ -5,12 +5,12 @@ builds the exact command; `tui/app/playback.rs` spawns it.## Detection-`player::detect()` returns players in priority order:+`player::detect()` (powered by a centralized `probe_player_executable` engine) returns players in priority order, resolving and caching paths statically:-- macOS: IINA (if present), then mpv, then VLC (probing `/Applications`, `~/Applications`, Homebrew `/opt/homebrew/bin`, and MacPorts).-- Linux: mpv, then VLC (probing Native `$PATH`, Flathub/Flatpak user & system exports `org.videolan.VLC` / `io.mpv.Mpv`, Snap `/snap/bin/*`, and `flatpak run`).+- macOS: IINA (if present), then mpv, then VLC (probing `/Applications`, `~/Applications`, Homebrew `/opt/homebrew/bin`, MacPorts `/opt/local/bin`, and standard `/bin`).+- Linux: mpv, then VLC (probing Native `$PATH`, Flathub/Flatpak user & system exports `org.videolan.VLC` / `io.mpv.Mpv`, Snap `/snap/bin/*`, standard `/bin`, and `flatpak run`).- Windows: mpv, then VLC (probing `Program Files` including WinGet `MPV Player` and `mpv-player`, `LOCALAPPDATA\Programs`, `WinGet\Links`, portable `C:\mpv`, Scoop `scoop\shims`, and Chocolatey).-- Android/Termux: `mpv` (if installed via `pkg install mpv`), or Android intent chooser (`termux-open`, `termux-open-url`, or `termux-am`).+- Android/Termux: `mpv` (if installed via `pkg install mpv`), or Android intent chooser (`termux-open`, `termux-open-url`, `termux-am`, or `/system/bin/am`).Resolution runs once at startup and is cached (`OnceLock`). A preferred player can beforced via `MOVIEBOX_PLAYER` env or `default_player` in config (e.g. `mpv`, `iina`,diff --git a/install.ps1 b/install.ps1index bdf525a..df56271 100644--- a/install.ps1+++ b/install.ps1@@ -329,9 +329,9 @@ if (-not $NoModifyPath) {}$PlayerDetected = ""-if (Get-Command "mpv" -ErrorAction SilentlyContinue) {+if ((Get-Command "mpv" -ErrorAction SilentlyContinue) -or (Test-Path "C:\Program Files\mpv\mpv.exe") -or (Test-Path "C:\Program Files\MPV Player\mpv.exe") -or (Test-Path "C:\mpv\mpv.exe") -or (Test-Path "$env:LOCALAPPDATA\Programs\mpv\mpv.exe")) {$PlayerDetected = "mpv"-} elseif (Get-Command "vlc" -ErrorAction SilentlyContinue) {+} elseif ((Get-Command "vlc" -ErrorAction SilentlyContinue) -or (Test-Path "C:\Program Files\VideoLAN\VLC\vlc.exe") -or (Test-Path "C:\Program Files (x86)\VideoLAN\VLC\vlc.exe") -or (Test-Path "$env:LOCALAPPDATA\Programs\VLC\vlc.exe")) {$PlayerDetected = "VLC"}diff --git a/install.sh b/install.shindex 8100d2d..2a0b92f 100755--- a/install.sh+++ b/install.sh@@ -589,11 +589,11 @@ if [ "$NO_MODIFY_PATH" -eq 0 ]; thenfiPLAYER_DETECTED=""-if command -v mpv >/dev/null 2>&1; then+if command -v mpv >/dev/null 2>&1 || [ -d "/Applications/mpv.app" ] || [ -d "$HOME/Applications/mpv.app" ] || [ -f "$HOME/.local/share/flatpak/exports/bin/io.mpv.Mpv" ] || [ -f "/var/lib/flatpak/exports/bin/io.mpv.Mpv" ]; thenPLAYER_DETECTED="mpv"-elif command -v iina >/dev/null 2>&1 || command -v iina-cli >/dev/null 2>&1; then+elif command -v iina >/dev/null 2>&1 || command -v iina-cli >/dev/null 2>&1 || [ -d "/Applications/IINA.app" ] || [ -d "$HOME/Applications/IINA.app" ]; thenPLAYER_DETECTED="IINA"-elif command -v vlc >/dev/null 2>&1; then+elif command -v vlc >/dev/null 2>&1 || [ -d "/Applications/VLC.app" ] || [ -d "$HOME/Applications/VLC.app" ] || [ -f "$HOME/.local/share/flatpak/exports/bin/org.videolan.VLC" ] || [ -f "/var/lib/flatpak/exports/bin/org.videolan.VLC" ]; thenPLAYER_DETECTED="VLC"elif command -v termux-open >/dev/null 2>&1; thenPLAYER_DETECTED="Android Player (termux-open)"diff --git a/src/player.rs b/src/player.rsindex abfc3bf..12b0b97 100644--- a/src/player.rs+++ b/src/player.rs@@ -119,6 +119,7 @@ fn build_player_process_command(executable: &str) -> Command {}}+#[derive(Debug, Clone)]enum AndroidOpener {TermuxOpen(String),TermuxOpenUrl(String),@@ -134,76 +135,81 @@ fn is_termux_env() -> bool {}fn android_opener() -> Option<AndroidOpener> {- if let Some(custom) = configured_executable("MOVIEBOX_ANDROID_PLAYER_PATH") {- if custom.ends_with("termux-open-url") {- return Some(AndroidOpener::TermuxOpenUrl(custom));- } else if custom.ends_with("termux-am") || custom.ends_with("/am") {- return Some(AndroidOpener::TermuxAm(custom));- } else {- return Some(AndroidOpener::TermuxOpen(custom));- }- }+ static CACHED: std::sync::OnceLock<Option<AndroidOpener>> = std::sync::OnceLock::new();+ CACHED+ .get_or_init(|| {+ if let Some(custom) = configured_executable("MOVIEBOX_ANDROID_PLAYER_PATH") {+ if custom.ends_with("termux-open-url") {+ return Some(AndroidOpener::TermuxOpenUrl(custom));+ } else if custom.ends_with("termux-am") || custom.ends_with("/am") {+ return Some(AndroidOpener::TermuxAm(custom));+ } else {+ return Some(AndroidOpener::TermuxOpen(custom));+ }+ }- let is_termux = is_termux_env();+ let is_termux = is_termux_env();- if let Ok(prefix) = std::env::var("PREFIX") {- let termux_open = format!("{prefix}/bin/termux-open");- if Path::new(&termux_open).is_file() {- return Some(AndroidOpener::TermuxOpen(termux_open));- }- let termux_open_url = format!("{prefix}/bin/termux-open-url");- if Path::new(&termux_open_url).is_file() {- return Some(AndroidOpener::TermuxOpenUrl(termux_open_url));- }- let termux_am = format!("{prefix}/bin/termux-am");- if Path::new(&termux_am).is_file() {- return Some(AndroidOpener::TermuxAm(termux_am));- }- let am_bin = format!("{prefix}/bin/am");- if Path::new(&am_bin).is_file() {- return Some(AndroidOpener::TermuxAm(am_bin));- }- }+ if let Ok(prefix) = std::env::var("PREFIX") {+ let termux_open = format!("{prefix}/bin/termux-open");+ if Path::new(&termux_open).is_file() {+ return Some(AndroidOpener::TermuxOpen(termux_open));+ }+ let termux_open_url = format!("{prefix}/bin/termux-open-url");+ if Path::new(&termux_open_url).is_file() {+ return Some(AndroidOpener::TermuxOpenUrl(termux_open_url));+ }+ let termux_am = format!("{prefix}/bin/termux-am");+ if Path::new(&termux_am).is_file() {+ return Some(AndroidOpener::TermuxAm(termux_am));+ }+ let am_bin = format!("{prefix}/bin/am");+ if Path::new(&am_bin).is_file() {+ return Some(AndroidOpener::TermuxAm(am_bin));+ }+ }- let termux_open_static = "/data/data/com.termux/files/usr/bin/termux-open";- if Path::new(termux_open_static).is_file() {- return Some(AndroidOpener::TermuxOpen(termux_open_static.to_string()));- }- let termux_open_url_static = "/data/data/com.termux/files/usr/bin/termux-open-url";- if Path::new(termux_open_url_static).is_file() {- return Some(AndroidOpener::TermuxOpenUrl(- termux_open_url_static.to_string(),- ));- }- let termux_am_static = "/data/data/com.termux/files/usr/bin/termux-am";- if Path::new(termux_am_static).is_file() {- return Some(AndroidOpener::TermuxAm(termux_am_static.to_string()));- }- let termux_am_bin_static = "/data/data/com.termux/files/usr/bin/am";- if Path::new(termux_am_bin_static).is_file() {- return Some(AndroidOpener::TermuxAm(termux_am_bin_static.to_string()));- }+ let termux_open_static = "/data/data/com.termux/files/usr/bin/termux-open";+ if Path::new(termux_open_static).is_file() {+ return Some(AndroidOpener::TermuxOpen(termux_open_static.to_string()));+ }+ let termux_open_url_static = "/data/data/com.termux/files/usr/bin/termux-open-url";+ if Path::new(termux_open_url_static).is_file() {+ return Some(AndroidOpener::TermuxOpenUrl(+ termux_open_url_static.to_string(),+ ));+ }+ let termux_am_static = "/data/data/com.termux/files/usr/bin/termux-am";+ if Path::new(termux_am_static).is_file() {+ return Some(AndroidOpener::TermuxAm(termux_am_static.to_string()));+ }+ let termux_am_bin_static = "/data/data/com.termux/files/usr/bin/am";+ if Path::new(termux_am_bin_static).is_file() {+ return Some(AndroidOpener::TermuxAm(termux_am_bin_static.to_string()));+ }- if let Some(path) = find_in_path("termux-open") {- return Some(AndroidOpener::TermuxOpen(path));- }- if let Some(path) = find_in_path("termux-open-url") {- return Some(AndroidOpener::TermuxOpenUrl(path));- }- if let Some(path) = find_in_path("termux-am") {- return Some(AndroidOpener::TermuxAm(path));- }+ if let Some(path) = find_in_path("termux-open") {+ return Some(AndroidOpener::TermuxOpen(path));+ }+ if let Some(path) = find_in_path("termux-open-url") {+ return Some(AndroidOpener::TermuxOpenUrl(path));+ }+ if let Some(path) = find_in_path("termux-am") {+ return Some(AndroidOpener::TermuxAm(path));+ }- if !is_termux {- if Path::new("/system/bin/am").is_file() {- return Some(AndroidOpener::SystemAm("/system/bin/am".to_string()));- }- if let Some(path) = find_in_path("am") {- return Some(AndroidOpener::SystemAm(path));- }- }+ if !is_termux {+ if Path::new("/system/bin/am").is_file() {+ return Some(AndroidOpener::SystemAm("/system/bin/am".to_string()));+ }+ if let Some(path) = find_in_path("am") {+ return Some(AndroidOpener::SystemAm(path));+ }+ }- None+ None+ })+ .clone()}fn android_intent_command(url: &str) -> Command {@@ -350,6 +356,51 @@ fn mpv_command(command}+#[cfg(target_os = "macos")]+#[derive(Debug, Clone)]+enum IinaResolution {+ Cli(String),+ AppFallback,+}++#[cfg(target_os = "macos")]+fn iina_resolution() -> Option<IinaResolution> {+ static CACHED: std::sync::OnceLock<Option<IinaResolution>> = std::sync::OnceLock::new();+ CACHED+ .get_or_init(|| {+ if let Some(executable) = configured_executable("MOVIEBOX_IINA_PATH") {+ return Some(IinaResolution::Cli(executable));+ }++ let cli_global = "/Applications/IINA.app/Contents/MacOS/iina-cli";+ if Path::new(cli_global).exists() {+ return Some(IinaResolution::Cli(cli_global.to_string()));+ }++ if let Some(home) = dirs::home_dir() {+ let cli_local = home.join("Applications/IINA.app/Contents/MacOS/iina-cli");+ if cli_local.exists() {+ return Some(IinaResolution::Cli(+ cli_local.to_string_lossy().into_owned(),+ ));+ }+ }++ if let Some(path) = find_in_path("iina").or_else(|| find_in_path("iina-cli")) {+ return Some(IinaResolution::Cli(path));+ }++ if Path::new("/Applications/IINA.app").exists()+ || dirs::home_dir().is_some_and(|home| home.join("Applications/IINA.app").exists())+ {+ return Some(IinaResolution::AppFallback);+ }++ None+ })+ .clone()+}+#[cfg(target_os = "macos")]fn iina_command(url: &str,@@ -359,32 +410,19 @@ fn iina_command(resume_seconds: Option<u64>,tracker: Option<(&str, &str, usize, usize)>,) -> Command {- let configured = configured_executable("MOVIEBOX_IINA_PATH");- let cli_global = std::path::Path::new("/Applications/IINA.app/Contents/MacOS/iina-cli");- let cli_local = dirs::home_dir()- .map(|h| h.join("Applications/IINA.app/Contents/MacOS/iina-cli"))- .unwrap_or_default();-- let mut command = if let Some(executable) = configured {- Command::new(executable)- } else if cli_global.exists() {- let mut c = Command::new(cli_global);- c.arg("--keep-running").arg("--no-stdin");- c- } else if cli_local.exists() {- let mut c = Command::new(cli_local);- c.arg("--keep-running").arg("--no-stdin");- c- } else if let Some(path) = find_in_path("iina").or_else(|| find_in_path("iina-cli")) {- let mut c = Command::new(path);- c.arg("--keep-running").arg("--no-stdin");- c- } else if iina_app_exists() {- let mut c = Command::new("open");- c.arg("-a").arg("IINA").arg(url);- return c;- } else {- Command::new("iina")+ let resolution = iina_resolution();+ let mut command = match resolution {+ Some(IinaResolution::Cli(executable)) => {+ let mut c = Command::new(executable);+ c.arg("--keep-running").arg("--no-stdin");+ c+ }+ Some(IinaResolution::AppFallback) => {+ let mut c = Command::new("open");+ c.arg("-a").arg("IINA").arg(url);+ return c;+ }+ None => Command::new("iina"),};let mpv = mpv_command(@@ -466,14 +504,39 @@ fn vlc_command(command}+fn probe_player_executable(+ env_var: &str,+ candidates: &[String],+ bin_names: &[&str],+ flatpak_id: Option<&str>,+) -> Option<String> {+ if let Some(executable) = configured_executable(env_var) {+ return Some(executable);+ }++ for path in candidates {+ if Path::new(path).is_file() {+ return Some(path.to_string());+ }+ }++ for bin in bin_names {+ if let Some(path) = find_in_path(bin) {+ return Some(path);+ }+ }++ if let Some(id) = flatpak_id {+ flatpak_executable(id)+ } else {+ None+ }+}+fn mpv_executable() -> Option<String> {static CACHED: std::sync::OnceLock<Option<String>> = std::sync::OnceLock::new();CACHED.get_or_init(|| {- if let Some(executable) = configured_executable("MOVIEBOX_MPV_PATH") {- return Some(executable);- }-let mut candidates = Vec::new();#[cfg(target_os = "windows")]@@ -513,7 +576,9 @@ fn mpv_executable() -> Option<String> {);}candidates.push("/opt/homebrew/bin/mpv".to_string());+ candidates.push("/opt/local/bin/mpv".to_string());candidates.push("/usr/local/bin/mpv".to_string());+ candidates.push("/bin/mpv".to_string());}#[cfg(any(target_os = "linux", target_os = "android"))]@@ -534,28 +599,22 @@ fn mpv_executable() -> Option<String> {candidates.push("/var/lib/snapd/snap/bin/mpv".to_string());candidates.push("/usr/bin/mpv".to_string());candidates.push("/usr/local/bin/mpv".to_string());+ candidates.push("/bin/mpv".to_string());candidates.push("/app/bin/mpv".to_string());}- for path in candidates {- if Path::new(&path).is_file() {- return Some(path);- }- }-let bin_names = if cfg!(target_os = "windows") {&["mpv.exe", "mpv"][..]} else {&["mpv", "io.mpv.Mpv"][..]};- for bin in bin_names {- if let Some(path) = find_in_path(bin) {- return Some(path);- }- }-- flatpak_executable("io.mpv.Mpv")+ probe_player_executable(+ "MOVIEBOX_MPV_PATH",+ &candidates,+ bin_names,+ Some("io.mpv.Mpv"),+ )}).clone()}@@ -564,10 +623,6 @@ fn vlc_executable() -> Option<String> {static CACHED: std::sync::OnceLock<Option<String>> = std::sync::OnceLock::new();CACHED.get_or_init(|| {- if let Some(executable) = configured_executable("MOVIEBOX_VLC_PATH") {- return Some(executable);- }-let mut candidates = Vec::new();#[cfg(target_os = "windows")]@@ -602,7 +657,9 @@ fn vlc_executable() -> Option<String> {);}candidates.push("/opt/homebrew/bin/vlc".to_string());+ candidates.push("/opt/local/bin/vlc".to_string());candidates.push("/usr/local/bin/vlc".to_string());+ candidates.push("/bin/vlc".to_string());}#[cfg(any(target_os = "linux", target_os = "android"))]@@ -623,57 +680,34 @@ fn vlc_executable() -> Option<String> {candidates.push("/var/lib/snapd/snap/bin/vlc".to_string());candidates.push("/usr/bin/vlc".to_string());candidates.push("/usr/local/bin/vlc".to_string());+ candidates.push("/bin/vlc".to_string());candidates.push("/app/bin/vlc".to_string());}- for path in candidates {- if Path::new(&path).is_file() {- return Some(path);- }- }-let bin_names = if cfg!(target_os = "windows") {&["vlc.exe", "vlc"][..]} else {&["vlc", "org.videolan.VLC"][..]};- for bin in bin_names {- if let Some(path) = find_in_path(bin) {- return Some(path);- }- }-- flatpak_executable("org.videolan.VLC")+ probe_player_executable(+ "MOVIEBOX_VLC_PATH",+ &candidates,+ bin_names,+ Some("org.videolan.VLC"),+ )}).clone()}#[cfg(target_os = "macos")]fn iina_available() -> bool {- configured_executable("MOVIEBOX_IINA_PATH").is_some()- || iina_app_exists()- || executable_on_path("iina")- || executable_on_path("iina-cli")-}--#[cfg(target_os = "macos")]-fn iina_app_exists() -> bool {- Path::new("/Applications/IINA.app").exists()- || dirs::home_dir().is_some_and(|home| home.join("Applications/IINA.app").exists())+ iina_resolution().is_some()}#[cfg(target_os = "macos")]fn iina_cli_exists() -> bool {- let cli_global = Path::new("/Applications/IINA.app/Contents/MacOS/iina-cli");- let cli_local = dirs::home_dir()- .map(|h| h.join("Applications/IINA.app/Contents/MacOS/iina-cli"))- .unwrap_or_default();- configured_executable("MOVIEBOX_IINA_PATH").is_some()- || cli_global.exists()- || cli_local.exists()- || executable_on_path("iina")- || executable_on_path("iina-cli")+ matches!(iina_resolution(), Some(IinaResolution::Cli(_)))}fn flatpak_executable(app_id: &str) -> Option<String> {