Terminal interface to find, download, and stream movies, TV shows, and live TV using local media players.
feat(cache): add 30-day poster disk caching, cross-namespace lookup, and history auto-hydration
Samir Hossains68a82b2f3677
diff --git a/CHANGELOG.md b/CHANGELOG.mdindex c67ae43..96cca50 100644--- a/CHANGELOG.md+++ b/CHANGELOG.md@@ -32,10 +32,17 @@- Added floating terminal dimension HUD and event coalescing for smooth window resizing without blank screens.- **Elevated Notification Badges**:- Redesigned notification popups into elevated, rounded bottom-right badge cards with clean typography.+- **Persistent Long-Term Poster Caching**:+ - Increased image cache retention to 30 days (`IMAGE_CACHE_EXPIRY_SECS`), serving previously fetched posters instantly from disk across sessions with zero redundant network requests.+ - Unified image caching under a shared namespace with automatic cross-namespace lookup across MovieBox, 4KHDHub, IPTV, CircleFTP, and DhakaFlix.- **Streamlined Browse Views**:- Curated `/browse` views into 4 categorized shelves (Popular, Top Rated, Trending, Most Watched) with proper filtering.### Fixed+- **History Poster Auto-Hydration & In-Memory Cache Retention**:+ - Fixed "Poster unavailable" placeholders in `/history` by automatically resolving missing cover URLs and decoding posters in the background.+ - Preserved in-memory decoded image caches when opening `/history` to eliminate unnecessary UI redraw latency.+ - Added multi-source fallback extraction for cover URLs across playback, preview, and search results.- **Stream Pool Initialization on Audio Selection**: Fixed stream fetching hanging on "Loading streams..." when selecting non-default audio dubs by ensuring stream pool entries are initialized before episode fetch.- **Title Sanitization & Preservation**: Enhanced `clean_moviebox_title` to sanitize international audio dubs, video quality tags, and format markers across downloads, folder organization, and watch history while preserving 4-digit release years.- **Terminal Restoration & Signal Handling**: Added `Ctrl+C` keyboard handling and asynchronous `SIGINT` signal listener to guarantee raw mode and alternate screen are always cleanly restored.diff --git a/src/cache.rs b/src/cache.rsindex f567424..feb71af 100644--- a/src/cache.rs+++ b/src/cache.rs@@ -302,23 +302,48 @@ fn get_namespaced_image_path(namespace: &str, id: &str) -> PathBuf {path}-pub fn get_namespaced_image_cache(namespace: &str, id: &str) -> Option<Vec<u8>> {- let path = get_namespaced_image_path(namespace, id);+const IMAGE_CACHE_EXPIRY_SECS: u64 = 30 * 24 * 60 * 60;++fn check_image_file(path: &PathBuf) -> Option<Vec<u8>> {if path.exists() {- if let Ok(metadata) = std::fs::metadata(&path) {+ if let Ok(metadata) = std::fs::metadata(path) {match metadata.modified().ok().and_then(|m| m.elapsed().ok()) {- Some(elapsed) if elapsed.as_secs() > CACHE_EXPIRY_SECS => {- let _ = std::fs::remove_file(&path);+ Some(elapsed) if elapsed.as_secs() > IMAGE_CACHE_EXPIRY_SECS => {+ let _ = std::fs::remove_file(path);return None;}None => {- let _ = std::fs::remove_file(&path);+ let _ = std::fs::remove_file(path);return None;}_ => {}}}- return std::fs::read(&path).ok();+ return std::fs::read(path).ok();+ }+ None+}++pub fn get_namespaced_image_cache(namespace: &str, id: &str) -> Option<Vec<u8>> {+ let path = get_namespaced_image_path(namespace, id);+ if let Some(bytes) = check_image_file(&path) {+ return Some(bytes);+ }+ let fallback_namespaces = [+ "posters",+ "moviebox",+ "fourkhdhub",+ "iptv",+ "circleftp",+ "dhakaflix",+ ];+ for fb in fallback_namespaces {+ if fb != namespace {+ let fb_path = get_namespaced_image_path(fb, id);+ if let Some(bytes) = check_image_file(&fb_path) {+ return Some(bytes);+ }+ }}None}diff --git a/src/history.rs b/src/history.rsindex 1e02cce..a6e4095 100644--- a/src/history.rs+++ b/src/history.rs@@ -116,6 +116,19 @@ impl HistoryManager {}}+ pub fn update_cover_url(&mut self, subject_id: &str, cover_url: &str) {+ let mut modified = false;+ for item in &mut self.recent {+ if item.subject_id == subject_id && item.cover_url.is_none() {+ item.cover_url = Some(cover_url.to_string());+ modified = true;+ }+ }+ if modified {+ self.save();+ }+ }+pub fn is_watched(&self,provider: &str,diff --git a/src/tui/app/playback.rs b/src/tui/app/playback.rsindex d1c7c67..b6a3be8 100644--- a/src/tui/app/playback.rs+++ b/src/tui/app/playback.rs@@ -2,6 +2,37 @@ use super::App;use crate::providers::models::ProviderKind;use crate::tui::{action::Action, overlay::NotificationKind, state::Screen};+pub(crate) fn extract_cover_url(val: &serde_json::Value) -> Option<String> {+ let keys = [+ "cover",+ "poster",+ "pic",+ "coverUrl",+ "cover_url",+ "posterUrl",+ "poster_url",+ "thumbnail",+ "image",+ "logo",+ "imgUrl",+ "img_url",+ ];+ for key in keys {+ if let Some(v) = val.get(key) {+ if let Some(s) = v.as_str() {+ if !s.is_empty() {+ return Some(s.to_string());+ }+ } else if let Some(url) = v.get("url").and_then(|u| u.as_str()) {+ if !url.is_empty() {+ return Some(url.to_string());+ }+ }+ }+ }+ None+}+impl App {fn preferred_playback_player(&self,@@ -28,12 +59,7 @@ impl App {if let Some(t) = details.get("title").and_then(|t| t.as_str()) {title = crate::providers::moviebox::clean_moviebox_title(t);}- cover_url = details- .get("poster")- .or_else(|| details.get("cover"))- .or_else(|| details.get("pic"))- .and_then(|c| c.as_str().or_else(|| c.get("url").and_then(|u| u.as_str())))- .map(|s| s.to_string());+ cover_url = extract_cover_url(details);stype = crate::tui::state::stype(details);if let Some(y) = details.get("year")@@ -46,6 +72,36 @@ impl App {}}+ if cover_url.is_none() {+ cover_url = self+ .state+ .search_results+ .iter()+ .find(|r| r.id == *subject_id)+ .and_then(|r| r.cover_url.clone());+ }++ if cover_url.is_none() {+ if let Some(preview) = &self.state.search_preview {+ cover_url = extract_cover_url(preview);+ }+ }++ if title == "Unknown" {+ if let Some(res) = self+ .state+ .search_results+ .iter()+ .find(|r| r.id == *subject_id)+ {+ title = res.title.clone();+ stype = res.stype;+ if release_year == "Unknown" {+ release_year = res.release_year.clone();+ }+ }+ }+let timestamp = std::time::SystemTime::now().duration_since(std::time::UNIX_EPOCH).unwrap_or_default()diff --git a/src/tui/app/requests.rs b/src/tui/app/requests.rsindex 2b021d4..933e6cf 100644--- a/src/tui/app/requests.rs+++ b/src/tui/app/requests.rs@@ -177,9 +177,7 @@ impl App {self.state.preview_loading = false;self.state.poster_image = None;self.state.poster_protocol = None;- self.state.search_posters.clear();self.state.failed_posters.clear();- self.state.search_poster_protocols.clear();self.state.in_flight_posters.clear();self.state.search_list_state.select(None);self.state.search_suggestions.clear();@@ -790,22 +788,15 @@ impl App {self.state.poster_protocol = None;if let Some(cached_img) = self.state.image_cache.get(&id) {self.state.poster_image = Some((**cached_img).clone());- } else if let Some(cover_val) = json.get("cover")- && let Some(url) = cover_val.get("url").and_then(|u| u.as_str())- {+ } else if let Some(url) = crate::tui::app::playback::extract_cover_url(&json) {+ self.state.history.update_cover_url(&id, &url);let url_clone = url.to_string();let action_tx = self.action_sender.clone();let id_clone = id.clone();- let provider = self.provider_for_subject(&id);tokio::spawn(async move {if let Ok(Some(bytes)) = tokio::task::spawn_blocking({let id_clone = id_clone.clone();- move || {- crate::cache::get_namespaced_image_cache(- provider.cache_key(),- &id_clone,- )- }+ move || crate::cache::get_namespaced_image_cache("posters", &id_clone)}).await{@@ -824,7 +815,7 @@ impl App {let id_clone2 = id_clone.clone();let _ = tokio::task::spawn_blocking(move || {crate::cache::set_namespaced_image_cache(- provider.cache_key(),+ "posters",&id_clone2,&bytes_clone,)@@ -840,6 +831,7 @@ impl App {Action::PosterSuccess(id, img) => {self.state.image_cache.put(id.clone(), img.clone());+ self.state.search_posters.put(id.clone(), img.clone());let current_id = if self.state.active_screen == Screen::Details {self.state.active_subject_id.clone()@@ -860,6 +852,7 @@ impl App {Action::SearchPosterLoaded(id, img_opt) => {self.state.in_flight_posters.remove(&id);if let Some(img) = img_opt {+ self.state.image_cache.put(id.clone(), img.clone());self.state.search_posters.put(id, img);} else {self.state.failed_posters.put(id, ());@@ -925,22 +918,18 @@ impl App {.or_else(|| self.state.search_posters.get(&id)){self.state.poster_image = Some((**cached_img).clone());- } else if let Some(cover_val) = payload.get("cover")- && let Some(url) = cover_val.get("url").and_then(|u| u.as_str())+ } else if let Some(url) = crate::tui::app::playback::extract_cover_url(&payload){+ self.state.history.update_cover_url(&id, &url);let url_clone = url.to_string();let action_tx = self.action_sender.clone();let id_clone = id.clone();- let provider = context.provider;let http_client = self.client.http_client().clone();tokio::spawn(async move {if let Ok(Some(bytes)) = tokio::task::spawn_blocking({let id_clone = id_clone.clone();move || {- crate::cache::get_namespaced_image_cache(- provider.cache_key(),- &id_clone,- )+ crate::cache::get_namespaced_image_cache("posters", &id_clone)}}).await@@ -961,10 +950,10 @@ impl App {let id_clone2 = id_clone.clone();let _ = tokio::task::spawn_blocking(move || {crate::cache::set_namespaced_image_cache(- provider.cache_key(),+ "posters",&id_clone2,&bytes_clone,- )+ );}).await;if let Some(img) = network::decode_poster(bytes).await {diff --git a/src/tui/app/search.rs b/src/tui/app/search.rsindex 12666c0..cb99028 100644--- a/src/tui/app/search.rs+++ b/src/tui/app/search.rs@@ -842,34 +842,32 @@ impl App {let end = (offset + visible + 14).min(total);if start < end {- let slice: Vec<(String, Option<String>)> = self.state.search_results[start..end]+ let slice: Vec<(String, Option<String>, ProviderKind)> = self.state.search_results+ [start..end].iter()- .map(|r| (r.id.clone(), r.cover_url.clone()))+ .map(|r| (r.id.clone(), r.cover_url.clone(), r.provider)).collect();self.spawn_search_posters(slice);}}- pub(super) fn spawn_search_posters(&mut self, results: Vec<(String, Option<String>)>) {+ pub(super) fn spawn_search_posters(+ &mut self,+ results: Vec<(String, Option<String>, ProviderKind)>,+ ) {if !self.state.image_supported {return;}let mut to_fetch = Vec::new();- for (id, cover_url) in results {- let Some(url) = cover_url else {- continue;- };- if url.is_empty() {- continue;- }+ for (id, cover_url, provider) in results {if self.state.search_posters.contains(&id) || self.state.failed_posters.contains(&id) {continue;}if !self.state.in_flight_posters.insert(id.clone()) {continue;}- to_fetch.push((id, url));+ to_fetch.push((id, cover_url, provider));}if to_fetch.is_empty() {@@ -878,12 +876,22 @@ impl App {let sender = self.action_sender.clone();let req_client = self.client.http_client().clone();+ let mb_client = self.client.clone();+ let fourk_client = self.fourk_client.clone();+ let circleftp_client = self.circleftp_client.clone();+ let dhakaflix_client = self.dhakaflix_client.clone();+tokio::spawn(async move {let sem = std::sync::Arc::new(tokio::sync::Semaphore::new(4));- for (id, url) in to_fetch {+ for (id, cover_url, provider) in to_fetch {let permit = sem.clone().acquire_owned().await.ok();let tx = sender.clone();let client = req_client.clone();+ let mb_client = mb_client.clone();+ let fourk_client = fourk_client.clone();+ let circleftp_client = circleftp_client.clone();+ let dhakaflix_client = dhakaflix_client.clone();+tokio::spawn(async move {let _permit = permit;let id_clone = id.clone();@@ -900,21 +908,41 @@ impl App {}}- if let Some(bytes) = network::fetch_poster_bytes(&client, &url).await {- let bytes_clone = bytes.clone();- let id_c = id.clone();- let _ = tokio::task::spawn_blocking(move || {- crate::cache::set_namespaced_image_cache(- "posters",- &id_c,- &bytes_clone,- );- })- .await;+ let mut resolved_url = cover_url;+ if resolved_url.is_none() {+ if let Ok(details) = network::provider_details(+ &mb_client,+ fourk_client.as_ref(),+ &circleftp_client,+ &dhakaflix_client,+ provider,+ &id,+ )+ .await+ {+ resolved_url = crate::tui::app::playback::extract_cover_url(&details);+ }+ }- if let Some(img) = network::decode_poster(bytes).await {- tx.send(Action::SearchPosterLoaded(id, Some(img))).ok();- return;+ if let Some(url) = resolved_url {+ if !url.is_empty() {+ if let Some(bytes) = network::fetch_poster_bytes(&client, &url).await {+ let bytes_clone = bytes.clone();+ let id_c = id.clone();+ let _ = tokio::task::spawn_blocking(move || {+ crate::cache::set_namespaced_image_cache(+ "posters",+ &id_c,+ &bytes_clone,+ );+ })+ .await;++ if let Some(img) = network::decode_poster(bytes).await {+ tx.send(Action::SearchPosterLoaded(id, Some(img))).ok();+ return;+ }+ }}}