Skip to content

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

fix(tui): resolve movie stream key mismatch and harden download flows

Samir Hossains5c2c9c7901bc
diff --git a/src/cache.rs b/src/cache.rs
index 7ac9c2f..f567424 100644
--- a/src/cache.rs
+++ b/src/cache.rs
@@ -9,13 +9,16 @@ const HOMEPAGE_CACHE_EXPIRY_SECS: u64 = 60 * 60;
fn read_json_cache(path: &PathBuf, expiry_secs: u64) -> Option<serde_json::Value> {
if path.exists() {
if let Ok(metadata) = fs::metadata(path) {
- if let Ok(modified) = metadata.modified() {
- if let Ok(elapsed) = modified.elapsed() {
- if elapsed.as_secs() > expiry_secs {
- let _ = fs::remove_file(path);
- return None;
- }
+ match metadata.modified().ok().and_then(|m| m.elapsed().ok()) {
+ Some(elapsed) if elapsed.as_secs() > expiry_secs => {
+ let _ = fs::remove_file(path);
+ return None;
+ }
+ None => {
+ let _ = fs::remove_file(path);
+ return None;
}
+ _ => {}
}
}
if let Ok(content) = fs::read_to_string(path) {
@@ -303,13 +306,16 @@ pub fn get_namespaced_image_cache(namespace: &str, id: &str) -> Option<Vec<u8>>
let path = get_namespaced_image_path(namespace, id);
if path.exists() {
if let Ok(metadata) = std::fs::metadata(&path) {
- if let Ok(modified) = metadata.modified() {
- if let Ok(elapsed) = modified.elapsed() {
- if elapsed.as_secs() > CACHE_EXPIRY_SECS {
- let _ = std::fs::remove_file(&path);
- return None;
- }
+ 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);
+ return None;
+ }
+ None => {
+ let _ = std::fs::remove_file(&path);
+ return None;
}
+ _ => {}
}
}
return std::fs::read(&path).ok();
diff --git a/src/history.rs b/src/history.rs
index 0c25922..1e02cce 100644
--- a/src/history.rs
+++ b/src/history.rs
@@ -53,7 +53,11 @@ impl HistoryManager {
pub fn save(&self) {
if let Some(path) = Self::history_file_path() {
if let Ok(content) = serde_json::to_string(self) {
- let temporary = path.with_extension(format!("{}.tmp", std::process::id()));
+ let stamp = std::time::SystemTime::now()
+ .duration_since(std::time::UNIX_EPOCH)
+ .unwrap_or_default()
+ .as_nanos();
+ let temporary = path.with_extension(format!("tmp-{}-{stamp}", std::process::id()));
if let Err(error) = fs::write(&temporary, content) {
log::warn!("failed to save watch history: {error}");
return;
diff --git a/src/tui/app/download.rs b/src/tui/app/download.rs
index 9edd451..91b674c 100644
--- a/src/tui/app/download.rs
+++ b/src/tui/app/download.rs
@@ -123,7 +123,12 @@ impl App {
.connect_timeout(std::time::Duration::from_secs(15))
.tcp_keepalive(std::time::Duration::from_secs(30))
.build()
- .unwrap_or_else(|_| self.client.http_client().clone());
+ .unwrap_or_else(|err| {
+ log::warn!(
+ "failed to build custom download client ({err}), falling back to default"
+ );
+ self.client.http_client().clone()
+ });
tokio::spawn(async move {
if let Err(error) = tokio::fs::create_dir_all(&target_dir).await {
@@ -463,24 +468,46 @@ impl App {
Action::DownloadFailed(error) => {
self.state.download_progress = None;
self.state.download_status = None;
+ if self.state.download_queue_total > 0 {
+ let total = self.state.download_queue_total;
+ let remaining = self.state.download_queue.len();
+ let completed = total.saturating_sub(remaining + 1);
+ self.state.notify(
+ NotificationKind::Error,
+ "Season download halted",
+ format!("{completed}/{total} files finished before error: {error}"),
+ );
+ } else {
+ self.state.notify(
+ NotificationKind::Error,
+ "Download failed",
+ format!("Partial file preserved. {error}"),
+ );
+ }
self.state.download_queue.clear();
self.state.download_queue_total = 0;
- self.state.notify(
- NotificationKind::Error,
- "Download failed",
- format!("Partial file preserved. {error}"),
- );
}
Action::DownloadPaused(path) => {
self.state.download_progress = None;
self.state.download_status = None;
+ if self.state.download_queue_total > 0 {
+ let total = self.state.download_queue_total;
+ let remaining = self.state.download_queue.len();
+ let completed = total.saturating_sub(remaining + 1);
+ self.state.notify(
+ NotificationKind::Warning,
+ "Season download paused",
+ format!("{completed}/{total} files finished. Resume with {path}.part"),
+ );
+ } else {
+ self.state.notify(
+ NotificationKind::Warning,
+ "Download paused",
+ format!("Start again to resume {path}.part"),
+ );
+ }
self.state.download_queue.clear();
self.state.download_queue_total = 0;
- self.state.notify(
- NotificationKind::Warning,
- "Download paused",
- format!("Start again to resume {path}.part"),
- );
}
Action::ClearDownload => {
self.state.download_progress = None;
diff --git a/src/tui/app/keyboard.rs b/src/tui/app/keyboard.rs
index ca474a9..f7ddb8a 100644
--- a/src/tui/app/keyboard.rs
+++ b/src/tui/app/keyboard.rs
@@ -307,12 +307,6 @@ impl App {
KeyCode::Enter => {
if self.state.search_results.is_empty()
&& !self.state.search_query.trim().is_empty()
- && (self.state.search_error.is_some()
- || self
- .state
- .status_message
- .to_ascii_lowercase()
- .starts_with("no matches"))
{
self.action_sender
.send(Action::Search {
diff --git a/src/tui/app/navigation.rs b/src/tui/app/navigation.rs
index 65508cf..bf13cd0 100644
--- a/src/tui/app/navigation.rs
+++ b/src/tui/app/navigation.rs
@@ -70,6 +70,7 @@ impl App {
self.state.download_queue_total = 0;
self.state.is_waiting_for_download_stream = false;
self.state.search_posters.clear();
+ self.state.failed_posters.clear();
self.state.search_poster_protocols.clear();
self.state.in_flight_posters.clear();
self.state.image_cache.clear();
diff --git a/src/tui/app/requests.rs b/src/tui/app/requests.rs
index 5e8dbd4..7534d7c 100644
--- a/src/tui/app/requests.rs
+++ b/src/tui/app/requests.rs
@@ -174,6 +174,7 @@ impl App {
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);
@@ -482,6 +483,7 @@ impl App {
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();
}
@@ -582,6 +584,7 @@ impl App {
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
@@ -854,6 +857,8 @@ impl App {
self.state.in_flight_posters.remove(&id);
if let Some(img) = img_opt {
self.state.search_posters.put(id, img);
+ } else {
+ self.state.failed_posters.put(id, ());
}
}
@@ -1126,6 +1131,8 @@ impl App {
context.provider.cache_key()
);
self.state.is_loading = false;
+ self.state.is_resolving_playback = false;
+ self.state.is_waiting_for_download_stream = false;
self.state.selected_details = None;
self.state.selected_resources = None;
self.state.active_subject_id = None;
@@ -1196,19 +1203,8 @@ impl App {
(0usize, 0usize)
}
} else {
- let se = if self.state.selected_season > 0 {
- self.state.selected_season
- } else {
- 1
- };
- let ep = if self.state.selected_episode > 0 {
- self.state.selected_episode
- } else {
- 1
- };
- (se, ep)
+ (0usize, 0usize)
};
- let _ = (se, ep);
self.state.selected_season = se;
self.state.selected_episode = ep;
diff --git a/src/tui/app/search.rs b/src/tui/app/search.rs
index 1424de0..2ff663d 100644
--- a/src/tui/app/search.rs
+++ b/src/tui/app/search.rs
@@ -756,7 +756,7 @@ impl App {
if url.is_empty() {
continue;
}
- if self.state.search_posters.contains(&id) {
+ if self.state.search_posters.contains(&id) || self.state.failed_posters.contains(&id) {
continue;
}
if !self.state.in_flight_posters.insert(id.clone()) {
@@ -817,88 +817,3 @@ impl App {
});
}
}
-
-#[cfg(test)]
-mod tests {
- use super::*;
-
- #[test]
- fn extracts_browse_metrics_from_string_and_nested_values() {
- let item = serde_json::json!({
- "metadata": {
- "imdb_trending": "9.2",
- "imdbRatingValue": "7.2",
- "imdbRatingLast30Days": 8.7
- },
- "imdb_popularity": 74
- });
-
- let metrics = extract_browse_metrics(&item);
- assert_eq!(metrics.trending, Some(9.2));
- assert_eq!(metrics.recent_rating, Some(8.7));
- assert_eq!(metrics.popularity, Some(74.0));
- assert_eq!(metrics.rating, Some(7.2));
- }
-
- #[test]
- fn browse_sort_keeps_unranked_titles_at_the_end() {
- assert_eq!(
- compare_browse_values(Some(7.0), Some(8.0), true),
- std::cmp::Ordering::Greater
- );
- assert_eq!(
- compare_browse_values(Some(7.0), Some(8.0), false),
- std::cmp::Ordering::Less
- );
- assert_eq!(
- compare_browse_values(Some(7.0), None, true),
- std::cmp::Ordering::Less
- );
- }
-
- #[test]
- fn browse_extraction_uses_matching_curated_group() {
- let payload = serde_json::json!({
- "items": [
- {
- "title": "Trending in Cinema",
- "subjects": [
- {"subjectId": "trending-1", "title": "Current hit"}
- ]
- },
- {
- "title": "Top 20 Movies",
- "subjects": [
- {"subjectId": "top-1", "title": "All-time favorite"}
- ]
- }
- ]
- });
-
- let subjects = App::extract_browse_subjects(&payload, BrowsePreset::Trending);
- assert_eq!(subjects.len(), 1);
- assert_eq!(subjects[0]["subjectId"], "trending-1");
- assert_eq!(subjects[0]["__browse_rank"], 1.0);
- }
-
- #[test]
- fn popularity_does_not_alias_top_rated_group() {
- let payload = serde_json::json!({
- "items": [
- {
- "title": "Top 20 Movies",
- "subjects": [{"subjectId": "top-1", "title": "All-time favorite"}]
- },
- {
- "title": "Most Watched",
- "subjects": [{"subjectId": "watched-1", "title": "Most watched"}]
- }
- ]
- });
-
- let subjects = App::extract_browse_subjects(&payload, BrowsePreset::MostWatched);
- assert_eq!(subjects.len(), 1);
- assert_eq!(subjects[0]["subjectId"], "watched-1");
- assert!(subjects[0].get("__browse_rank").is_none());
- }
-}
diff --git a/src/tui/app/system.rs b/src/tui/app/system.rs
index c6629a9..efaed89 100644
--- a/src/tui/app/system.rs
+++ b/src/tui/app/system.rs
@@ -212,6 +212,7 @@ impl App {
self.state.stream_pool.clear();
self.state.image_cache.clear();
self.state.search_posters.clear();
+ self.state.failed_posters.clear();
self.state.search_poster_protocols.clear();
self.state.in_flight_posters.clear();
self.state.browse_metrics.clear();
diff --git a/src/tui/overlay.rs b/src/tui/overlay.rs
index 3162d48..166f720 100644
--- a/src/tui/overlay.rs
+++ b/src/tui/overlay.rs
@@ -76,7 +76,8 @@ pub fn picker(
.unwrap_or(0)
.min(items.len().saturating_sub(1));
let visible_rows = items.len().clamp(1, MAX_PICKER_ROWS);
- let footer_width = crate::tui::text::width("[↑↓] Move [Enter] Download [Esc] Back");
+ let footer_str = format!("[↑↓] Move [Enter] {} [Esc] Back", spec.confirm_label);
+ let footer_width = crate::tui::text::width(&footer_str);
let content_width = items
.iter()
.map(|item| crate::tui::text::width(item))
diff --git a/src/tui/state.rs b/src/tui/state.rs
index 88a2e24..1fd96e1 100644
--- a/src/tui/state.rs
+++ b/src/tui/state.rs
@@ -163,6 +163,7 @@ pub struct AppState {
pub current_tab_id: String,
pub current_page: usize,
pub search_posters: lru::LruCache<String, std::sync::Arc<image::DynamicImage>>,
+ pub failed_posters: lru::LruCache<String, ()>,
pub search_poster_protocols:
lru::LruCache<String, ((u16, u16), ratatui_image::protocol::Protocol)>,
pub in_flight_posters: std::collections::HashSet<String>,
@@ -291,6 +292,7 @@ impl Default for AppState {
current_tab_id: String::new(),
current_page: 1,
search_posters: lru::LruCache::new(std::num::NonZeroUsize::new(300).unwrap()),
+ failed_posters: lru::LruCache::new(std::num::NonZeroUsize::new(300).unwrap()),
search_poster_protocols: lru::LruCache::new(std::num::NonZeroUsize::new(300).unwrap()),
in_flight_posters: std::collections::HashSet::new(),
search_list_state: TableState::default(),