Skip to content

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

feat(tui): add anchored provider popup menu and guard empty search clear

Samir Hossainsbf5a25ddfaff
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 4139064..631b66d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,6 +3,10 @@
## [Unreleased]
### Added
+- **Anchored Provider Selection Menu**:
+ - Replaced immediate mouse cycling on the landing search bar provider badge (`[MovieBox · ^P]`) with a styled popup menu anchored directly beneath the provider badge.
+ - Added dedicated keyboard navigation (`↑`/`↓`/`k`/`j`, `Home`/`End`, `Enter`/`Space`, `Esc`) for the provider menu while preserving direct `Ctrl+P` sequential provider cycling across all screens.
+ - Implemented shared geometry (`search_bar_provider_pill_rect` and `provider_popup_bounds`) between renderers and mouse hitboxes, ensuring exact alignment and zero geometry divergence.
- **Native Android ARM64 Release Target & Pipeline**:
- Added native `aarch64-linux-android` build target to the release workflow (`.github/workflows/release.yml`) using Android NDK r26d and Clang (API 24+).
- Configured automated packaging of `MovieBox_Android_arm64.tar.gz` with native Bionic dynamic linking (`libc.so`), valid ELF `PT_PHDR` program header table, and `/system/bin/linker64` dynamic loader.
@@ -18,6 +22,9 @@
- Added documentation build integrity validation step in CI hygiene pipeline (`.github/workflows/ci.yml`).
### Fixed
+- **Empty Search Clear Guarding on Landing Screen**:
+ - Guarded search-cleared status notifications in `Action::GoBack`, `c`/`C`, and `Ctrl+U` to only fire when an active search query or loaded results actually existed, eliminating spurious "Search cleared." status messages when navigating on an already-empty landing page.
+ - Allowed pressing Enter on an empty search input in editing mode to cleanly switch back to normal mode without triggering unneeded state resets.
- **MovieBox DASH Stream Download Engine & Header Authentication**:
- Forwarded mirror authentication headers (`Cookie` containing CloudFront signed policy and `Referer`) through `Action::StartDownload` and `start_resilient_download`, eliminating `HTTP 403 Forbidden` errors on MovieBox CDN downloads.
- Added dedicated MPEG-DASH stream engine utilizing `yt-dlp` to assemble multi-track audio/video manifests (`index.mpd`) into `.mp4`, maintaining full feature parity with progressive single-file downloads.
diff --git a/docs/controls.md b/docs/controls.md
index 743c437..5691669 100644
--- a/docs/controls.md
+++ b/docs/controls.md
@@ -43,7 +43,7 @@ Text editing across Search, TV Playlist Manager, and Addon Manager uses a unifie
## Modal Dialogs & Pickers
-All popup dialogs (Theme picker, Browse categories, Settings Media Player picker, TV Manager, Addon Manager, Download Confirmation) support standard keyboard controls:
+All popup dialogs (Theme picker, Browse categories, Provider menu, Settings Media Player picker, TV Manager, Addon Manager, Download Confirmation) support standard keyboard controls:
- **`↑` / `↓` / `k` / `j`**: Move selection up / down by one item (vim keys `k`/`j` supported in pickers such as theme selector in Settings).
- **`Home` / `End`**: Jump immediately to the first or last item in the list.
@@ -87,8 +87,8 @@ All popup dialogs (Theme picker, Browse categories, Settings Media Player picker
| Action | Result |
| :--- | :--- |
+| **Click provider badge** | Open anchored provider selection menu; click provider to switch directly |
| **Click search bar** | Enter search input mode |
-| **Click suggestion item** | Search for that suggestion immediately |
| **Click search result row** | Select item and load preview; click again to open full details |
| **Click landing deck tab header** | Switch between Continue Watching and Favorites tabs |
| **Click Continue Watching row (landing)** | Select an in-progress title; click again to resume playback with auto-play |
diff --git a/docs/providers.md b/docs/providers.md
index 420a95e..d09a52a 100644
--- a/docs/providers.md
+++ b/docs/providers.md
@@ -17,6 +17,7 @@ shared typed models in `providers/models.rs` and the moviebox JSON schema used b
BDIX sources are only reachable from supported Bangladeshi ISPs and are hidden by
default (`bdix_enabled` in config; `/settings` → Content Modes → BDIX Sources).
+Active streaming providers can be cycled via `Ctrl+P` or visually selected by clicking the provider badge (`[MovieBox · ^P]`) on the landing search bar to open the anchored provider popup menu.
## Shared Provider Contract
Search, details, and episode-streams are dispatched per provider. Pluggable provider seams
diff --git a/src/tui/app/keyboard.rs b/src/tui/app/keyboard.rs
index 383edb7..16578ac 100644
--- a/src/tui/app/keyboard.rs
+++ b/src/tui/app/keyboard.rs
@@ -128,6 +128,56 @@ impl App {
return None;
}
}
+ if self.state.show_provider_popup {
+ let available = self.state.available_providers();
+ let total_count = available.len();
+
+ match key.code {
+ KeyCode::Char('p') if key.modifiers.contains(KeyModifiers::CONTROL) => {
+ self.state.show_provider_popup = false;
+ self.state.provider_list_state.select(None);
+ self.cycle_provider();
+ }
+ KeyCode::Esc => {
+ self.state.show_provider_popup = false;
+ self.state.provider_list_state.select(None);
+ }
+ KeyCode::Up | KeyCode::Char('k') => {
+ crate::tui::state::cycle_list_selection(
+ &mut self.state.provider_list_state,
+ total_count,
+ false,
+ );
+ }
+ KeyCode::Down | KeyCode::Char('j') => {
+ crate::tui::state::cycle_list_selection(
+ &mut self.state.provider_list_state,
+ total_count,
+ true,
+ );
+ }
+ KeyCode::Home => {
+ if total_count > 0 {
+ self.state.provider_list_state.select(Some(0));
+ }
+ }
+ KeyCode::End => {
+ if total_count > 0 {
+ self.state.provider_list_state.select(Some(total_count - 1));
+ }
+ }
+ KeyCode::Enter | KeyCode::Char(' ') => {
+ let index = self.state.provider_list_state.selected().unwrap_or(0);
+ if let Some(&provider) = available.get(index) {
+ self.switch_provider(provider);
+ }
+ self.state.show_provider_popup = false;
+ self.state.provider_list_state.select(None);
+ }
+ _ => {}
+ }
+ return None;
+ }
if self.state.show_browse_popup {
let is_addon = self.state.mode() == crate::tui::state::AppMode::Addon;
@@ -429,9 +479,13 @@ impl App {
InputMode::Editing => {
if key.modifiers.contains(KeyModifiers::CONTROL) {
if let KeyCode::Char('u') = key.code {
+ let had_search = !self.state.search_query.trim().is_empty()
+ || !self.state.search_results.is_empty();
self.state.clear_search_state();
self.state.input_mode = InputMode::Normal;
- self.state.set_status_default("Search cleared.");
+ if had_search {
+ self.state.set_status_default("Search cleared.");
+ }
return None;
}
if let KeyCode::Char('w') = key.code {
@@ -495,6 +549,10 @@ impl App {
force_refresh: false,
})
.ok();
+ } else {
+ self.state.input_mode = InputMode::Normal;
+ self.state.search_suggestions.clear();
+ self.state.suggest_index = None;
}
}
KeyCode::Tab => {
@@ -915,9 +973,13 @@ impl App {
KeyCode::Char('c') | KeyCode::Char('C')
if self.state.download_progress.is_none() =>
{
+ let had_search = !self.state.search_query.trim().is_empty()
+ || !self.state.search_results.is_empty();
self.state.clear_search_state();
self.state.input_mode = InputMode::Normal;
- self.state.set_status_default("Search cleared.");
+ if had_search {
+ self.state.set_status_default("Search cleared.");
+ }
}
KeyCode::Char('f') | KeyCode::Char('F')
if self.state.favorites_available()
@@ -1342,4 +1404,69 @@ mod tests {
assert_eq!(app.state.search_list_state.selected(), None);
assert_eq!(app.state.input_mode, InputMode::Normal);
}
+ #[tokio::test]
+ async fn test_provider_popup_keyboard_navigation() {
+ let mut app = App::new();
+ app.state.active_screen = crate::tui::state::Screen::Home;
+ app.state.input_mode = InputMode::Normal;
+ app.state.active_provider = crate::models::ProviderKind::MovieBox;
+ app.state.show_provider_popup = true;
+ app.state.provider_list_state.select(Some(0));
+
+ app.handle_key(KeyEvent::new(KeyCode::Down, KeyModifiers::empty()))
+ .await;
+ assert_eq!(app.state.provider_list_state.selected(), Some(1));
+
+ app.handle_key(KeyEvent::new(KeyCode::Enter, KeyModifiers::empty()))
+ .await;
+ assert!(!app.state.show_provider_popup);
+ let expected = app.state.available_providers()[1];
+ assert_eq!(app.state.active_provider, expected);
+
+ app.state.show_provider_popup = true;
+ app.state.provider_list_state.select(Some(0));
+ app.handle_key(KeyEvent::new(KeyCode::Esc, KeyModifiers::empty()))
+ .await;
+ assert!(!app.state.show_provider_popup);
+ assert_eq!(app.state.provider_list_state.selected(), None);
+
+ app.state.show_provider_popup = true;
+ app.state.provider_list_state.select(Some(0));
+ let before_provider = app.state.active_provider;
+ app.handle_key(KeyEvent::new(KeyCode::Char('p'), KeyModifiers::CONTROL))
+ .await;
+ assert!(!app.state.show_provider_popup);
+ assert_ne!(app.state.active_provider, before_provider);
+ }
+
+ #[tokio::test]
+ async fn test_empty_search_clear_does_not_set_status() {
+ let mut app = App::new();
+ app.state.active_screen = crate::tui::state::Screen::Home;
+ app.state.input_mode = InputMode::Normal;
+ app.state.search_query.clear();
+ app.state.search_results.clear();
+
+ app.handle_key(KeyEvent::new(KeyCode::Char('c'), KeyModifiers::empty()))
+ .await;
+ assert_eq!(app.state.status_message, "");
+
+ app.handle_key(KeyEvent::new(KeyCode::Esc, KeyModifiers::empty()))
+ .await;
+ while let Ok(action) = app.action_receiver.try_recv() {
+ app.handle_action(action).await;
+ }
+ assert_eq!(app.state.status_message, "");
+
+ app.state.input_mode = InputMode::Editing;
+ app.handle_key(KeyEvent::new(KeyCode::Enter, KeyModifiers::empty()))
+ .await;
+ assert_eq!(app.state.input_mode, InputMode::Normal);
+ assert_eq!(app.state.status_message, "");
+
+ app.state.search_query.set_content("inception");
+ app.handle_key(KeyEvent::new(KeyCode::Char('c'), KeyModifiers::empty()))
+ .await;
+ assert_eq!(app.state.status_message, "Search cleared.");
+ }
}
diff --git a/src/tui/app/mouse.rs b/src/tui/app/mouse.rs
index b9863d7..4a043d1 100644
--- a/src/tui/app/mouse.rs
+++ b/src/tui/app/mouse.rs
@@ -467,6 +467,30 @@ impl App {
width: card_width,
height: rows.rects[rows.search].height,
};
+ if self.state.show_provider_popup {
+ let available = self.state.available_providers();
+ let (_container_area, inner_area) =
+ crate::tui::screens::home::provider_popup_bounds(
+ area,
+ search_card_area,
+ available.len(),
+ );
+
+ if col >= inner_area.left()
+ && col < inner_area.right()
+ && row >= inner_area.top()
+ && row < inner_area.bottom()
+ {
+ let clicked_idx = (row - inner_area.top()) as usize;
+ if let Some(&provider) = available.get(clicked_idx) {
+ self.switch_provider(provider);
+ }
+ }
+
+ self.state.show_provider_popup = false;
+ self.state.provider_list_state.select(None);
+ return None;
+ }
if row == rows.rects[rows.mode_row].y {
self.handle_home_bottom_bar_click(col, area.width);
@@ -529,24 +553,26 @@ impl App {
&& row >= search_card_area.top()
&& row < search_card_area.bottom()
{
- let is_ultra_compact = area.width < 58;
let is_query_empty = self.state.search_query.is_empty();
if is_query_empty {
- let pill_len = if self.state.is_tv_mode {
- if is_ultra_compact { 4 } else { 16 }
- } else if self.state.is_addon_mode {
- if is_ultra_compact { 8 } else { 16 }
- } else {
- let label_len = self.state.active_provider.label().chars().count() as u16;
- if is_ultra_compact {
- label_len + 2
- } else {
- label_len + 12
- }
- };
- if col >= search_card_area.right().saturating_sub(pill_len + 2) {
+ let pill_rect = crate::tui::screens::home::search_bar_provider_pill_rect(
+ search_card_area,
+ &self.state,
+ );
+ if col >= pill_rect.left()
+ && col < pill_rect.right()
+ && row >= pill_rect.top()
+ && row < pill_rect.bottom()
+ {
if self.state.mode() == crate::tui::state::AppMode::Streaming {
- self.cycle_provider();
+ let available = self.state.available_providers();
+ let current_idx = available
+ .iter()
+ .position(|p| *p == self.state.active_provider)
+ .unwrap_or(0);
+ self.state.show_provider_popup = true;
+ self.state.provider_list_state.select(Some(current_idx));
+ self.state.input_mode = InputMode::Normal;
} else if self.state.mode() == crate::tui::state::AppMode::Tv {
self.action_sender.send(Action::ToggleTvMode).ok();
} else if self.state.mode() == crate::tui::state::AppMode::Addon {
@@ -1379,4 +1405,57 @@ mod tests {
app.handle_home_mouse(btn1.x + 1, btn1.y, area);
assert_ne!(app.state.active_provider, ProviderKind::FourKHdHub);
}
+ #[tokio::test]
+ async fn test_home_provider_pill_mouse_click_opens_popup() {
+ let mut app = App::new();
+ app.state.active_screen = crate::tui::state::Screen::Home;
+ app.state.input_mode = crate::tui::state::InputMode::Normal;
+ app.state.active_provider = ProviderKind::MovieBox;
+ app.state.search_query.clear();
+
+ let area = Rect::new(0, 0, 100, 30);
+ let card_width = crate::tui::screens::home::search_deck_width(area, &app.state, true);
+ let card_x = area.x + area.width.saturating_sub(card_width) / 2;
+ let (_tier, rows) = crate::tui::screens::home::landing_split(
+ area,
+ app.state.is_tv_mode,
+ app.state.basic_terminal,
+ app.state.landing_deck_visible(),
+ );
+ let search_card_area = Rect {
+ x: card_x,
+ y: rows.rects[rows.search].y,
+ width: card_width,
+ height: rows.rects[rows.search].height,
+ };
+
+ let pill_rect =
+ crate::tui::screens::home::search_bar_provider_pill_rect(search_card_area, &app.state);
+
+ app.handle_home_mouse(pill_rect.x + 1, pill_rect.y, area);
+ assert!(app.state.show_provider_popup);
+ assert_eq!(app.state.provider_list_state.selected(), Some(0));
+
+ let available = app.state.available_providers();
+ let (_container, inner) = crate::tui::screens::home::provider_popup_bounds(
+ area,
+ search_card_area,
+ available.len(),
+ );
+
+ let fourk_idx = available
+ .iter()
+ .position(|p| *p == ProviderKind::FourKHdHub)
+ .unwrap();
+ let target_y = inner.y + fourk_idx as u16;
+ app.handle_home_mouse(inner.x + 1, target_y, area);
+ assert!(!app.state.show_provider_popup);
+ assert_eq!(app.state.active_provider, ProviderKind::FourKHdHub);
+
+ app.handle_home_mouse(pill_rect.x + 1, pill_rect.y, area);
+ assert!(app.state.show_provider_popup);
+ app.handle_home_mouse(area.x, area.y, area);
+ assert!(!app.state.show_provider_popup);
+ assert_eq!(app.state.active_provider, ProviderKind::FourKHdHub);
+ }
}
diff --git a/src/tui/app/navigation.rs b/src/tui/app/navigation.rs
index 2d68cd7..eadac02 100644
--- a/src/tui/app/navigation.rs
+++ b/src/tui/app/navigation.rs
@@ -76,10 +76,7 @@ impl App {
}
pub(super) fn cycle_provider(&mut self) {
- let available_providers: Vec<ProviderKind> = ProviderKind::ENABLED
- .into_iter()
- .filter(|p| !p.is_bdix() || self.state.bdix_enabled)
- .collect();
+ let available_providers = self.state.available_providers();
if available_providers.is_empty() {
return;
@@ -366,6 +363,11 @@ impl App {
self.state.browse_list_state.select(None);
return None;
}
+ if self.state.show_provider_popup {
+ self.state.show_provider_popup = false;
+ self.state.provider_list_state.select(None);
+ return None;
+ }
if self.state.favorites_focus {
self.state.favorites_focus = false;
self.state.favorites_landing_state.select(None);
@@ -391,6 +393,8 @@ impl App {
self.state.last_search_edit = std::time::Instant::now();
return None;
}
+ let had_search = !self.state.search_query.trim().is_empty()
+ || !self.state.search_results.is_empty();
self.state.is_loading = false;
self.state.active_search_request =
self.state.active_search_request.wrapping_add(1);
@@ -399,7 +403,9 @@ impl App {
self.state.active_preview_request =
self.state.active_preview_request.wrapping_add(1);
self.state.clear_search_state();
- self.state.set_status_default("Search cleared.");
+ if had_search {
+ self.state.set_status_default("Search cleared.");
+ }
}
Screen::Details => {
self.state
diff --git a/src/tui/app/tv.rs b/src/tui/app/tv.rs
index 0f1daf2..6f4d40d 100644
--- a/src/tui/app/tv.rs
+++ b/src/tui/app/tv.rs
@@ -6,6 +6,8 @@ impl App {
self.state.show_help = false;
self.state.show_theme_popup = false;
self.state.show_browse_popup = false;
+ self.state.show_provider_popup = false;
+ self.state.provider_list_state.select(None);
self.state.show_settings_popup = false;
self.state.settings_download_dir_input = None;
self.state.player_picker_popup = false;
diff --git a/src/tui/screens/home.rs b/src/tui/screens/home.rs
index c31702b..1a1b25b 100644
--- a/src/tui/screens/home.rs
+++ b/src/tui/screens/home.rs
@@ -986,7 +986,23 @@ fn render_search_bar(
};
let is_query_empty = state.search_query.is_empty();
- let (pill_text, pill_style) = if modal_active {
+ let (pill_text, pill_style) = if state.show_provider_popup {
+ let label = state.active_provider.label();
+ let text = if is_ultra_compact {
+ format!("[{label}]")
+ } else {
+ let sep = if state.basic_terminal { "-" } else { "·" };
+ format!("[{label} {sep} {ctrl_p}]")
+ };
+ let style = if state.basic_terminal {
+ theme.sapphire.add_modifier(Modifier::BOLD)
+ } else {
+ let bg = theme.surface1.fg.unwrap_or(Color::Rgb(69, 71, 90));
+ let fg = theme.sapphire.fg.unwrap_or(Color::Rgb(116, 199, 236));
+ Style::default().bg(bg).fg(fg).add_modifier(Modifier::BOLD)
+ };
+ (text, style)
+ } else if modal_active {
let text = if !is_query_empty {
if is_ultra_compact {
"[Enter]".to_string()
@@ -1071,14 +1087,26 @@ fn render_search_bar(
(text, style)
};
- let pill_width = crate::tui::text::width(&pill_text) as u16;
- let search_split = Layout::default()
- .direction(Direction::Horizontal)
- .constraints([
- Constraint::Min(1),
- Constraint::Length(pill_width.saturating_add(1)),
- ])
- .split(inner_row_area);
+ let pill_rect = search_bar_provider_pill_rect(area, state);
+ let search_split = if is_query_empty {
+ let left = Rect {
+ x: inner_row_area.x,
+ y: inner_row_area.y,
+ width: inner_row_area.width.saturating_sub(pill_rect.width),
+ height: inner_row_area.height,
+ };
+ vec![left, pill_rect]
+ } else {
+ let pill_width = crate::tui::text::width(&pill_text) as u16;
+ Layout::default()
+ .direction(Direction::Horizontal)
+ .constraints([
+ Constraint::Min(1),
+ Constraint::Length(pill_width.saturating_add(1)),
+ ])
+ .split(inner_row_area)
+ .to_vec()
+ };
let prefix = if state.basic_terminal { "> " } else { "❯ " };
let prefix_width = crate::tui::text::width(prefix) as u16;
@@ -2019,6 +2047,7 @@ pub fn draw(frame: &mut Frame, area: Rect, state: &mut AppState, theme: &Theme)
if !state.tv_config_popup {
render_search_suggestions(frame, area, search_bar_area, state, theme, view);
}
+ render_provider_popup(frame, area, search_bar_area, state, theme);
if state.tv_config_popup {
let rows = state.tv_manager_rows();
let total_rows = rows.len();
@@ -2573,6 +2602,186 @@ fn render_search_suggestions(
frame.render_widget(Paragraph::new(Line::from(spans)).style(row_style), row_area);
}
}
+pub fn search_bar_provider_pill_rect(search_card_area: Rect, state: &AppState) -> Rect {
+ let inner_width = search_card_area.width.saturating_sub(4);
+ let inner_row_area = Rect {
+ x: search_card_area.x + 2,
+ y: search_card_area.y + 1,
+ width: inner_width,
+ height: 1,
+ };
+ let is_ultra_compact = search_card_area.width < 58;
+ let ctrl_p = if is_ultra_compact {
+ "P"
+ } else {
+ crate::tui::text::CTRL_P_STR
+ };
+ let ctrl_t = if is_ultra_compact {
+ "T"
+ } else {
+ crate::tui::text::CTRL_T_STR
+ };
+ let sep = if state.basic_terminal { "-" } else { "·" };
+ let pill_text = if state.is_tv_mode {
+ if is_ultra_compact {
+ "[TV]".to_string()
+ } else {
+ format!("[Live TV {sep} {ctrl_t}]")
+ }
+ } else if state.is_addon_mode {
+ if is_ultra_compact {
+ "[Addons]".to_string()
+ } else {
+ "[Addon Mode]".to_string()
+ }
+ } else {
+ let label = state.active_provider.label();
+ if is_ultra_compact {
+ format!("[{label}]")
+ } else {
+ format!("[{label} {sep} {ctrl_p}]")
+ }
+ };
+ let pill_width = crate::tui::text::width(&pill_text) as u16;
+ let search_split = Layout::default()
+ .direction(Direction::Horizontal)
+ .constraints([
+ Constraint::Min(1),
+ Constraint::Length(pill_width.saturating_add(1)),
+ ])
+ .split(inner_row_area);
+ search_split[1]
+}
+
+pub fn provider_popup_bounds(
+ area: Rect,
+ search_card_area: Rect,
+ provider_count: usize,
+) -> (Rect, Rect) {
+ if provider_count == 0 || search_card_area.width == 0 || area.width == 0 || area.height == 0 {
+ return (Rect::default(), Rect::default());
+ }
+
+ let min_width = 20u16.min(area.width.saturating_sub(2));
+ let popup_width = 24u16.min(area.width.saturating_sub(2)).max(min_width);
+ let popup_height =
+ ((provider_count as u16).saturating_add(2)).min(area.height.saturating_sub(2));
+
+ let x = search_card_area
+ .right()
+ .saturating_sub(popup_width)
+ .max(area.x)
+ .min(area.right().saturating_sub(popup_width));
+
+ let start_y = search_card_area.bottom();
+ let y = if start_y.saturating_add(popup_height) <= area.bottom() {
+ start_y
+ } else {
+ search_card_area.y.saturating_sub(popup_height)
+ };
+
+ let container_area = Rect {
+ x,
+ y,
+ width: popup_width,
+ height: popup_height,
+ };
+
+ let inner_area = Rect {
+ x: container_area.x.saturating_add(1),
+ y: container_area.y.saturating_add(1),
+ width: container_area.width.saturating_sub(2),
+ height: container_area.height.saturating_sub(2),
+ };
+
+ (container_area, inner_area)
+}
+
+fn render_provider_popup(
+ frame: &mut Frame,
+ area: Rect,
+ search_bar_area: Rect,
+ state: &AppState,
+ theme: &Theme,
+) {
+ if !state.show_provider_popup || search_bar_area.width == 0 {
+ return;
+ }
+
+ let providers = state.available_providers();
+ if providers.is_empty() {
+ return;
+ }
+
+ let (container_area, inner_area) =
+ provider_popup_bounds(area, search_bar_area, providers.len());
+
+ if container_area.width == 0 || container_area.height <= 2 || inner_area.height == 0 {
+ return;
+ }
+
+ crate::tui::clear_area(frame, container_area, theme);
+
+ let container_block = Block::default()
+ .borders(Borders::ALL)
+ .border_type(crate::tui::overlay::border_type(state.basic_terminal))
+ .border_style(theme.border_focus)
+ .title(" Providers ");
+
+ frame.render_widget(container_block, container_area);
+
+ let selected_idx = state.provider_list_state.selected();
+
+ for (idx, provider) in providers.iter().enumerate() {
+ let current_y = inner_area.y + idx as u16;
+ if current_y >= inner_area.bottom() {
+ break;
+ }
+
+ let is_selected = selected_idx == Some(idx);
+ let is_active = *provider == state.active_provider;
+
+ let cursor_symbol = if is_selected {
+ if state.basic_terminal { "> " } else { "▌ " }
+ } else {
+ " "
+ };
+ let cursor_style = if is_selected {
+ theme.accent.add_modifier(Modifier::BOLD)
+ } else {
+ Style::default()
+ };
+
+ let label_style = if is_selected {
+ theme.highlight.add_modifier(Modifier::BOLD)
+ } else if is_active {
+ theme.sapphire.add_modifier(Modifier::BOLD)
+ } else {
+ theme.text_dim
+ };
+
+ let row_style = if is_selected {
+ Style::default().bg(theme.surface0.fg.unwrap_or(theme.base))
+ } else {
+ Style::default()
+ };
+
+ let row_area = Rect {
+ x: inner_area.x,
+ y: current_y,
+ width: inner_area.width,
+ height: 1,
+ };
+
+ let line = Line::from(vec![
+ Span::styled(cursor_symbol, cursor_style),
+ Span::styled(provider.label(), label_style),
+ ]);
+
+ frame.render_widget(Paragraph::new(line).style(row_style), row_area);
+ }
+}
+
#[inline(always)]
fn item_slot_rects(item_area: Rect, poster_width: u16) -> (Rect, Rect, Rect) {
let highlight_w = 2.min(item_area.width);
@@ -2920,6 +3129,84 @@ mod tests {
assert_eq!(inner.width, 58);
assert_eq!(inner.height, 3);
}
+ #[test]
+ fn test_search_bar_provider_pill_rect() {
+ let state = AppState::default();
+ let normal_card = Rect::new(10, 2, 64, 3);
+ let pill_rect = search_bar_provider_pill_rect(normal_card, &state);
+ assert_eq!(pill_rect.y, 3);
+ assert_eq!(pill_rect.height, 1);
+ assert!(pill_rect.right() <= normal_card.right().saturating_sub(2));
+ assert!(pill_rect.width >= 12);
+
+ let compact_card = Rect::new(5, 2, 40, 3);
+ let compact_pill = search_bar_provider_pill_rect(compact_card, &state);
+ assert_eq!(compact_pill.y, 3);
+ assert_eq!(compact_pill.height, 1);
+ assert!(compact_pill.right() <= compact_card.right().saturating_sub(2));
+ assert!(compact_pill.width < pill_rect.width);
+ }
+
+ #[test]
+ fn test_provider_popup_bounds() {
+ let area = Rect::new(0, 0, 80, 24);
+ let search_bar = Rect::new(10, 2, 60, 3);
+ let (container, inner) = provider_popup_bounds(area, search_bar, 4);
+ assert_eq!(container.y, 5);
+ assert_eq!(container.height, 6);
+ assert_eq!(container.width, 24);
+ assert_eq!(container.right(), 70);
+ assert_eq!(inner.x, container.x + 1);
+ assert_eq!(inner.y, 6);
+ assert_eq!(inner.width, 22);
+ assert_eq!(inner.height, 4);
+
+ let bottom_bar = Rect::new(10, 20, 60, 3);
+ let (flipped, _) = provider_popup_bounds(area, bottom_bar, 4);
+ assert_eq!(flipped.y, 14);
+ assert_eq!(flipped.height, 6);
+
+ let narrow_area = Rect::new(0, 0, 16, 24);
+ let narrow_bar = Rect::new(1, 2, 14, 3);
+ let (narrow_container, _) = provider_popup_bounds(narrow_area, narrow_bar, 4);
+ assert!(narrow_container.width <= 14);
+ assert!(narrow_container.right() <= 16);
+ }
+
+ #[test]
+ fn test_render_provider_popup() {
+ let backend = TestBackend::new(80, 24);
+ let mut terminal = Terminal::new(backend).unwrap();
+ let mut state = AppState {
+ show_provider_popup: true,
+ ..Default::default()
+ };
+ state.provider_list_state.select(Some(0));
+ let theme = Theme::mocha();
+
+ terminal
+ .draw(|frame| {
+ let area = Rect::new(0, 0, 80, 24);
+ let search_bar = Rect::new(10, 2, 60, 3);
+ render_provider_popup(frame, area, search_bar, &state, &theme);
+ })
+ .unwrap();
+
+ let mut rendered = String::new();
+ for y in 0..24 {
+ for x in 0..80 {
+ let cell = terminal.backend().buffer().cell((x, y)).unwrap();
+ rendered.push_str(cell.symbol());
+ }
+ rendered.push('\n');
+ }
+
+ assert!(rendered.contains("Providers"));
+ assert!(rendered.contains("MovieBox"));
+ assert!(rendered.contains("4KHDHub"));
+ assert!(!rendered.contains('●'));
+ assert!(!rendered.contains('○'));
+ }
#[test]
fn test_search_deck_width_stability() {
diff --git a/src/tui/state.rs b/src/tui/state.rs
index a778c53..0f6f9a9 100644
--- a/src/tui/state.rs
+++ b/src/tui/state.rs
@@ -276,6 +276,8 @@ pub struct AppState {
pub browse_list_state: ListState,
pub active_browse_preset: Option<BrowsePreset>,
pub active_addon_catalog: Option<crate::providers::addons::models::AddonCatalogTarget>,
+ pub show_provider_popup: bool,
+ pub provider_list_state: ListState,
pub browse_metrics: std::collections::HashMap<String, BrowseMetrics>,
pub show_settings_popup: bool,
pub settings_category: SettingsCategory,
@@ -436,6 +438,8 @@ impl Default for AppState {
browse_list_state: ListState::default(),
active_browse_preset: None,
active_addon_catalog: None,
+ show_provider_popup: false,
+ provider_list_state: ListState::default(),
browse_metrics: std::collections::HashMap::new(),
show_settings_popup: false,
settings_category: SettingsCategory::General,
@@ -586,11 +590,15 @@ impl AppState {
.unwrap_or(self.active_provider)
}
- pub fn next_provider(&self) -> ProviderKind {
- let available_providers: Vec<ProviderKind> = crate::models::ProviderKind::ENABLED
+ pub fn available_providers(&self) -> Vec<ProviderKind> {
+ crate::models::ProviderKind::ENABLED
.into_iter()
.filter(|p| !p.is_bdix() || self.bdix_enabled)
- .collect();
+ .collect()
+ }
+
+ pub fn next_provider(&self) -> ProviderKind {
+ let available_providers = self.available_providers();
if available_providers.is_empty() {
return self.active_provider;
}
@@ -729,6 +737,7 @@ impl AppState {
self.show_help
|| self.show_theme_popup
|| self.show_browse_popup
+ || self.show_provider_popup
|| self.show_settings_popup
|| self.addon_manager_popup
|| self.tv_config_popup
@@ -1335,6 +1344,9 @@ mod tests {
state.show_browse_popup = true;
assert!(state.has_active_modal());
state.show_browse_popup = false;
+ state.show_provider_popup = true;
+ assert!(state.has_active_modal());
+ state.show_provider_popup = false;
state.addon_manager_popup = true;
assert!(state.has_active_modal());