Skip to content

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

refactor(core): centralize state resets, addon converters, and list popup navigation

Samir Hossains2ddb07d4bec2
diff --git a/src/providers/addons/adapter.rs b/src/providers/addons/adapter.rs
index d5a4bd8..348afea 100644
--- a/src/providers/addons/adapter.rs
+++ b/src/providers/addons/adapter.rs
@@ -40,6 +40,67 @@ pub fn meta_to_search_result(item: &MetaItem) -> SearchResult {
}
}
+pub fn metas_to_moviebox_search_json(metas: Vec<MetaItem>) -> serde_json::Value {
+ let mut seen_ids = std::collections::HashSet::new();
+ let subjects = metas
+ .into_iter()
+ .filter(|item| seen_ids.insert(item.id.clone()))
+ .map(|item| {
+ let is_series = item.r#type.eq_ignore_ascii_case("series")
+ || item.r#type.eq_ignore_ascii_case("tv")
+ || item.r#type.eq_ignore_ascii_case("anime");
+ let year: String = item
+ .release_info
+ .as_deref()
+ .or(item.year.as_deref())
+ .or(item.released.as_deref())
+ .map(|s| {
+ s.chars()
+ .filter(|c| c.is_ascii_digit())
+ .take(4)
+ .collect::<String>()
+ })
+ .unwrap_or_default();
+
+ let title = if !item.name.trim().is_empty() {
+ item.name.clone()
+ } else {
+ item.title.clone().unwrap_or_else(|| "Unknown".to_string())
+ };
+
+ let poster_url = item
+ .poster
+ .clone()
+ .or_else(|| item.cover.clone())
+ .unwrap_or_default();
+
+ let desc = item.description.clone();
+ let rating = item.imdb_rating.clone().or_else(|| item.rating.clone());
+ let genres = item.genres.clone();
+
+ serde_json::json!({
+ "subjectId": item.id,
+ "title": title,
+ "subjectType": if is_series { 2 } else { 1 },
+ "releaseDate": year,
+ "description": desc,
+ "intro": desc,
+ "imdbRatingValue": rating,
+ "genre": genres,
+ "cover": {
+ "url": poster_url
+ }
+ })
+ })
+ .collect::<Vec<_>>();
+
+ serde_json::json!({
+ "results": [{
+ "subjects": subjects
+ }]
+ })
+}
+
pub fn meta_detail_to_moviebox_json(detail: &MetaDetail) -> serde_json::Value {
let is_series = detail.r#type.eq_ignore_ascii_case("series")
|| detail.r#type.eq_ignore_ascii_case("tv")
diff --git a/src/service.rs b/src/service.rs
index 1d12d56..9a3bfdc 100644
--- a/src/service.rs
+++ b/src/service.rs
@@ -112,48 +112,7 @@ impl MovieBoxService {
return Err(format!("No matches found for '{query}'."));
}
- let mut seen_ids = std::collections::HashSet::new();
- let subjects = combined
- .into_iter()
- .filter(|item| seen_ids.insert(item.id.clone()))
- .map(|item| {
- let is_series = item.r#type.eq_ignore_ascii_case("series")
- || item.r#type.eq_ignore_ascii_case("tv")
- || item.r#type.eq_ignore_ascii_case("anime");
- let year: String = item
- .release_info
- .as_deref()
- .map(|s| {
- s.chars()
- .filter(|c| c.is_ascii_digit())
- .take(4)
- .collect::<String>()
- })
- .unwrap_or_default();
-
- let desc = item.description.clone();
- let rating = item.imdb_rating.clone();
- let genres = item.genres.clone();
-
- serde_json::json!({
- "subjectId": item.id,
- "title": item.name,
- "subjectType": if is_series { 2 } else { 1 },
- "releaseDate": year,
- "description": desc,
- "intro": desc,
- "imdbRatingValue": rating,
- "genre": genres,
- "cover": { "url": item.poster }
- })
- })
- .collect::<Vec<_>>();
-
- Ok(serde_json::json!({
- "results": [{
- "subjects": subjects
- }]
- }))
+ Ok(crate::providers::addons::adapter::metas_to_moviebox_search_json(combined))
}
}
}
@@ -175,61 +134,7 @@ impl MovieBoxService {
return Err("No catalog items found".to_string());
}
- let mut seen_ids = std::collections::HashSet::new();
- let subjects = metas
- .into_iter()
- .filter(|item| seen_ids.insert(item.id.clone()))
- .map(|item| {
- let is_series = item.r#type.eq_ignore_ascii_case("series")
- || item.r#type.eq_ignore_ascii_case("tv")
- || item.r#type.eq_ignore_ascii_case("anime");
- let year: String = item
- .release_info
- .as_deref()
- .or(item.year.as_deref())
- .or(item.released.as_deref())
- .map(|s| {
- s.chars()
- .filter(|c| c.is_ascii_digit())
- .take(4)
- .collect::<String>()
- })
- .unwrap_or_default();
-
- let desc = item.description.clone();
- let rating = item.imdb_rating.clone().or(item.rating.clone());
- let genres = item.genres.clone();
- let poster_url = item
- .poster
- .clone()
- .or(item.cover.clone())
- .unwrap_or_default();
- let title = if !item.name.trim().is_empty() {
- item.name.clone()
- } else {
- item.title.clone().unwrap_or_else(|| "Unknown".to_string())
- };
-
- serde_json::json!({
- "subjectId": item.id,
- "title": title,
- "subjectType": if is_series { 2 } else { 1 },
- "releaseDate": year,
- "cover": {
- "url": poster_url
- },
- "description": desc,
- "imdbRating": rating,
- "genres": genres
- })
- })
- .collect::<Vec<_>>();
-
- Ok(serde_json::json!({
- "results": [{
- "subjects": subjects
- }]
- }))
+ Ok(crate::providers::addons::adapter::metas_to_moviebox_search_json(metas))
}
pub async fn details(
diff --git a/src/tui/app/addons.rs b/src/tui/app/addons.rs
index 6a30add..32e64cf 100644
--- a/src/tui/app/addons.rs
+++ b/src/tui/app/addons.rs
@@ -4,35 +4,6 @@ use crate::tui::action::Action;
use crate::tui::overlay::NotificationKind;
impl App {
- fn reset_mode_state(&mut self) {
- self.state
- .fetch_cancel
- .store(true, std::sync::atomic::Ordering::SeqCst);
- self.state.fetch_cancel = std::sync::Arc::new(std::sync::atomic::AtomicBool::new(false));
- self.state.provider_generation = self.state.provider_generation.wrapping_add(1);
- self.state.active_preview_request = self.state.active_preview_request.wrapping_add(1);
-
- self.state.active_browse_preset = None;
- self.state.active_addon_catalog = None;
- self.state.browse_metrics.clear();
- self.state.tick_count = 0;
- self.reset_transient_overlays();
- self.state.input_mode = crate::tui::state::InputMode::Normal;
- self.state.is_loading = false;
- self.state.is_fetching_streams = false;
- self.state.pending_episode_fetch = None;
- self.state.selected_details = None;
- self.state.selected_resources = None;
- self.state.active_subject_id = None;
- self.state.search_suggestions.clear();
- self.state.suggest_index = None;
- self.state.search_preview = None;
- self.state.poster_image = None;
- self.state.poster_protocol = None;
- self.state.search_query.clear();
- self.state.search_results.clear();
- }
-
pub(super) async fn handle_addons(&mut self, action: Action) -> Option<()> {
match action {
Action::ToggleAddonMode => {
diff --git a/src/tui/app/keyboard.rs b/src/tui/app/keyboard.rs
index 6f000cc..a745e90 100644
--- a/src/tui/app/keyboard.rs
+++ b/src/tui/app/keyboard.rs
@@ -110,20 +110,18 @@ impl App {
self.state.browse_list_state.select(None);
}
KeyCode::Up => {
- let max = total_count.saturating_sub(1);
- let next = match self.state.browse_list_state.selected() {
- Some(0) | None => max,
- Some(index) => index.saturating_sub(1),
- };
- self.state.browse_list_state.select(Some(next));
+ crate::tui::state::cycle_list_selection(
+ &mut self.state.browse_list_state,
+ total_count,
+ false,
+ );
}
KeyCode::Down => {
- let max = total_count.saturating_sub(1);
- let next = match self.state.browse_list_state.selected() {
- Some(index) if index < max => index + 1,
- _ => 0,
- };
- self.state.browse_list_state.select(Some(next));
+ crate::tui::state::cycle_list_selection(
+ &mut self.state.browse_list_state,
+ total_count,
+ true,
+ );
}
KeyCode::Enter => {
let index = self.state.browse_list_state.selected().unwrap_or(0);
@@ -156,40 +154,30 @@ impl App {
}
}
KeyCode::Up => {
- let max = crate::tui::theme::AVAILABLE_THEMES.len().saturating_sub(1);
- let i = match self.state.theme_list_state.selected() {
- Some(i) => {
- if i == 0 {
- max
- } else {
- i - 1
- }
- }
- None => 0,
- };
- self.state.theme_list_state.select(Some(i));
- let selected_theme = crate::tui::theme::AVAILABLE_THEMES[i].to_string();
- self.action_sender
- .send(Action::SelectTheme(selected_theme))
- .ok();
+ crate::tui::state::cycle_list_selection(
+ &mut self.state.theme_list_state,
+ crate::tui::theme::AVAILABLE_THEMES.len(),
+ false,
+ );
+ if let Some(i) = self.state.theme_list_state.selected() {
+ let selected_theme = crate::tui::theme::AVAILABLE_THEMES[i].to_string();
+ self.action_sender
+ .send(Action::SelectTheme(selected_theme))
+ .ok();
+ }
}
KeyCode::Down => {
- let max = crate::tui::theme::AVAILABLE_THEMES.len().saturating_sub(1);
- let i = match self.state.theme_list_state.selected() {
- Some(i) => {
- if i >= max {
- 0
- } else {
- i + 1
- }
- }
- None => 0,
- };
- self.state.theme_list_state.select(Some(i));
- let selected_theme = crate::tui::theme::AVAILABLE_THEMES[i].to_string();
- self.action_sender
- .send(Action::SelectTheme(selected_theme))
- .ok();
+ crate::tui::state::cycle_list_selection(
+ &mut self.state.theme_list_state,
+ crate::tui::theme::AVAILABLE_THEMES.len(),
+ true,
+ );
+ if let Some(i) = self.state.theme_list_state.selected() {
+ let selected_theme = crate::tui::theme::AVAILABLE_THEMES[i].to_string();
+ self.action_sender
+ .send(Action::SelectTheme(selected_theme))
+ .ok();
+ }
}
KeyCode::Enter => {
self.state.show_theme_popup = false;
diff --git a/src/tui/app/mouse.rs b/src/tui/app/mouse.rs
index 75932cd..572c3f2 100644
--- a/src/tui/app/mouse.rs
+++ b/src/tui/app/mouse.rs
@@ -23,11 +23,8 @@ impl App {
fn handle_overlay_mouse(&mut self, col: u16, row: u16, area: Rect) -> bool {
if self.state.show_theme_popup {
let items = crate::tui::theme::AVAILABLE_THEMES;
- let popup = centered_rect(area, 40, items.len() as u16 + 4, 30, 60);
- if popup.contains(ratatui::layout::Position::new(col, row)) {
- let item_y = popup.y.saturating_add(1);
- if row >= item_y && (row - item_y) < items.len() as u16 {
- let clicked_idx = (row - item_y) as usize;
+ match hit_test_centered_picker(area, col, row, 40, items.len(), 30, 60) {
+ Some(Some(clicked_idx)) => {
self.state.theme_list_state.select(Some(clicked_idx));
if let Some(theme_name) = items.get(clicked_idx) {
self.action_sender
@@ -39,9 +36,11 @@ impl App {
.set_status(format!("{theme_name} theme applied."), 150);
}
}
- } else {
- self.state.show_theme_popup = false;
- self.state.theme_list_state.select(None);
+ Some(None) => {}
+ None => {
+ self.state.show_theme_popup = false;
+ self.state.theme_list_state.select(None);
+ }
}
return true;
}
@@ -56,11 +55,8 @@ impl App {
} else {
BrowsePreset::ALL.len()
};
- let popup = centered_rect(area, 40, total_count as u16 + 4, 30, 60);
- if popup.contains(ratatui::layout::Position::new(col, row)) {
- let item_y = popup.y.saturating_add(1);
- if row >= item_y && (row - item_y) < total_count as u16 {
- let clicked_idx = (row - item_y) as usize;
+ match hit_test_centered_picker(area, col, row, 40, total_count, 30, 60) {
+ Some(Some(clicked_idx)) => {
self.state.browse_list_state.select(Some(clicked_idx));
self.state.show_browse_popup = false;
self.state.browse_list_state.select(None);
@@ -77,9 +73,11 @@ impl App {
self.action_sender.send(Action::SelectBrowse(preset)).ok();
}
}
- } else {
- self.state.show_browse_popup = false;
- self.state.browse_list_state.select(None);
+ Some(None) => {}
+ None => {
+ self.state.show_browse_popup = false;
+ self.state.browse_list_state.select(None);
+ }
}
return true;
}
@@ -112,33 +110,31 @@ impl App {
if self.state.player_picker_popup {
let count = self.state.available_players.len();
- let popup = centered_rect(area, 40, count as u16 + 4, 24, 60);
- if popup.contains(ratatui::layout::Position::new(col, row)) {
- let item_y = popup.y.saturating_add(1);
- if row >= item_y && (row - item_y) < count as u16 {
- let clicked_idx = (row - item_y) as usize;
+ match hit_test_centered_picker(area, col, row, 40, count, 24, 60) {
+ Some(Some(clicked_idx)) => {
self.state.player_picker_state.select(Some(clicked_idx));
self.action_sender.send(Action::Submit).ok();
}
- } else {
- self.state.player_picker_popup = false;
+ Some(None) => {}
+ None => {
+ self.state.player_picker_popup = false;
+ }
}
return true;
}
if self.state.subtitle_popup || self.state.is_download_subtitle_popup {
let count = self.state.subtitle_list.len().min(8);
- let popup = centered_rect(area, 44, count as u16 + 4, 30, 60);
- if popup.contains(ratatui::layout::Position::new(col, row)) {
- let item_y = popup.y.saturating_add(1);
- if row >= item_y && (row - item_y) < count as u16 {
- let clicked_idx = (row - item_y) as usize;
+ match hit_test_centered_picker(area, col, row, 44, count, 30, 60) {
+ Some(Some(clicked_idx)) => {
self.state.subtitle_list_state.select(Some(clicked_idx));
self.action_sender.send(Action::Submit).ok();
}
- } else {
- self.state.subtitle_popup = false;
- self.state.is_download_subtitle_popup = false;
+ Some(None) => {}
+ None => {
+ self.state.subtitle_popup = false;
+ self.state.is_download_subtitle_popup = false;
+ }
}
return true;
}
@@ -826,3 +822,25 @@ fn centered_width_rect(area: Rect, width: u16) -> Rect {
height: area.height,
}
}
+
+fn hit_test_centered_picker(
+ area: Rect,
+ col: u16,
+ row: u16,
+ width_pct: u16,
+ total_items: usize,
+ min_w: u16,
+ max_w: u16,
+) -> Option<Option<usize>> {
+ let popup = centered_rect(area, width_pct, total_items as u16 + 4, min_w, max_w);
+ if popup.contains(ratatui::layout::Position::new(col, row)) {
+ let item_y = popup.y.saturating_add(1);
+ if row >= item_y && (row - item_y) < total_items as u16 {
+ Some(Some((row - item_y) as usize))
+ } else {
+ Some(None)
+ }
+ } else {
+ None
+ }
+}
diff --git a/src/tui/app/navigation.rs b/src/tui/app/navigation.rs
index 89b60d5..9e215dd 100644
--- a/src/tui/app/navigation.rs
+++ b/src/tui/app/navigation.rs
@@ -24,44 +24,15 @@ impl App {
if provider == self.state.active_provider {
return;
}
- self.reset_transient_overlays();
self.prepare_image_soft_refresh();
- self.state
- .fetch_cancel
- .store(true, std::sync::atomic::Ordering::SeqCst);
- self.state.fetch_cancel = std::sync::Arc::new(std::sync::atomic::AtomicBool::new(false));
- self.state.provider_generation = self.state.provider_generation.wrapping_add(1);
- self.state.active_preview_request = self.state.active_preview_request.wrapping_add(1);
+ self.reset_mode_state();
self.state.active_provider = provider;
self.state.active_screen = Screen::Home;
- self.state.is_homepage_mode = false;
- self.state.active_browse_preset = None;
- self.state.active_addon_catalog = None;
- self.state.browse_metrics.clear();
- self.state.is_tv_mode = false;
- self.state.is_loading = false;
- self.state.is_fetching_streams = false;
- self.state.stream_error = None;
- self.state.search_error = None;
- self.state.search_results.clear();
- self.state.search_suggestions.clear();
- self.state.search_preview = None;
- self.state.preview_loading = false;
- self.state.selected_details = None;
- self.state.selected_resources = None;
- self.state.active_subject_id = None;
self.state.details_pane = crate::tui::state::DetailsPane::default();
self.state.selected_season = 1;
self.state.selected_episode = 1;
self.state.language_chosen = false;
- self.state.season_list_state.select(None);
- self.state.episode_list_state.select(None);
- self.state.language_list_state.select(None);
- self.state.pending_episode_fetch = None;
- self.state.available_seasons.clear();
- self.state.available_episode_numbers.clear();
self.state.stream_pool.clear();
- self.state.is_resolving_playback = false;
self.state
.cancel_download
.store(true, std::sync::atomic::Ordering::SeqCst);
diff --git a/src/tui/app/tv.rs b/src/tui/app/tv.rs
index d9bf653..c878eb0 100644
--- a/src/tui/app/tv.rs
+++ b/src/tui/app/tv.rs
@@ -24,17 +24,28 @@ impl App {
self.state.tv_input_is_file = false;
}
+ pub(super) fn reset_mode_state(&mut self) {
+ self.state
+ .fetch_cancel
+ .store(true, std::sync::atomic::Ordering::SeqCst);
+ self.state.fetch_cancel = std::sync::Arc::new(std::sync::atomic::AtomicBool::new(false));
+ self.state.provider_generation = self.state.provider_generation.wrapping_add(1);
+ self.state.active_preview_request = self.state.active_preview_request.wrapping_add(1);
+ self.state.active_search_request = self.state.active_search_request.wrapping_add(1);
+ self.state.active_details_request = self.state.active_details_request.wrapping_add(1);
+ self.state.active_resource_request = self.state.active_resource_request.wrapping_add(1);
+ self.state.tick_count = 0;
+ self.reset_transient_overlays();
+ self.state.input_mode = crate::tui::state::InputMode::Normal;
+ self.state.is_loading = false;
+ self.state.clear_search_state();
+ self.state.clear_details_state();
+ }
+
pub(super) async fn handle_tv(&mut self, action: Action) -> Option<()> {
match action {
Action::ToggleTvMode => {
- self.state
- .fetch_cancel
- .store(true, std::sync::atomic::Ordering::SeqCst);
- self.state.fetch_cancel =
- std::sync::Arc::new(std::sync::atomic::AtomicBool::new(false));
- self.state.provider_generation = self.state.provider_generation.wrapping_add(1);
- self.state.active_preview_request =
- self.state.active_preview_request.wrapping_add(1);
+ self.reset_mode_state();
let will_be_tv = !self.state.is_tv_mode;
if will_be_tv {
self.state.set_mode(crate::tui::state::AppMode::Tv);
@@ -43,28 +54,9 @@ impl App {
} else if self.state.addons_enabled {
self.state.set_mode(crate::tui::state::AppMode::Addon);
}
- self.state.active_browse_preset = None;
- self.state.active_addon_catalog = None;
- self.state.browse_metrics.clear();
- self.state.tick_count = 0;
- self.reset_transient_overlays();
- self.state.input_mode = crate::tui::state::InputMode::Normal;
- self.state.is_loading = false;
- self.state.is_fetching_streams = false;
- self.state.pending_episode_fetch = None;
- self.state.selected_details = None;
- self.state.selected_resources = None;
- self.state.active_subject_id = None;
- self.state.search_suggestions.clear();
- self.state.suggest_index = None;
- self.state.search_preview = None;
- self.state.poster_image = None;
- self.state.poster_protocol = None;
if self.state.is_tv_mode {
self.state.tv_config_popup = false;
- self.state.search_query.clear();
self.state.tv_channels.clear();
- self.state.search_results.clear();
self.state
.set_status("Loading TV playlists...".to_string(), 200);
self.load_tv_playlists_from_config();
@@ -74,7 +66,6 @@ impl App {
}
} else if self.state.is_addon_mode {
self.state.tv_config_popup = false;
- self.state.search_query.clear();
self.state.search_results.clear();
self.state.active_provider = crate::providers::models::ProviderKind::Addons;
self.load_installed_addons_from_config();
diff --git a/src/tui/state.rs b/src/tui/state.rs
index 862630a..82c19ef 100644
--- a/src/tui/state.rs
+++ b/src/tui/state.rs
@@ -379,6 +379,41 @@ impl AppState {
self.status_timer = timer;
}
+ pub fn clear_search_state(&mut self) {
+ self.search_query.clear();
+ self.search_results.clear();
+ self.search_error = None;
+ self.search_suggestions.clear();
+ self.suggest_index = None;
+ self.search_preview = None;
+ self.preview_loading = false;
+ self.active_browse_preset = None;
+ self.active_addon_catalog = None;
+ self.browse_metrics.clear();
+ self.poster_image = None;
+ self.poster_protocol = None;
+ self.failed_posters.clear();
+ self.in_flight_posters.clear();
+ self.search_list_state.select(None);
+ self.is_homepage_mode = false;
+ }
+
+ pub fn clear_details_state(&mut self) {
+ self.active_subject_id = None;
+ self.selected_details = None;
+ self.selected_resources = None;
+ self.is_fetching_streams = false;
+ self.pending_episode_fetch = None;
+ self.stream_error = None;
+ self.available_seasons.clear();
+ self.available_episode_numbers.clear();
+ self.season_list_state.select(None);
+ self.episode_list_state.select(None);
+ self.resource_list_state.select(None);
+ self.language_list_state.select(None);
+ self.details_pane = DetailsPane::Streams;
+ }
+
pub fn loading_dots(&self) -> &'static str {
match (self.tick_count / 4) % 4 {
0 => "",
@@ -389,6 +424,27 @@ impl AppState {
}
}
+pub fn cycle_list_selection(state: &mut ListState, total_items: usize, forward: bool) {
+ if total_items == 0 {
+ state.select(None);
+ return;
+ }
+ let max = total_items.saturating_sub(1);
+ let next = if forward {
+ match state.selected() {
+ Some(i) if i >= max => 0,
+ Some(i) => i + 1,
+ None => 0,
+ }
+ } else {
+ match state.selected() {
+ Some(0) | None => max,
+ Some(i) => i.saturating_sub(1),
+ }
+ };
+ state.select(Some(next));
+}
+
#[derive(Debug, Clone, Copy, PartialEq, Eq)]
pub enum TvManagerRow {
Header(&'static str),