Skip to content

Terminal interface to find, download, and stream movies, TV shows, and live TV using local media players.

refactor(player): cache detection and drop startup race

Samir Hossainsf6ccd4ff6236
diff --git a/src/tui/action.rs b/src/tui/action.rs
index ad77f8f..26bded6 100644
--- a/src/tui/action.rs
+++ b/src/tui/action.rs
@@ -56,7 +56,6 @@ pub enum Action {
ToggleThemePopup,
SelectTheme(String),
LaunchMpv(String, Option<String>),
- PlayersDetected(Vec<crate::tui::state::PlayerKind>),
DownloadStream(Option<String>),
StartDownload(Option<String>, Option<String>),
UpdateDownload(Option<f64>, Option<String>),
diff --git a/src/tui/app.rs b/src/tui/app.rs
index 7ea998b..615d2f1 100644
--- a/src/tui/app.rs
+++ b/src/tui/app.rs
@@ -844,12 +844,7 @@ impl App {
}
self.state.active_screen = Screen::Home;
- let player_sender = self.action_sender.clone();
- tokio::task::spawn_blocking(move || {
- player_sender
- .send(Action::PlayersDetected(crate::tui::player::detect()))
- .ok();
- });
+ self.state.available_players = crate::tui::player::detect();
loop {
if self.state.clear_terminal_before_draw {
@@ -4928,9 +4923,6 @@ impl App {
);
}
- Action::PlayersDetected(players) => {
- self.state.available_players = players;
- }
Action::ShowPlaybackPicker(source) => {
if self.state.available_players.is_empty() {
self.state.status_message =
diff --git a/src/tui/player.rs b/src/tui/player.rs
index 8453adc..e4de4a6 100644
--- a/src/tui/player.rs
+++ b/src/tui/player.rs
@@ -232,68 +232,78 @@ fn vlc_command(url: &str, subtitle: Option<&str>, headers: &[(String, String)])
}
fn mpv_executable() -> Option<String> {
- if let Some(executable) = configured_executable("MOVIEBOX_MPV_PATH") {
- return Some(executable);
- }
- let fallback = if cfg!(target_os = "windows") {
- "mpv.exe"
- } else {
- "mpv"
- };
- #[cfg_attr(not(any(target_os = "macos", windows)), allow(unused_mut))]
- let mut paths = vec![MPV_WINDOWS.to_string(), MPV_MACOS.to_string()];
- #[cfg(target_os = "macos")]
- if let Some(home) = dirs::home_dir() {
- paths.push(
- home.join("Applications/mpv.app/Contents/MacOS/mpv")
- .to_string_lossy()
- .into_owned(),
- );
- }
- #[cfg(windows)]
- if let Ok(local) = std::env::var("LOCALAPPDATA") {
- paths.push(format!(r"{local}\Programs\mpv\mpv.exe"));
- }
- first_executable(&paths, fallback).or_else(|| flatpak_executable("io.mpv.Mpv"))
+ 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 fallback = if cfg!(target_os = "windows") {
+ "mpv.exe"
+ } else {
+ "mpv"
+ };
+ #[cfg_attr(not(any(target_os = "macos", windows)), allow(unused_mut))]
+ let mut paths = vec![MPV_WINDOWS.to_string(), MPV_MACOS.to_string()];
+ #[cfg(target_os = "macos")]
+ if let Some(home) = dirs::home_dir() {
+ paths.push(
+ home.join("Applications/mpv.app/Contents/MacOS/mpv")
+ .to_string_lossy()
+ .into_owned(),
+ );
+ }
+ #[cfg(windows)]
+ if let Ok(local) = std::env::var("LOCALAPPDATA") {
+ paths.push(format!(r"{local}\Programs\mpv\mpv.exe"));
+ }
+ first_executable(&paths, fallback).or_else(|| flatpak_executable("io.mpv.Mpv"))
+ })
+ .clone()
}
fn vlc_executable() -> Option<String> {
- if let Some(executable) = configured_executable("MOVIEBOX_VLC_PATH") {
- return Some(executable);
- }
- let fallback = if cfg!(target_os = "windows") {
- "vlc.exe"
- } else {
- "vlc"
- };
-
- #[cfg_attr(not(any(target_os = "macos", windows)), allow(unused_mut))]
- let mut paths = vec![
- VLC_WINDOWS.to_string(),
- VLC_WINDOWS_X86.to_string(),
- VLC_MACOS.to_string(),
- ];
-
- #[cfg(target_os = "macos")]
- if let Some(home) = dirs::home_dir() {
- paths.push(
- home.join("Applications/VLC.app/Contents/MacOS/VLC")
- .to_string_lossy()
- .into_owned(),
- );
- }
-
- #[cfg(windows)]
- let windows_app_path = std::env::var("LOCALAPPDATA")
- .map(|l| format!(r"{}\Microsoft\WindowsApps\vlc.exe", l))
- .unwrap_or_default();
-
- #[cfg(windows)]
- if !windows_app_path.is_empty() {
- paths.push(windows_app_path);
- }
-
- first_executable(&paths, fallback).or_else(|| flatpak_executable("org.videolan.VLC"))
+ 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 fallback = if cfg!(target_os = "windows") {
+ "vlc.exe"
+ } else {
+ "vlc"
+ };
+
+ #[cfg_attr(not(any(target_os = "macos", windows)), allow(unused_mut))]
+ let mut paths = vec![
+ VLC_WINDOWS.to_string(),
+ VLC_WINDOWS_X86.to_string(),
+ VLC_MACOS.to_string(),
+ ];
+
+ #[cfg(target_os = "macos")]
+ if let Some(home) = dirs::home_dir() {
+ paths.push(
+ home.join("Applications/VLC.app/Contents/MacOS/VLC")
+ .to_string_lossy()
+ .into_owned(),
+ );
+ }
+
+ #[cfg(windows)]
+ let windows_app_path = std::env::var("LOCALAPPDATA")
+ .map(|l| format!(r"{}\Microsoft\WindowsApps\vlc.exe", l))
+ .unwrap_or_default();
+
+ #[cfg(windows)]
+ if !windows_app_path.is_empty() {
+ paths.push(windows_app_path);
+ }
+
+ first_executable(&paths, fallback).or_else(|| flatpak_executable("org.videolan.VLC"))
+ })
+ .clone()
}
#[cfg(target_os = "macos")]
diff --git a/src/tui/screens/details.rs b/src/tui/screens/details.rs
index 33d6686..e57fa0e 100644
--- a/src/tui/screens/details.rs
+++ b/src/tui/screens/details.rs
@@ -1084,15 +1084,7 @@ pub fn draw(frame: &mut Frame, area: Rect, state: &mut AppState, theme: &Theme)
let items = state
.available_players
.iter()
- .map(|k| {
- match k {
- crate::tui::state::PlayerKind::Mpv => "mpv",
- crate::tui::state::PlayerKind::Iina => "IINA",
- crate::tui::state::PlayerKind::Vlc => "VLC",
- crate::tui::state::PlayerKind::AndroidIntent => "Android Player",
- }
- .to_string()
- })
+ .map(|k| k.label().to_string())
.collect::<Vec<_>>();
crate::tui::overlay::picker(
frame,
diff --git a/src/tui/screens/home.rs b/src/tui/screens/home.rs
index 76950fd..e1a9d48 100644
--- a/src/tui/screens/home.rs
+++ b/src/tui/screens/home.rs
@@ -1134,15 +1134,7 @@ pub fn draw(frame: &mut Frame, area: Rect, state: &mut AppState, theme: &Theme)
let items = state
.available_players
.iter()
- .map(|k| {
- match k {
- crate::tui::state::PlayerKind::Mpv => "mpv",
- crate::tui::state::PlayerKind::Iina => "IINA",
- crate::tui::state::PlayerKind::Vlc => "VLC",
- crate::tui::state::PlayerKind::AndroidIntent => "Android Player",
- }
- .to_string()
- })
+ .map(|k| k.label().to_string())
.collect::<Vec<_>>();
crate::tui::overlay::picker(
frame,
diff --git a/src/tui/state.rs b/src/tui/state.rs
index 60fd953..eab99df 100644
--- a/src/tui/state.rs
+++ b/src/tui/state.rs
@@ -9,6 +9,17 @@ pub enum PlayerKind {
AndroidIntent,
}
+impl PlayerKind {
+ pub fn label(&self) -> &'static str {
+ match self {
+ PlayerKind::Mpv => "mpv",
+ PlayerKind::Iina => "IINA",
+ PlayerKind::Vlc => "VLC",
+ PlayerKind::AndroidIntent => "Android Player",
+ }
+ }
+}
+
#[derive(Debug, Clone, Copy, PartialEq, Eq)]
pub enum Screen {
Startup,