Skip to content

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

fix(tui): isolate stream row selection, prevent metadata leakage, and optimize loading transitions

Samir Hossainscf0b602763d6
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 7c94849..fa52cba 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,6 +3,23 @@
## [Unreleased]
### Added
+- **Smooth Loading Transitions & Zero-Flicker View State Optimization (`src/tui/screens/home.rs`, `src/tui/screens/details.rs`, `src/tui/app/keyboard.rs`)**:
+ - Eliminated millisecond flashes of "No matches found" / "No results found" when submitting searches by synchronizing `is_loading` state on Enter and prioritizing `SearchViewState::Loading` in `search_view_state`.
+ - Prevented transient "No stream sources found" flash on the Details screen by displaying the stream loading spinner while either `is_fetching_streams` or `is_loading` is active.
+ - Ensured smooth, fluid visual transitions without jarring state jumps when searching, switching providers, or navigating media details.
+- **Isolated Stream Selection Highlighting & Dedicated Table Header (`src/tui/screens/details.rs`, `src/tui/app/mouse.rs`)**:
+ - Fixed stream selection highlight bleeding over group and table column headers by separating the column header into a static, unselected header row at the top of the Streams pane in `theme.overlay0`.
+ - Rendered each stream as an atomic 1-line `ListItem`, ensuring Ratatui's `selection_style` background and `selection_symbol` apply exclusively to the selected stream row.
+ - Aligned table column headers (`RES`, `SIZE`, `MEDIA TAGS`, `DURATION`, `UPLOADER`, `RELEASE`) across all 4 responsive tiers (<58, 58..85, 85..115, $\ge$115 cols).
+ - Simplified scroll indicator calculation and aligned mouse click hitboxes directly to stream rows.
+- **Strict Metadata & Preview Identity Isolation (`src/providers/models.rs`, `src/tui/app/requests.rs`, `src/tui/screens/details.rs`, `src/tui/screens/home.rs`, `src/tui/app/playback.rs`)**:
+ - Filtered `MediaDetails::from_search_result` to only consume `search_preview` when `preview.id.value == item.id && preview.id.provider == item.provider`, preventing stale metadata leakage when navigating search results quickly.
+ - Guarded `DetailsSuccess` metadata merging to only combine missing fields when `existing.id.value == id && existing.id.provider == details.id.provider`.
+ - Guarded synopsis fallback in `details.rs`, search result card badges in `home.rs`, and watch history duration/cover fallbacks in `playback.rs` with strict subject ID matching.
+- **Addon Provider Metadata Resolution & Crew Support (`src/providers/addons/`)**:
+ - Reordered `AddonClient::details` query priority to start with `"movie"` before `"series"`, returning immediately upon receiving valid matching metadata.
+ - Added support for plural and alternate crew and cast fields (`directors`, `writer`, `writers`, `stars`) in `MetaDetail` deserialization and adaptation.
+ - Prevented incorrect media type classification from corrupting stream queries to addon providers.
- **Domain Factory Methods & Codebase Deduplication (`src/providers/models.rs`, `src/models.rs`, `src/history.rs`, `src/favorites.rs`, `src/tui/app/`)**:
- Centralized `MediaDetails::from_search_result(&item, preview)` constructor on `MediaDetails`, eliminating 100+ lines of duplicate fallback creation across `navigation.rs` and `favorites.rs`.
- Added `WatchHistoryItem::from_details` and `FavoriteItem::from_details` domain constructors consuming strongly typed `MediaDetails`.
diff --git a/docs/addons-mode.md b/docs/addons-mode.md
index 8b588ee..0d3ce6f 100644
--- a/docs/addons-mode.md
+++ b/docs/addons-mode.md
@@ -5,7 +5,7 @@ Addon Mode enables support for community HTTP addon manifests. You can install a
## Features
- **Standard Protocol Support**: Compatibility with standard addon manifests (`/manifest.json`, `/catalog`, `/meta`, `/stream`).
-- **Core Metadata Protection**: Cinemeta is pre-installed out-of-the-box as the core metadata provider (`[Core]`) and locked to prevent accidental removal.
+- **Core Metadata Protection & Fast Resolution**: Cinemeta is pre-installed out-of-the-box as the core metadata provider (`[Core]`) and locked to prevent accidental removal. Metadata requests prioritize media type resolution with full support for alternate crew fields (`directors`, `writers`, `stars`).
- **Direct HTTP Stream Engine**: Automatically extracts and filters direct Cloudflare R2, PixelDrain, direct video CDN, and HubCloud/HubDrive HTTP streams.
- **Multi-Addon Concurrency**: Simultaneously queries all enabled stream addons and aggregates releases.
- **Quality, Resolution & Codec Parsing**: Ranks streams with high-contrast color-coded resolution badges (`4K UHD`, `1080p FHD`, `720p HD`, `SD`) and granular audio/video codec tags (`HDR`, `DV`, `ATMOS`, `5.1`, `HEVC`, `AV1`, `BluRay`, `WEB-DL`, `REMUX`), file size in GB/MB, and audio language tracks (e.g. `[Dual]`, `[Multi]`, `Hindi + English`).
diff --git a/docs/known-issues.md b/docs/known-issues.md
index 2a440d7..1e2669d 100644
--- a/docs/known-issues.md
+++ b/docs/known-issues.md
@@ -27,6 +27,6 @@ Tracked here so future work and issue reports reference the same facts.
## Verification
-- Automated testing is enforced via `cargo test --all-features --locked` covering 310+ unit and integration tests across 21 test suites (see [`docs/testing.md`](testing.md)). The count is updated when tests change; it does not replace real-player and real-device verification.
+- Automated testing is enforced via `cargo test --all-features --locked` covering 318+ unit and integration tests across 21 test suites (see [`docs/testing.md`](testing.md)). The count is updated when tests change; it does not replace real-player and real-device verification.
- Static correctness is enforced by strict compiler type checking, the lint gate (`cargo clippy --all-targets --all-features --locked -- -D warnings`), formatting (`cargo fmt --check`), dependency vulnerability scanning (`cargo audit`), and packaging verification (`cargo package --locked`).
- Runtime and platform-specific behavior (terminal resize, focus handling, external player launch, and Termux chooser) are verified through the release checklist in [`release-checklist.md`](release-checklist.md).
diff --git a/docs/testing.md b/docs/testing.md
index 9f42f7f..89b95c7 100644
--- a/docs/testing.md
+++ b/docs/testing.md
@@ -4,7 +4,7 @@ This document describes the testing architecture, quality assurance procedures,
## 1. Test Architecture
-The test suite comprises **310+ automated tests across 21 test suites** (170 unit tests in `src/lib.rs`, 0 binary tests in `src/main.rs`, and 140 integration tests across 20 test suites in `tests/`), running fully offline by default without mocking or live network dependencies.
+The test suite comprises **318+ automated tests across 21 test suites** (173 unit tests in `src/lib.rs`, 0 binary tests in `src/main.rs`, and 145 integration tests across 20 test suites in `tests/`), running fully offline by default without mocking or live network dependencies.
The MovieBox-TUI test architecture follows a strict separation of concerns:
```text
diff --git a/src/providers/addons/adapter.rs b/src/providers/addons/adapter.rs
index dfd443b..071ecb5 100644
--- a/src/providers/addons/adapter.rs
+++ b/src/providers/addons/adapter.rs
@@ -174,11 +174,19 @@ pub fn meta_detail_to_media_details(detail: &MetaDetail) -> MediaDetails {
imdb_rating: detail.imdb_rating.clone().or_else(|| detail.rating.clone()),
director: if !detail.director.is_empty() {
Some(detail.director.join(", "))
+ } else if !detail.directors.is_empty() {
+ Some(detail.directors.join(", "))
+ } else if !detail.writers.is_empty() {
+ Some(detail.writers.join(", "))
+ } else if !detail.writer.is_empty() {
+ Some(detail.writer.join(", "))
} else {
None
},
stars: if !detail.cast.is_empty() {
Some(detail.cast.join(", "))
+ } else if !detail.stars.is_empty() {
+ Some(detail.stars.join(", "))
} else {
None
},
@@ -667,7 +675,11 @@ mod tests {
genre: Vec::new(),
runtime: Some("45m".to_string()),
cast: vec!["Actor One".to_string(), "Actor Two".to_string()],
+ stars: Vec::new(),
director: vec!["Director Name".to_string()],
+ directors: Vec::new(),
+ writer: Vec::new(),
+ writers: Vec::new(),
videos: vec![
super::super::models::MetaVideo {
id: Some("ep1".to_string()),
diff --git a/src/providers/addons/mod.rs b/src/providers/addons/mod.rs
index 21b98f2..70b3e3a 100644
--- a/src/providers/addons/mod.rs
+++ b/src/providers/addons/mod.rs
@@ -81,21 +81,27 @@ impl Provider for AddonClient {
.filter(|a| a.enabled && a.provides_meta)
.collect();
- let types_to_try = ["series", "tv", "anime", "movie", "other"];
+ let types_to_try = ["movie", "series", "tv", "anime", "other"];
let mut best_detail: Option<models::MetaDetail> = None;
for addon in &meta_addons {
let base_url = Self::base_addon_url(&addon.manifest_url);
for t in types_to_try {
if let Ok(d) = self.fetch_meta(&base_url, t, id).await {
- if !d.videos.is_empty()
- || d.r#type.eq_ignore_ascii_case("series")
- || d.r#type.eq_ignore_ascii_case("tv")
- {
- return Ok(adapter::meta_detail_to_media_details(&d));
- }
- if best_detail.is_none() {
- best_detail = Some(d);
+ let has_valid_id = d.id == id;
+ let has_title = !d.name.trim().is_empty()
+ || d.title.as_deref().is_some_and(|t| !t.trim().is_empty());
+ if has_valid_id && has_title {
+ if !d.videos.is_empty()
+ || d.r#type.eq_ignore_ascii_case("series")
+ || d.r#type.eq_ignore_ascii_case("tv")
+ || d.r#type.eq_ignore_ascii_case("movie")
+ {
+ return Ok(adapter::meta_detail_to_media_details(&d));
+ }
+ if best_detail.is_none() {
+ best_detail = Some(d);
+ }
}
}
}
@@ -110,14 +116,20 @@ impl Provider for AddonClient {
let base_url = Self::base_addon_url(&addon.manifest_url);
for t in types_to_try {
if let Ok(d) = self.fetch_meta(&base_url, t, id).await {
- if !d.videos.is_empty()
- || d.r#type.eq_ignore_ascii_case("series")
- || d.r#type.eq_ignore_ascii_case("tv")
- {
- return Ok(adapter::meta_detail_to_media_details(&d));
- }
- if best_detail.is_none() {
- best_detail = Some(d);
+ let has_valid_id = d.id == id;
+ let has_title = !d.name.trim().is_empty()
+ || d.title.as_deref().is_some_and(|t| !t.trim().is_empty());
+ if has_valid_id && has_title {
+ if !d.videos.is_empty()
+ || d.r#type.eq_ignore_ascii_case("series")
+ || d.r#type.eq_ignore_ascii_case("tv")
+ || d.r#type.eq_ignore_ascii_case("movie")
+ {
+ return Ok(adapter::meta_detail_to_media_details(&d));
+ }
+ if best_detail.is_none() {
+ best_detail = Some(d);
+ }
}
}
}
diff --git a/src/providers/addons/models.rs b/src/providers/addons/models.rs
index af1d534..9d116e5 100644
--- a/src/providers/addons/models.rs
+++ b/src/providers/addons/models.rs
@@ -385,7 +385,15 @@ pub struct MetaDetail {
#[serde(default, deserialize_with = "de_string_or_vec")]
pub cast: Vec<String>,
#[serde(default, deserialize_with = "de_string_or_vec")]
+ pub stars: Vec<String>,
+ #[serde(default, deserialize_with = "de_string_or_vec")]
pub director: Vec<String>,
+ #[serde(default, deserialize_with = "de_string_or_vec")]
+ pub directors: Vec<String>,
+ #[serde(default, deserialize_with = "de_string_or_vec")]
+ pub writer: Vec<String>,
+ #[serde(default, deserialize_with = "de_string_or_vec")]
+ pub writers: Vec<String>,
#[serde(default)]
pub videos: Vec<MetaVideo>,
}
diff --git a/src/providers/models.rs b/src/providers/models.rs
index 68e8297..b2bdf8c 100644
--- a/src/providers/models.rs
+++ b/src/providers/models.rs
@@ -152,7 +152,8 @@ impl MediaDetails {
item: &crate::models::SearchResult,
preview: Option<&MediaDetails>,
) -> Self {
- if let Some(p) = preview {
+ if let Some(p) = preview.filter(|p| p.id.value == item.id && p.id.provider == item.provider)
+ {
let mut details = p.clone();
if details.title.trim().is_empty() {
details.title = item.title.clone();
@@ -176,7 +177,11 @@ impl MediaDetails {
} else {
MediaType::Movie
},
- year: Some(item.release_year.clone()),
+ year: if !item.release_year.trim().is_empty() {
+ Some(item.release_year.clone())
+ } else {
+ None
+ },
description: None,
tagline: None,
imdb_rating: None,
diff --git a/src/tui/app/keyboard.rs b/src/tui/app/keyboard.rs
index a4f4e40..0bc84de 100644
--- a/src/tui/app/keyboard.rs
+++ b/src/tui/app/keyboard.rs
@@ -487,6 +487,10 @@ impl App {
self.state.search_query.set_content(&query);
}
self.state.input_mode = InputMode::Normal;
+ if !query.starts_with('/') {
+ self.state.is_loading = true;
+ self.state.search_error = None;
+ }
self.state.search_suggestions.clear();
self.state.suggest_index = None;
self.state.search_list_state.select(None);
diff --git a/src/tui/app/mouse.rs b/src/tui/app/mouse.rs
index e7ddfd3..887038c 100644
--- a/src/tui/app/mouse.rs
+++ b/src/tui/app/mouse.rs
@@ -941,52 +941,29 @@ impl App {
let streams_count = self.state.selected_resources.len();
if streams_count > 0 {
- let list = self.state.selected_resources.clone();
-
- let clicked_stream_row = row
- .saturating_sub(streams_area.y + 1)
- .saturating_add(self.state.resource_list_state.offset() as u16);
- let mut line_offset = 0_u16;
- let mut prev_resolution = None;
- let mut matched_idx = None;
-
- for (i, file) in list.iter().enumerate() {
- let resolution = file.resolution_u64() as i64;
- if prev_resolution != Some(resolution) {
- if i > 0 {
- line_offset += 1;
- }
- line_offset += 1;
- if i == 0 {
- line_offset += 1;
+ let list_start_y = streams_area.y.saturating_add(2);
+ let list_end_y = streams_area.bottom().saturating_sub(1);
+ if row >= list_start_y && row < list_end_y {
+ let clicked_stream_row = (row - list_start_y)
+ .saturating_add(self.state.resource_list_state.offset() as u16);
+ let target_idx =
+ (clicked_stream_row as usize).min(streams_count.saturating_sub(1));
+
+ let prev_selected = self.state.resource_list_state.selected();
+ self.state.resource_list_state.select(Some(target_idx));
+
+ if prev_selected == Some(target_idx) {
+ if self.state.is_playing {
+ self.state.notify(
+ NotificationKind::Warning,
+ "Playback already active",
+ "Stop the current player before starting another.",
+ );
+ } else if !self.state.is_resolving_playback
+ && self.state.last_playback_launch.elapsed().as_millis() >= 500
+ {
+ self.action_sender.send(Action::PlayStream).ok();
}
- prev_resolution = Some(resolution);
- }
- if clicked_stream_row == line_offset {
- matched_idx = Some(i);
- break;
- }
- line_offset += 1;
- }
-
- let target_idx = matched_idx.unwrap_or_else(|| {
- (clicked_stream_row as usize / 2).min(streams_count.saturating_sub(1))
- });
-
- let prev_selected = self.state.resource_list_state.selected();
- self.state.resource_list_state.select(Some(target_idx));
-
- if prev_selected == Some(target_idx) {
- if self.state.is_playing {
- self.state.notify(
- NotificationKind::Warning,
- "Playback already active",
- "Stop the current player before starting another.",
- );
- } else if !self.state.is_resolving_playback
- && self.state.last_playback_launch.elapsed().as_millis() >= 500
- {
- self.action_sender.send(Action::PlayStream).ok();
}
}
}
diff --git a/src/tui/app/playback.rs b/src/tui/app/playback.rs
index 9fbfe27..bf5c8ec 100644
--- a/src/tui/app/playback.rs
+++ b/src/tui/app/playback.rs
@@ -35,6 +35,7 @@ impl App {
self.state
.search_preview
.as_ref()
+ .filter(|p| p.id.value == *subject_id)
.and_then(|p| p.cover_url().map(|s| s.to_string()))
});
}
@@ -43,6 +44,7 @@ impl App {
.state
.search_preview
.as_ref()
+ .filter(|p| p.id.value == *subject_id)
.and_then(|p| p.duration.as_deref().and_then(parse_duration_seconds));
}
return Some(item);
diff --git a/src/tui/app/requests.rs b/src/tui/app/requests.rs
index b43b716..c432286 100644
--- a/src/tui/app/requests.rs
+++ b/src/tui/app/requests.rs
@@ -860,8 +860,8 @@ impl App {
self.state.is_loading = false;
self.state.details_error = None;
- if self.state.language_chosen {
- if let Some(existing) = &self.state.selected_details {
+ if let Some(existing) = &self.state.selected_details {
+ if existing.id.value == id && existing.id.provider == details.id.provider {
if details.title.trim().is_empty() {
details.title = existing.title.clone();
}
@@ -883,33 +883,18 @@ impl App {
if details.imdb_rating.is_none() {
details.imdb_rating = existing.imdb_rating.clone();
}
+ if details.director.is_none() {
+ details.director = existing.director.clone();
+ }
+ if details.stars.is_none() {
+ details.stars = existing.stars.clone();
+ }
if details.dubs.is_empty() {
details.dubs = existing.dubs.clone();
}
}
}
- if let Some(existing) = &self.state.selected_details {
- if details.title.trim().is_empty() {
- details.title = existing.title.clone();
- }
- if details.year.is_none() {
- details.year = existing.year.clone();
- }
- if details.poster_url.is_none() {
- details.poster_url = existing.poster_url.clone();
- }
- if details.description.is_none() {
- details.description = existing.description.clone();
- }
- if details.imdb_rating.is_none() {
- details.imdb_rating = existing.imdb_rating.clone();
- }
- if details.genres.is_empty() {
- details.genres = existing.genres.clone();
- }
- }
-
if let Some(res) = self.state.search_results.iter().find(|r| r.id == id) {
if details.title.trim().is_empty() {
details.title = res.title.clone();
diff --git a/src/tui/screens/details.rs b/src/tui/screens/details.rs
index 77f4005..9abfd3b 100644
--- a/src/tui/screens/details.rs
+++ b/src/tui/screens/details.rs
@@ -1,7 +1,5 @@
use crate::models::{MediaDetails, ProviderKind};
-pub(crate) use crate::tui::widgets::{
- extract_media_tags, resolution_badge_spans, resolution_label,
-};
+pub(crate) use crate::tui::widgets::{extract_media_tags, resolution_badge_spans};
use crate::tui::{state::AppState, theme::Theme};
use ratatui::{
Frame,
@@ -259,15 +257,26 @@ pub fn draw(frame: &mut Frame, area: Rect, state: &mut AppState, theme: &Theme)
])
.split(area);
- let loading_text = if state.basic_terminal {
- format!("Loading details {spinner}")
+ let loading_spans = if state.basic_terminal {
+ vec![Span::styled(
+ format!("Loading details {spinner}"),
+ theme.lavender,
+ )]
} else {
- format!("{spinner} Loading details...")
+ vec![
+ Span::styled(
+ format!("{spinner} "),
+ theme.accent.add_modifier(Modifier::BOLD),
+ ),
+ Span::raw(" "),
+ Span::styled(
+ "Loading details...",
+ theme.subtext1.add_modifier(Modifier::BOLD),
+ ),
+ ]
};
- let loading_p = Paragraph::new(loading_text)
- .alignment(ratatui::layout::Alignment::Center)
- .style(theme.lavender);
-
+ let loading_p = Paragraph::new(Line::from(loading_spans))
+ .alignment(ratatui::layout::Alignment::Center);
frame.render_widget(loading_p, vertical_chunks[1]);
return;
}
@@ -295,6 +304,7 @@ pub fn draw(frame: &mut Frame, area: Rect, state: &mut AppState, theme: &Theme)
state
.search_preview
.as_ref()
+ .filter(|p| p.id.value == details.id.value && p.id.provider == details.id.provider)
.and_then(|p| p.description.as_deref())
})
.unwrap_or("No description available.");
@@ -925,42 +935,14 @@ pub fn draw(frame: &mut Frame, area: Rect, state: &mut AppState, theme: &Theme)
let list = &state.selected_resources;
if !list.is_empty() {
- let mut prev_quality = String::new();
let selected_idx = state.resource_list_state.selected();
- let mut count_2160 = 0usize;
- let mut count_1080 = 0usize;
- let mut count_720 = 0usize;
- let mut count_480 = 0usize;
- let mut count_other = 0usize;
- for file in list {
- match file.resolution_u64() {
- 2160 => count_2160 += 1,
- 1080 => count_1080 += 1,
- 720 => count_720 += 1,
- 480 => count_480 += 1,
- _ => count_other += 1,
- }
- }
- let quality_count = |label: &str| match label {
- "4K" => count_2160,
- "1080p" => count_1080,
- "720p" => count_720,
- "480p" => count_480,
- _ => count_other,
- };
let list_items: Vec<ListItem> = list
.iter()
.enumerate()
.map(|(i, file)| {
let resolution = file.resolution_u64() as i64;
- let quality_label = resolution_label(resolution);
-
- let is_first_of_quality = quality_label != prev_quality;
- prev_quality = quality_label.to_string();
-
let codec = file.codec.as_deref().unwrap_or("None");
-
let duration_str = "--:--".to_string();
let size_formatted = file
@@ -969,25 +951,12 @@ pub fn draw(frame: &mut Frame, area: Rect, state: &mut AppState, theme: &Theme)
.unwrap_or_else(|| "--".to_string());
let is_selected = Some(i) == selected_idx;
- let pointer = if is_selected {
- selection_symbol(streams_focused, state.basic_terminal)
- } else {
- " "
- };
let row_style = if is_selected {
selection_style(streams_focused, state.basic_terminal, theme)
} else {
metadata_style(theme)
};
- let marker_style = if is_selected && streams_focused {
- with_selection_surface(theme.accent, state.basic_terminal, theme)
- .add_modifier(Modifier::BOLD)
- } else if is_selected {
- theme.accent
- } else {
- metadata_style(theme)
- };
let primary_style = if is_selected {
with_selection_surface(theme.text, state.basic_terminal, theme)
.add_modifier(Modifier::BOLD)
@@ -1003,18 +972,13 @@ pub fn draw(frame: &mut Frame, area: Rect, state: &mut AppState, theme: &Theme)
let is_fourk = file.provider == ProviderKind::FourKHdHub;
let release_title = crate::tui::text::clean_stream_text(&file.filename);
let upload_by = crate::tui::text::clean_stream_text(file.source_label());
- let _language = file
- .language
- .as_deref()
- .map(crate::tui::text::clean_stream_text)
- .unwrap_or_else(|| "Unknown".to_string());
let source_count = file.mirrors.len() as u64;
let is_ultra_compact = streams_area.width < 58;
let is_compact = streams_area.width < 85;
let is_wide = streams_area.width >= 115;
let stream_width = streams_area.width.saturating_sub(6) as usize;
- let mut stream_spans = vec![Span::styled(pointer, marker_style)];
+ let mut stream_spans = Vec::new();
stream_spans.extend(resolution_badge_spans(
resolution,
@@ -1109,75 +1073,57 @@ pub fn draw(frame: &mut Frame, area: Rect, state: &mut AppState, theme: &Theme)
));
}
- let mut lines = vec![];
- if is_first_of_quality {
- if i > 0 {
- lines.push(ratatui::text::Line::from(""));
- }
- let option_count = quality_count(quality_label).max(1);
- let header_spans = vec![
- Span::styled(quality_label, theme.highlight.add_modifier(Modifier::BOLD)),
- Span::styled(" · ", theme.overlay0),
- Span::styled(
- format!(
- "{option_count} option{}",
- if option_count == 1 { "" } else { "s" }
- ),
- theme.subtext1,
- ),
- ];
- lines.push(ratatui::text::Line::from(header_spans));
- lines.push(ratatui::text::Line::from(stream_table_header_spans(
- streams_area.width,
- theme,
- )));
- }
- lines.push(ratatui::text::Line::from(stream_spans));
-
- ListItem::new(lines).style(row_style)
+ ListItem::new(ratatui::text::Line::from(stream_spans)).style(row_style)
})
.collect();
- let streams_list = List::new(list_items)
- .block(streams_block.clone())
- .highlight_style(selection_style(
- streams_focused,
- state.basic_terminal,
- theme,
- ))
- .highlight_symbol(selection_symbol(streams_focused, state.basic_terminal));
-
- frame.render_stateful_widget(streams_list, streams_area, &mut state.resource_list_state);
-
- let mut headings = 0;
- let mut prev_q = String::new();
- for file in list {
- let resolution = file.resolution_u64() as i64;
- let label = resolution_label(resolution);
- if label != prev_q {
- headings += 2;
- prev_q = label.to_string();
- }
+ frame.render_widget(streams_block.clone(), streams_area);
+ let inner_streams = streams_block.inner(streams_area);
+
+ if inner_streams.height >= 2 {
+ let stream_chunks =
+ Layout::vertical([Constraint::Length(1), Constraint::Min(1)]).split(inner_streams);
+
+ let header_spans = stream_table_header_spans(streams_area.width, theme);
+ frame.render_widget(
+ Paragraph::new(ratatui::text::Line::from(header_spans)),
+ stream_chunks[0],
+ );
+
+ let streams_list = List::new(list_items)
+ .highlight_style(selection_style(
+ streams_focused,
+ state.basic_terminal,
+ theme,
+ ))
+ .highlight_symbol(selection_symbol(streams_focused, state.basic_terminal));
+
+ frame.render_stateful_widget(
+ streams_list,
+ stream_chunks[1],
+ &mut state.resource_list_state,
+ );
+ } else {
+ let streams_list = List::new(list_items)
+ .highlight_style(selection_style(
+ streams_focused,
+ state.basic_terminal,
+ theme,
+ ))
+ .highlight_symbol(selection_symbol(streams_focused, state.basic_terminal));
+
+ frame.render_stateful_widget(
+ streams_list,
+ inner_streams,
+ &mut state.resource_list_state,
+ );
}
- let content_height = list.len() + headings;
- let rendered_position = selected_idx.map_or(0, |selected| {
- let mut headings = 0;
- let mut prev_q = String::new();
- for file in list.iter().take(selected.saturating_add(1)) {
- let resolution = file.resolution_u64() as i64;
- let label = resolution_label(resolution);
- if label != prev_q {
- headings += 2;
- prev_q = label.to_string();
- }
- }
- selected + headings
- });
+
render_scroll_indicator(
frame,
streams_area,
- content_height,
- rendered_position,
+ list.len(),
+ selected_idx.unwrap_or(0),
theme,
state.basic_terminal,
);
@@ -1198,12 +1144,12 @@ pub fn draw(frame: &mut Frame, area: Rect, state: &mut AppState, theme: &Theme)
} else {
format!("{error} — press r to retry or Ctrl+P to switch provider.")
}
- } else if state.is_fetching_streams {
+ } else if state.is_fetching_streams || state.is_loading {
let spinner = stream_loading_spinner(state.tick_count, state.basic_terminal);
if state.basic_terminal {
format!("Loading streams {spinner}")
} else {
- format!("{spinner} Loading streams...")
+ format!("{spinner} Loading streams...")
}
} else {
format!(
@@ -1215,8 +1161,10 @@ pub fn draw(frame: &mut Frame, area: Rect, state: &mut AppState, theme: &Theme)
theme.error
} else if waiting_for_language {
theme.text_dim
- } else {
+ } else if state.is_fetching_streams || state.is_loading {
theme.lavender
+ } else {
+ theme.text_dim
};
let inner = streams_block.inner(streams_area);
@@ -1639,12 +1587,12 @@ fn stream_table_header_spans(width: u16, theme: &Theme) -> Vec<Span<'static>> {
)]
} else if width < 115 {
vec![Span::styled(
- " RES SIZE MEDIA TAGS DURATION RELEASE",
+ " RES SIZE MEDIA TAGS DURATION RELEASE",
header_style,
)]
} else {
vec![Span::styled(
- " RES SIZE MEDIA TAGS DURATION UPLOADER RELEASE",
+ " RES SIZE MEDIA TAGS DURATION UPLOADER RELEASE",
header_style,
)]
}
@@ -1920,14 +1868,106 @@ mod tests {
.map(|cell| cell.symbol())
.collect::<String>();
- assert!(content.contains("1080p · 2 options"));
- assert!(content.contains("720p · 1 option"));
+ assert!(content.contains("RES"));
+ assert!(content.contains("SIZE"));
+ assert!(content.contains("MEDIA TAGS"));
assert!(content.contains("1080p"));
+ assert!(content.contains("720p"));
assert!(content.contains("1.0GB"));
assert!(content.contains("HEVC"));
assert!(content.contains("Pahe.in"));
}
+ #[test]
+ fn test_stream_selection_highlighting_isolated_to_row() {
+ let backend = ratatui::backend::TestBackend::new(120, 30);
+ let mut terminal = ratatui::Terminal::new(backend).unwrap();
+ let mut state = AppState {
+ selected_details: Some(MediaDetails {
+ id: ProviderMediaId {
+ provider: ProviderKind::MovieBox,
+ value: "dune2".to_string(),
+ },
+ title: "Dune: Part Two".to_string(),
+ media_type: MediaType::Movie,
+ year: Some("2024".to_string()),
+ description: Some("Epic continuation".to_string()),
+ tagline: None,
+ imdb_rating: Some("8.6".to_string()),
+ director: None,
+ stars: None,
+ prints: None,
+ audios: None,
+ poster_url: None,
+ duration: Some("166m".to_string()),
+ genres: vec!["Sci-Fi".to_string()],
+ seasons: vec![],
+ dubs: vec![],
+ }),
+ selected_resources: vec![
+ Release {
+ provider: ProviderKind::MovieBox,
+ filename: "Dune.Part.Two.2024.1080p.WEBRip.x265".to_string(),
+ quality: Some("1080p".to_string()),
+ codec: Some("hevc".to_string()),
+ language: Some("English".to_string()),
+ size_bytes: Some(1073741824),
+ season: None,
+ episode: None,
+ mirrors: vec![],
+ },
+ Release {
+ provider: ProviderKind::MovieBox,
+ filename: "Dune.Part.Two.2024.720p.WEBRip.x264".to_string(),
+ quality: Some("720p".to_string()),
+ codec: Some("h264".to_string()),
+ language: Some("English".to_string()),
+ size_bytes: Some(500000000),
+ season: None,
+ episode: None,
+ mirrors: vec![],
+ },
+ ],
+ details_pane: crate::tui::state::DetailsPane::Streams,
+ ..Default::default()
+ };
+ state.resource_list_state.select(Some(0));
+ let theme = Theme::mocha();
+
+ terminal
+ .draw(|frame| {
+ draw(frame, frame.area(), &mut state, &theme);
+ })
+ .unwrap();
+
+ let buffer = terminal.backend().buffer();
+ let mut found_header = false;
+ let mut header_has_selection_bg = false;
+
+ let sel_style = selection_style(true, false, &theme);
+
+ for y in 0..buffer.area.height {
+ let row_symbols: String = (0..buffer.area.width)
+ .map(|x| buffer[(x, y)].symbol())
+ .collect();
+ if row_symbols.contains("RES") && row_symbols.contains("SIZE") {
+ found_header = true;
+ for x in 0..buffer.area.width {
+ let cell = &buffer[(x, y)];
+ if cell.style().bg == sel_style.bg && sel_style.bg.is_some() {
+ header_has_selection_bg = true;
+ }
+ }
+ }
+ }
+
+ assert!(found_header, "Streams table header row should be rendered");
+ assert!(
+ !header_has_selection_bg,
+ "Streams table header should not have selection background"
+ );
+ }
+
#[test]
fn test_extract_media_tags() {
let tags = extract_media_tags(
diff --git a/src/tui/screens/home.rs b/src/tui/screens/home.rs
index 710baaf..670ab00 100644
--- a/src/tui/screens/home.rs
+++ b/src/tui/screens/home.rs
@@ -23,12 +23,7 @@ enum SearchViewState {
fn search_view_state(state: &AppState) -> SearchViewState {
if state.input_mode == InputMode::Editing {
SearchViewState::Editing
- } else if state.is_loading
- && (!state.search_query.trim().is_empty()
- || state.active_browse_preset.is_some()
- || state.active_addon_catalog.is_some()
- || state.is_homepage_mode)
- {
+ } else if state.is_loading {
SearchViewState::Loading
} else if state.search_error.is_some() {
SearchViewState::Error
@@ -258,13 +253,13 @@ fn render_search_state(
match view {
SearchViewState::Loading => {
- let msg = if state.basic_terminal {
+ if state.basic_terminal {
let dots = match (state.tick_count / 4) % 3 {
0 => ".",
1 => "..",
_ => "...",
};
- if let Some(preset) = state.active_browse_preset {
+ let text = if let Some(preset) = state.active_browse_preset {
format!("Loading {}{dots}", preset.label())
} else if let Some(catalog) = &state.active_addon_catalog {
format!("Loading {}{dots}", catalog.label)
@@ -274,25 +269,34 @@ fn render_search_state(
format!("Searching for “{query}”{dots}")
} else {
format!("Loading{dots}")
- }
+ };
+ lines.push(Line::from(vec![Span::styled(text, theme.lavender)]));
} else {
const SPINNER_FRAMES: [&str; 10] =
["⠋", "⠙", "⠹", "⠸", "⠼", "⠴", "⠦", "⠧", "⠇", "⠏"];
let spinner =
SPINNER_FRAMES[(state.tick_count as usize / 2) % SPINNER_FRAMES.len()];
- if let Some(preset) = state.active_browse_preset {
- format!("{spinner} Loading {}", preset.label())
+ let text = if let Some(preset) = state.active_browse_preset {
+ format!("Loading {}", preset.label())
} else if let Some(catalog) = &state.active_addon_catalog {
- format!("{spinner} Loading {}", catalog.label)
+ format!("Loading {}", catalog.label)
} else if state.is_homepage_mode {
- format!("{spinner} Loading discover")
+ "Loading discover".to_string()
} else if !state.search_query.trim().is_empty() {
- format!("{spinner} Searching for “{query}”")
+ format!("Searching for “{query}”")
} else {
- format!("{spinner} Loading")
- }
- };
- lines.push(Line::from(vec![Span::styled(msg, theme.lavender)]));
+ "Loading".to_string()
+ };
+
+ lines.push(Line::from(vec![
+ Span::styled(
+ format!("{spinner} "),
+ theme.accent.add_modifier(Modifier::BOLD),
+ ),
+ Span::raw(" "),
+ Span::styled(text, theme.subtext1.add_modifier(Modifier::BOLD)),
+ ]));
+ }
}
SearchViewState::NoResults => {
let symbol = if state.basic_terminal { "-" } else { "·" };
@@ -427,6 +431,10 @@ fn render_search_state(
card_width = (max_line_width + 4)
.clamp(32, area.width.saturating_sub(2))
.min(72);
+ } else if view == SearchViewState::Loading {
+ card_width = (max_line_width + 2)
+ .clamp(24, area.width.saturating_sub(2))
+ .min(64);
}
let is_boxed = matches!(view, SearchViewState::Error | SearchViewState::NoResults);
@@ -1741,7 +1749,11 @@ pub fn draw(frame: &mut Frame, area: Rect, state: &mut AppState, theme: &Theme)
state.basic_terminal,
));
} else {
- if let Some(meta) = &state.search_preview {
+ let matching_meta = state
+ .search_preview
+ .as_ref()
+ .filter(|m| m.id.value == res.id && m.id.provider == res.provider);
+ if let Some(meta) = matching_meta {
if is_selected {
if let Some(r) = meta.imdb_rating.as_deref() {
let star = if state.basic_terminal { "* " } else { "★ " };
diff --git a/tests/addons_manifest.rs b/tests/addons_manifest.rs
index c719bda..2caa5ec 100644
--- a/tests/addons_manifest.rs
+++ b/tests/addons_manifest.rs
@@ -95,7 +95,11 @@ fn test_addon_series_metadata_and_episodes_decomposition() {
genre: vec![],
runtime: Some("49 min".to_string()),
cast: vec!["Bryan Cranston".to_string(), "Aaron Paul".to_string()],
+ stars: vec![],
director: vec!["Vince Gilligan".to_string()],
+ directors: vec![],
+ writer: vec![],
+ writers: vec![],
videos: vec![
MetaVideo {
id: Some("tt0903747:1:1".to_string()),
@@ -173,7 +177,11 @@ fn test_addon_series_classification_and_default_season_structure() {
genre: vec![],
runtime: Some("45 min".to_string()),
cast: vec![],
+ stars: vec![],
director: vec![],
+ directors: vec![],
+ writer: vec![],
+ writers: vec![],
videos: vec![],
};
diff --git a/tests/content_pipeline.rs b/tests/content_pipeline.rs
index 7aeeda2..549e682 100644
--- a/tests/content_pipeline.rs
+++ b/tests/content_pipeline.rs
@@ -1,4 +1,5 @@
use moviebox_tui::{
+ models::SearchResult,
providers::{
addons::{
adapter::{meta_detail_to_media_details, meta_to_catalog_item},
@@ -296,7 +297,11 @@ fn test_addon_metadata_mapping_and_partial_data_degradation() {
genre: vec![],
runtime: None,
cast: vec![],
+ stars: vec![],
director: vec![],
+ directors: vec![],
+ writer: vec![],
+ writers: vec![],
videos: vec![],
};
@@ -330,7 +335,11 @@ fn test_addon_metadata_mapping_and_partial_data_degradation() {
genre: vec![],
runtime: Some("45 min".to_string()),
cast: vec!["Actor One".to_string(), "Actor Two".to_string()],
+ stars: vec![],
director: vec!["Director Name".to_string()],
+ directors: vec![],
+ writer: vec![],
+ writers: vec![],
videos: vec![
MetaVideo {
id: Some("ep1".to_string()),
@@ -492,3 +501,83 @@ async fn test_poster_identity_isolation() {
assert!(app.state().poster_image.is_some());
}
+
+#[tokio::test]
+async fn test_search_preview_and_details_metadata_isolation() {
+ let mut app = App::new();
+ app.state_mut().update_available = None;
+
+ let old_preview = MediaDetails {
+ id: ProviderMediaId {
+ provider: ProviderKind::Addons,
+ value: "tt_old_movie".to_string(),
+ },
+ title: "Old Movie Title".to_string(),
+ media_type: MediaType::Movie,
+ year: Some("2020".to_string()),
+ description: Some("Old Movie Description".to_string()),
+ tagline: None,
+ imdb_rating: Some("8.5".to_string()),
+ director: Some("Old Director".to_string()),
+ stars: Some("Old Star".to_string()),
+ prints: None,
+ audios: None,
+ poster_url: Some("https://example.com/old.jpg".to_string()),
+ duration: Some("120 min".to_string()),
+ genres: vec!["Action".to_string()],
+ seasons: vec![],
+ dubs: vec![],
+ };
+
+ let new_search_result = SearchResult {
+ id: "tt_new_movie".to_string(),
+ title: "New Movie Title".to_string(),
+ stype: 1,
+ release_year: "2025".to_string(),
+ cover_url: Some("https://example.com/new.jpg".to_string()),
+ season: 0,
+ episode: 0,
+ provider: ProviderKind::Addons,
+ };
+
+ // Mismatched preview should NOT leak description/director/stars/rating into fallback
+ let fallback = MediaDetails::from_search_result(&new_search_result, Some(&old_preview));
+ assert_eq!(fallback.id.value, "tt_new_movie");
+ assert_eq!(fallback.title, "New Movie Title");
+ assert_eq!(fallback.year.as_deref(), Some("2025"));
+ assert!(fallback.description.is_none());
+ assert!(fallback.director.is_none());
+ assert!(fallback.stars.is_none());
+ assert!(fallback.imdb_rating.is_none());
+
+ // Matching preview SHOULD preserve preview details
+ let matching_preview = MediaDetails {
+ id: ProviderMediaId {
+ provider: ProviderKind::Addons,
+ value: "tt_new_movie".to_string(),
+ },
+ title: "New Movie Title".to_string(),
+ media_type: MediaType::Movie,
+ year: Some("2025".to_string()),
+ description: Some("New Movie Description".to_string()),
+ tagline: None,
+ imdb_rating: Some("7.9".to_string()),
+ director: Some("New Director".to_string()),
+ stars: Some("New Star".to_string()),
+ prints: None,
+ audios: None,
+ poster_url: Some("https://example.com/new.jpg".to_string()),
+ duration: Some("140 min".to_string()),
+ genres: vec!["Drama".to_string()],
+ seasons: vec![],
+ dubs: vec![],
+ };
+ let matching_fallback =
+ MediaDetails::from_search_result(&new_search_result, Some(&matching_preview));
+ assert_eq!(matching_fallback.id.value, "tt_new_movie");
+ assert_eq!(
+ matching_fallback.description.as_deref(),
+ Some("New Movie Description")
+ );
+ assert_eq!(matching_fallback.director.as_deref(), Some("New Director"));
+}