Terminal interface to find, download, and stream movies, TV shows, and live TV using local media players.
perf(cache): optimize disk caching, search pagination, and client reuse
Samir Hossains0b053ec94d4f
diff --git a/CHANGELOG.md b/CHANGELOG.mdindex 2406e6b..3067181 100644--- a/CHANGELOG.md+++ b/CHANGELOG.md@@ -10,9 +10,12 @@- Added cross-provider title-based history deduplication and auto-resume from the last watched position.- **Addon Mode Watch History Parity**:- Added full watch history support (`/history`) in Addon Mode matching Streaming Mode, enabling seamless watch progress tracking, scrub bars, and completion badges for community HTTP addon content.-- **Codebase Optimization & Path Centralization**:+- **Codebase Optimization & Comprehensive Caching Architecture**:- Centralized application paths (`config_dir`, `data_dir`, `cache_dir`, `logs_dir`, `scripts_dir`, `playback_state_dir`) in `src/config.rs`.- - Streamlined `MovieBoxService` usage across background tasks and removed redundant duplicate client fields from `App` state.+ - Added dedicated disk caching for Addon Mode stream aggregation (`2h` TTL), catalog `/browse` presets (`1h` TTL), and verified manifests (`24h` TTL).+ - Added search pagination caching (`search_{hash}_{page}.json`) preventing redundant API calls when navigating multi-page search results.+ - Eliminated redundant `reqwest::Client` allocations in background poster pipelines in favor of the shared `service.http_client()`.+ - Streamlined `MovieBoxService` usage across background tasks and removed redundant `addon_client` field from `AppState`.- Centralized formatting utilities (`format_file_size`, `format_duration`) in `src/tui/text.rs`.- Modernized `Config` loading and persistence with safe, standard Serde derives.- **Addon Mode (Community HTTP Addons)**:diff --git a/src/cache.rs b/src/cache.rsindex fc2cf2c..539f37a 100644--- a/src/cache.rs+++ b/src/cache.rs@@ -122,13 +122,9 @@ fn hash_key(value: &str) -> String {}pub fn get_provider_cache_dir(provider: ProviderKind, subdir: &str) -> PathBuf {- let path = crate::config::cache_dir()+ crate::config::cache_dir().join(provider.cache_key())- .join(subdir);- if !path.exists() {- let _ = fs::create_dir_all(&path);- }- path+ .join(subdir)}pub fn get_provider_stream_path(@@ -191,15 +187,19 @@ pub fn invalidate_provider_details_cache(provider: ProviderKind, subject_id: &stlet _ = fs::remove_file(path);}-pub fn get_provider_search_path(provider: ProviderKind, query: &str) -> PathBuf {+pub fn get_provider_search_path(provider: ProviderKind, query: &str, page: usize) -> PathBuf {let mut path = get_provider_cache_dir(provider, "search");let hashed = hash_key(query);- path.push(format!("{hashed}.json"));+ path.push(format!("{hashed}_{page}.json"));path}-pub fn get_provider_search_cache(provider: ProviderKind, query: &str) -> Option<serde_json::Value> {- let path = get_provider_search_path(provider, query);+pub fn get_provider_search_cache(+ provider: ProviderKind,+ query: &str,+ page: usize,+) -> Option<serde_json::Value> {+ let path = get_provider_search_path(provider, query, page);let value = read_json_cache(&path, CACHE_EXPIRY_SECS)?;if search_payload_has_results(&value) {Some(value)@@ -209,8 +209,13 @@ pub fn get_provider_search_cache(provider: ProviderKind, query: &str) -> Option<}}-pub fn set_provider_search_cache(provider: ProviderKind, query: &str, data: &serde_json::Value) {- let path = get_provider_search_path(provider, query);+pub fn set_provider_search_cache(+ provider: ProviderKind,+ query: &str,+ page: usize,+ data: &serde_json::Value,+) {+ let path = get_provider_search_path(provider, query, page);if !search_payload_has_results(data) {let _ = fs::remove_file(path);return;@@ -321,12 +326,54 @@ pub fn set_homepage_cache(tab_id: &str, page: usize, data: &serde_json::Value) {write_json_cache(&path, data);}+pub fn get_addon_catalog_path(manifest_url: &str, r_type: &str, catalog_id: &str) -> PathBuf {+ let mut path = get_provider_cache_dir(ProviderKind::Addons, "catalogs");+ let hashed = hash_key(&format!("{manifest_url}_{r_type}_{catalog_id}"));+ path.push(format!("catalog_{hashed}.json"));+ path+}++pub fn get_addon_catalog_cache(+ manifest_url: &str,+ r_type: &str,+ catalog_id: &str,+) -> Option<serde_json::Value> {+ read_json_cache(+ &get_addon_catalog_path(manifest_url, r_type, catalog_id),+ HOMEPAGE_CACHE_EXPIRY_SECS,+ )+}++pub fn set_addon_catalog_cache(+ manifest_url: &str,+ r_type: &str,+ catalog_id: &str,+ data: &serde_json::Value,+) {+ let path = get_addon_catalog_path(manifest_url, r_type, catalog_id);+ write_json_cache(&path, data);+}++pub fn get_addon_manifest_path(manifest_url: &str) -> PathBuf {+ let mut path = get_provider_cache_dir(ProviderKind::Addons, "manifests");+ let hashed = hash_key(manifest_url);+ path.push(format!("manifest_{hashed}.json"));+ path+}++pub fn get_addon_manifest_cache(manifest_url: &str) -> Option<serde_json::Value> {+ read_json_cache(&get_addon_manifest_path(manifest_url), CACHE_EXPIRY_SECS)+}++pub fn set_addon_manifest_cache(manifest_url: &str, data: &serde_json::Value) {+ let path = get_addon_manifest_path(manifest_url);+ write_json_cache(&path, data);+}+fn get_namespaced_image_path(namespace: &str, id: &str) -> PathBuf {- let mut path = dirs::cache_dir().unwrap_or_else(std::env::temp_dir);- path.push(crate::config::APP_NAME);+ let mut path = crate::config::cache_dir();path.push(namespace);path.push("images");- let _ = fs::create_dir_all(&path);let safe_name = hash_key(id);path.push(format!("{safe_name}.img"));path@@ -366,6 +413,7 @@ pub fn get_namespaced_image_cache(namespace: &str, id: &str) -> Option<Vec<u8>>"iptv","circleftp","dhakaflix",+ "addons",];for fb in fallback_namespaces {if fb != namespace {diff --git a/src/providers/addons/client.rs b/src/providers/addons/client.rsindex 5bbf6e2..f62b1f3 100644--- a/src/providers/addons/client.rs+++ b/src/providers/addons/client.rs@@ -52,6 +52,18 @@ impl AddonClient {pub async fn fetch_manifest(&self, manifest_url: &str) -> Result<AddonManifest, String> {let url = Self::normalize_manifest_url(manifest_url);+ let url_clone = url.clone();+ if let Ok(Some(cached_json)) =+ tokio::task::spawn_blocking(move || crate::cache::get_addon_manifest_cache(&url_clone))+ .await+ {+ if let Ok(manifest) = serde_json::from_value::<AddonManifest>(cached_json) {+ if !manifest.name.trim().is_empty() {+ return Ok(manifest);+ }+ }+ }+let resp = self.http.get(&url)@@ -72,6 +84,13 @@ impl AddonClient {return Err("Addon manifest missing valid name".to_string());}+ if let Ok(json_val) = serde_json::to_value(&manifest) {+ let url_clone = url.clone();+ tokio::task::spawn_blocking(move || {+ crate::cache::set_addon_manifest_cache(&url_clone, &json_val);+ });+ }+Ok(manifest)}diff --git a/src/service.rs b/src/service.rsindex b559d43..bf719d1 100644--- a/src/service.rs+++ b/src/service.rs@@ -123,6 +123,17 @@ impl MovieBoxService {r#type: &str,catalog_id: &str,) -> Result<serde_json::Value, String> {+ let manifest_clone = manifest_url.to_string();+ let type_clone = r#type.to_string();+ let cat_id_clone = catalog_id.to_string();+ if let Ok(Some(cached)) = tokio::task::spawn_blocking(move || {+ crate::cache::get_addon_catalog_cache(&manifest_clone, &type_clone, &cat_id_clone)+ })+ .await+ {+ return Ok(cached);+ }+let base_url = crate::providers::addons::AddonClient::base_addon_url(manifest_url);let metas = self.addon_client@@ -134,7 +145,20 @@ impl MovieBoxService {return Err("No catalog items found".to_string());}- Ok(crate::providers::addons::adapter::metas_to_moviebox_search_json(metas))+ let json = crate::providers::addons::adapter::metas_to_moviebox_search_json(metas);+ let manifest_clone = manifest_url.to_string();+ let type_clone = r#type.to_string();+ let cat_id_clone = catalog_id.to_string();+ let json_clone = json.clone();+ tokio::task::spawn_blocking(move || {+ crate::cache::set_addon_catalog_cache(+ &manifest_clone,+ &type_clone,+ &cat_id_clone,+ &json_clone,+ );+ });+ Ok(json)}pub async fn details(@@ -427,7 +451,7 @@ pub fn resolve_subtitle_dir() -> PathBuf {return storage;}}- std::env::temp_dir().join("moviebox-tui/subs")+ crate::config::cache_dir().join("subs")}pub fn ensure_moviebox_subdir(path: &Path) -> PathBuf {diff --git a/src/tui/app/addons.rs b/src/tui/app/addons.rsindex d7347e6..5b4152a 100644--- a/src/tui/app/addons.rs+++ b/src/tui/app/addons.rs@@ -67,7 +67,7 @@ impl App {self.state.set_status("Verifying addon manifest...".to_string(), 200);- let client = self.state.addon_client.clone();+ let client = self.service.addon_client.clone();let sender = self.action_sender.clone();tokio::spawn(async move {diff --git a/src/tui/app/mod.rs b/src/tui/app/mod.rsindex 6136d7b..1c858e8 100644--- a/src/tui/app/mod.rs+++ b/src/tui/app/mod.rs@@ -78,18 +78,16 @@ impl App {state.download_dir = config.download_dir.map(std::path::PathBuf::from);state.installed_addons = crate::config::load_addons();- let mut theme = crate::tui::theme::Theme::new();- if let Ok(theme_env) = std::env::var("MOVIEBOX_THEME") {- let theme_kind = crate::tui::theme::ThemeKind::parse(&theme_env);- state.active_theme_kind = theme_kind.as_str().to_string();- theme = crate::tui::theme::Theme::from_kind(theme_kind);- } else if !state.active_theme_kind.is_empty() {- let theme_kind = crate::tui::theme::ThemeKind::parse(&state.active_theme_kind);- state.active_theme_kind = theme_kind.as_str().to_string();- theme = crate::tui::theme::Theme::from_kind(theme_kind);- } else {- state.active_theme_kind = "Mocha".to_string();- }+ let theme_str = std::env::var("MOVIEBOX_THEME").unwrap_or_else(|_| {+ if state.active_theme_kind.is_empty() {+ "Mocha".to_string()+ } else {+ state.active_theme_kind.clone()+ }+ });+ let theme_kind = crate::tui::theme::ThemeKind::parse(&theme_str);+ state.active_theme_kind = theme_kind.as_str().to_string();+ let theme = crate::tui::theme::Theme::from_kind(theme_kind);let service = std::sync::Arc::new(crate::service::MovieBoxService::new());if service.fourk_client.is_none() {diff --git a/src/tui/app/navigation.rs b/src/tui/app/navigation.rsindex 53869f2..22448ad 100644--- a/src/tui/app/navigation.rs+++ b/src/tui/app/navigation.rs@@ -157,9 +157,36 @@ impl App {let request_id = self.state.active_search_request;self.state.is_loading = true;tokio::spawn(async move {+ let q = query.clone();+ let provider = context.provider;+ if let Ok(Some(cached)) = tokio::task::spawn_blocking(move || {+ crate::cache::get_provider_search_cache(provider, &q, next_page)+ })+ .await+ {+ sender+ .send(Action::SearchSuccess {+ context,+ request_id,+ query,+ page: next_page,+ payload: cached,+ })+ .ok();+ return;+ }+let result = service.search(context.provider, &query, next_page).await;match result {Ok(res) => {+ let q = query.clone();+ let provider = context.provider;+ let cached = res.clone();+ tokio::task::spawn_blocking(move || {+ crate::cache::set_provider_search_cache(+ provider, &q, next_page, &cached,+ );+ });sender.send(Action::SearchSuccess {context,diff --git a/src/tui/app/requests.rs b/src/tui/app/requests.rsindex 00d7190..4915e38 100644--- a/src/tui/app/requests.rs+++ b/src/tui/app/requests.rs@@ -824,6 +824,7 @@ impl App {let url_clone = url.to_string();let action_tx = self.action_sender.clone();let id_clone = id.clone();+ let http_client = self.service.http_client().clone();tokio::spawn(async move {if let Ok(Some(bytes)) = tokio::task::spawn_blocking({let id_clone = id_clone.clone();@@ -836,11 +837,8 @@ impl App {return;}}- let client = reqwest::Client::builder()- .timeout(std::time::Duration::from_secs(5))- .build()- .unwrap_or_default();- if let Some(bytes) = network::fetch_poster_bytes(&client, &url_clone).await+ if let Some(bytes) =+ network::fetch_poster_bytes(&http_client, &url_clone).await{let bytes_clone = bytes.clone();let id_clone2 = id_clone.clone();@@ -1068,12 +1066,8 @@ impl App {return;}}- let client = reqwest::Client::builder()- .timeout(std::time::Duration::from_secs(5))- .build()- .unwrap_or(http_client);if let Some(bytes) =- network::fetch_poster_bytes(&client, &url_clone).await+ network::fetch_poster_bytes(&http_client, &url_clone).await{let bytes_clone = bytes.clone();let id_clone2 = id_clone.clone();@@ -1299,12 +1293,9 @@ impl App {let id_clone = id.clone();let http_client = self.service.http_client().clone();tokio::spawn(async move {- let client = reqwest::Client::builder()- .timeout(std::time::Duration::from_secs(5))- .build()- .unwrap_or(http_client);if let Some(bytes) =- network::fetch_poster_bytes(&client, &url_clone).await+ network::fetch_poster_bytes(&http_client, &url_clone)+ .await{if let Some(img) = network::decode_poster(bytes).await {let _ = action_tx@@ -1462,7 +1453,7 @@ impl App {if context.provider == ProviderKind::Addons {let sender = self.action_sender.clone();- let client = self.state.addon_client.clone();+ let client = self.service.addon_client.clone();let addons = crate::config::load_addons();let id = subject_id.clone();let is_series = self@@ -1502,16 +1493,25 @@ impl App {}if !releases.is_empty() {- sender- .send(Action::EpisodeStreamsReady(- context,- request_id,- id,+ let json = crate::providers::addons::adapter::releases_to_moviebox_json(+ &releases,+ );+ let id_clone = id.clone();+ let json_clone = json.clone();+ let provider = context.provider;+ tokio::task::spawn_blocking(move || {+ crate::cache::set_provider_stream_cache(+ provider,+ &id_clone,season,episode,- crate::providers::addons::adapter::releases_to_moviebox_json(- &releases,- ),+ &json_clone,+ );+ });++ sender+ .send(Action::EpisodeStreamsReady(+ context, request_id, id, season, episode, json,)).ok();} else {diff --git a/src/tui/app/search.rs b/src/tui/app/search.rsindex 8a6a788..5e934c2 100644--- a/src/tui/app/search.rs+++ b/src/tui/app/search.rs@@ -626,7 +626,7 @@ impl App {let q = query.clone();let provider = context.provider;if let Ok(Some(cached)) = tokio::task::spawn_blocking(move || {- crate::cache::get_provider_search_cache(provider, &q)+ crate::cache::get_provider_search_cache(provider, &q, page)}).await{@@ -650,7 +650,7 @@ impl App {let provider = context.provider;let cached = res.clone();tokio::task::spawn_blocking(move || {- crate::cache::set_provider_search_cache(provider, &q, &cached);+ crate::cache::set_provider_search_cache(provider, &q, page, &cached);});sender.send(Action::SearchSuccess {diff --git a/src/tui/state.rs b/src/tui/state.rsindex ac10d1b..b7970c5 100644--- a/src/tui/state.rs+++ b/src/tui/state.rs@@ -171,7 +171,6 @@ pub struct AppState {pub is_addon_mode: bool,pub addons_enabled: bool,pub installed_addons: Vec<crate::providers::addons::models::InstalledAddon>,- pub addon_client: crate::providers::addons::AddonClient,pub addon_manager_popup: bool,pub addon_manager_selected: usize,pub addon_input_active: bool,@@ -305,7 +304,6 @@ impl Default for AppState {is_addon_mode: false,addons_enabled: false,installed_addons: Vec::new(),- addon_client: crate::providers::addons::AddonClient::new(),addon_manager_popup: false,addon_manager_selected: 0,addon_input_active: false,