Skip to content

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

refactor: offload cache operations to background threads, enable mouse support, and improve subtitle fetching reliability

Samir Hossains447582fd98dc
diff --git a/src/main.rs b/src/main.rs
index 43c4bff..bf96290 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -8,6 +8,7 @@ impl Drop for TerminalGuard {
let _ = crossterm::execute!(
std::io::stdout(),
crossterm::terminal::LeaveAlternateScreen,
+ crossterm::event::DisableMouseCapture,
crossterm::event::DisableFocusChange
);
}
@@ -16,7 +17,10 @@ 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 == "--version" || arg == "-v" || arg == "-V") {
+ if args
+ .iter()
+ .any(|arg| arg == "--version" || arg == "-v" || arg == "-V")
+ {
println!("moviebox-tui {}", env!("CARGO_PKG_VERSION"));
return Ok(());
}
@@ -29,6 +33,7 @@ async fn main() -> std::io::Result<()> {
crossterm::execute!(
std::io::stdout(),
crossterm::terminal::EnterAlternateScreen,
+ crossterm::event::EnableMouseCapture,
crossterm::event::EnableFocusChange
)?;
diff --git a/src/tui/app.rs b/src/tui/app.rs
index c7a70f6..5eb5ff1 100644
--- a/src/tui/app.rs
+++ b/src/tui/app.rs
@@ -275,13 +275,8 @@ impl App {
.and_then(|pool| pool.episode_index.get(&(se, ep)))
.filter(|streams| !streams.is_empty())
.cloned();
- let disk_cached = memory_cached.is_none().then(|| {
- crate::cache::get_provider_stream_cache(self.state.active_provider, &id, se, ep)
- .and_then(|value| value.as_array().cloned())
- });
- let cached = memory_cached.or_else(|| disk_cached.flatten());
- if let Some(streams) = cached {
+ if let Some(streams) = memory_cached {
if let Some(pool) = self.state.stream_pool.get_mut(&id) {
pool.episode_index.insert((se, ep), streams.clone());
}
@@ -1742,8 +1737,12 @@ impl App {
let context = self.request_context();
tokio::spawn(async move {
if !force_refresh {
- if let Some(cached) =
- crate::cache::get_provider_search_cache(context.provider, &query_clone)
+ let q = query_clone.clone();
+ let p = context.provider;
+ if let Ok(Some(cached)) = tokio::task::spawn_blocking(move || {
+ crate::cache::get_provider_search_cache(p, &q)
+ })
+ .await
{
sender
.send(Action::SearchSuccess {
@@ -1768,11 +1767,12 @@ impl App {
};
match result {
Ok(res) => {
- crate::cache::set_provider_search_cache(
- context.provider,
- &query_clone,
- &res,
- );
+ let q = query_clone.clone();
+ let p = context.provider;
+ let r = res.clone();
+ tokio::task::spawn_blocking(move || {
+ crate::cache::set_provider_search_cache(p, &q, &r);
+ });
sender
.send(Action::SearchSuccess {
context,
@@ -1818,19 +1818,26 @@ impl App {
let sender = self.action_sender.clone();
let force_refresh = false;
- if !force_refresh {
- if let Some(cached) = crate::cache::get_homepage_cache(&tab_id, page) {
- sender
- .send(Action::HomepageSuccess {
- tab_id: tab_id.clone(),
- page,
- payload: cached,
- })
- .ok();
+ tokio::spawn(async move {
+ if !force_refresh {
+ let t_clone = tab_id.clone();
+ let p_clone = page;
+ if let Ok(Some(cached)) = tokio::task::spawn_blocking(move || {
+ crate::cache::get_homepage_cache(&t_clone, p_clone)
+ })
+ .await
+ {
+ sender
+ .send(Action::HomepageSuccess {
+ tab_id: tab_id.clone(),
+ page,
+ payload: cached,
+ })
+ .ok();
+ return;
+ }
}
- }
- tokio::spawn(async move {
match client.get_homepage(&tab_id, page).await {
Ok(res) => {
let r_clone = res.clone();
@@ -3514,6 +3521,33 @@ impl App {
let context = self.request_context();
+ if !force_refresh {
+ let id_clone = subject_id.clone();
+ let prov = context.provider;
+ let sender = self.action_sender.clone();
+ let req_id = request_id;
+ if let Ok(Some(cached)) = tokio::task::spawn_blocking(move || {
+ crate::cache::get_provider_stream_cache(prov, &id_clone, season, episode)
+ .and_then(|v| v.as_array().cloned())
+ })
+ .await
+ {
+ tokio::spawn(async move {
+ sender
+ .send(Action::EpisodeStreamsReady(
+ context,
+ req_id,
+ subject_id.clone(),
+ season,
+ episode,
+ serde_json::Value::Array(cached),
+ ))
+ .ok();
+ });
+ return None;
+ }
+ }
+
if context.provider == ProviderKind::FourKHdHub {
let sender = self.action_sender.clone();
let client = self.fourk_client.clone();
@@ -4082,6 +4116,7 @@ impl App {
}
Action::LaunchPlayer(kind, link, sub) => {
self.state.player_picker_popup = false;
+ let client = self.client.http_client().clone();
tokio::spawn(async move {
let mut local_sub = sub.clone();
let mut sub_temp_path = None;
@@ -4089,7 +4124,7 @@ impl App {
|| kind == crate::tui::state::PlayerKind::Iina
{
if let Some(s_url) = sub {
- if let Ok(resp) = reqwest::get(&s_url).await {
+ if let Ok(resp) = client.get(&s_url).send().await {
if let Ok(bytes) = resp.bytes().await {
let temp_path = std::env::temp_dir().join(format!(
"moviebox_sub_{}.srt",
@@ -4136,6 +4171,7 @@ impl App {
self.state.status_timer = 180;
return None;
}
+ let client = self.client.http_client().clone();
tokio::spawn(async move {
let mut local_sub = source.subtitle.clone();
let mut sub_temp_path = None;
@@ -4143,7 +4179,7 @@ impl App {
|| kind == crate::tui::state::PlayerKind::Iina
{
if let Some(s_url) = source.subtitle.as_ref() {
- if let Ok(resp) = reqwest::get(s_url).await {
+ if let Ok(resp) = client.get(s_url).send().await {
if let Ok(bytes) = resp.bytes().await {
let temp_path = std::env::temp_dir().join(format!(
"moviebox_sub_{}.srt",
diff --git a/src/tui/event.rs b/src/tui/event.rs
index 595d649..306198d 100644
--- a/src/tui/event.rs
+++ b/src/tui/event.rs
@@ -33,6 +33,17 @@ impl EventHandler {
break;
}
}
+ Ok(CrosstermEvent::Mouse(mouse)) => {
+ match mouse.kind {
+ crossterm::event::MouseEventKind::ScrollUp => {
+ let _ = event_sender.send(Action::Key(crossterm::event::KeyEvent::new(crossterm::event::KeyCode::Up, crossterm::event::KeyModifiers::empty())));
+ }
+ crossterm::event::MouseEventKind::ScrollDown => {
+ let _ = event_sender.send(Action::Key(crossterm::event::KeyEvent::new(crossterm::event::KeyCode::Down, crossterm::event::KeyModifiers::empty())));
+ }
+ _ => {}
+ }
+ }
Ok(CrosstermEvent::FocusGained) => {
let _ = event_sender.send(Action::FocusChange);
}
diff --git a/src/tui/player.rs b/src/tui/player.rs
index 0c04124..54f6a10 100644
--- a/src/tui/player.rs
+++ b/src/tui/player.rs
@@ -51,7 +51,11 @@ fn mpv_command(
headers: &[(String, String)],
iina: bool,
) -> Command {
- let fallback = if cfg!(target_os = "windows") { "mpv.exe" } else { "mpv" };
+ let fallback = if cfg!(target_os = "windows") {
+ "mpv.exe"
+ } else {
+ "mpv"
+ };
let executable = mpv_executable().unwrap_or_else(|| fallback.into());
let mut command = Command::new(executable);
let prefix = if iina { "--mpv-" } else { "--" };
@@ -96,7 +100,11 @@ fn iina_command(url: &str, subtitle: Option<&str>, headers: &[(String, String)])
}
fn vlc_command(url: &str, subtitle: Option<&str>, headers: &[(String, String)]) -> Command {
- let fallback = if cfg!(target_os = "windows") { "vlc.exe" } else { "vlc" };
+ let fallback = if cfg!(target_os = "windows") {
+ "vlc.exe"
+ } else {
+ "vlc"
+ };
let executable = vlc_executable().unwrap_or_else(|| fallback.into());
let mut command = Command::new(executable);
command.arg("--width=960").arg("--height=540").arg(url);
@@ -116,12 +124,20 @@ fn vlc_command(url: &str, subtitle: Option<&str>, headers: &[(String, String)])
}
fn mpv_executable() -> Option<String> {
- let fallback = if cfg!(target_os = "windows") { "mpv.exe" } else { "mpv" };
+ let fallback = if cfg!(target_os = "windows") {
+ "mpv.exe"
+ } else {
+ "mpv"
+ };
first_executable(&[MPV_WINDOWS, MPV_MACOS], fallback)
}
fn vlc_executable() -> Option<String> {
- let fallback = if cfg!(target_os = "windows") { "vlc.exe" } else { "vlc" };
+ let fallback = if cfg!(target_os = "windows") {
+ "vlc.exe"
+ } else {
+ "vlc"
+ };
first_executable(&[VLC_WINDOWS, VLC_WINDOWS_X86, VLC_MACOS], fallback)
}