Terminal interface to find, download, and stream movies, TV shows, and live TV using local media players.
refactor: format home screen code and update UI and layout constraints
Samir Hossains5145909a1eff
diff --git a/src/lib.rs b/src/lib.rsindex edd6b14..f3093af 100644--- a/src/lib.rs+++ b/src/lib.rs@@ -1,3 +1,2 @@--pub mod tui;pub mod providers;+pub mod tui;diff --git a/src/providers/moviebox/client.rs b/src/providers/moviebox/client.rsindex 129a972..97db2f3 100644--- a/src/providers/moviebox/client.rs+++ b/src/providers/moviebox/client.rs@@ -53,7 +53,8 @@ impl MovieBoxClient {.build().expect("Failed to build reqwest client; TLS backend may be missing");- let (user_agent, client_info) = crate::providers::moviebox::crypto::generate_client_info_and_ua();+ let (user_agent, client_info) =+ crate::providers::moviebox::crypto::generate_client_info_and_ua();let spoofed_ip = crate::providers::moviebox::crypto::random_spoofed_ip();Self {diff --git a/src/providers/moviebox/crypto.rs b/src/providers/moviebox/crypto.rsindex 528a904..eb7acd3 100644--- a/src/providers/moviebox/crypto.rs+++ b/src/providers/moviebox/crypto.rs@@ -149,7 +149,10 @@ pub fn build_signed_headers(let mut headers = reqwest::header::HeaderMap::new();- headers.insert(reqwest::header::USER_AGENT, user_agent.parse().expect("Valid ASCII"));+ headers.insert(+ reqwest::header::USER_AGENT,+ user_agent.parse().expect("Valid ASCII"),+ );headers.insert("Accept", accept.parse().expect("Valid ASCII"));headers.insert("Content-Type", content_type.parse().expect("Valid ASCII"));headers.insert("Connection", "keep-alive".parse().expect("Valid ASCII"));diff --git a/src/providers/moviebox/mod.rs b/src/providers/moviebox/mod.rsindex be00a77..2b3efa9 100644--- a/src/providers/moviebox/mod.rs+++ b/src/providers/moviebox/mod.rs@@ -2,7 +2,7 @@ pub mod client;pub mod crypto;use client::{MovieBoxClient, ScraperError};-use serde_json::{json, Value};+use serde_json::{Value, json};impl MovieBoxClient {pub async fn search(&self, query: &str, page: usize) -> Result<Value, ScraperError> {@@ -17,10 +17,16 @@ impl MovieBoxClient {"subjectType": "All","tabId": "All"});- self.post("/wefeed-mobile-bff/subject-api/search/v2", &payload).await+ self.post("/wefeed-mobile-bff/subject-api/search/v2", &payload)+ .await}- async fn search_with_tab(&self, query: &str, page: usize, tab_id: &str) -> Result<Value, ScraperError> {+ async fn search_with_tab(+ &self,+ query: &str,+ page: usize,+ tab_id: &str,+ ) -> Result<Value, ScraperError> {let payload = json!({"keyword": query,"page": page,@@ -43,8 +49,8 @@ impl MovieBoxClient {pub async fn get_resources(&self,subject_id: &str,- season: usize,- episode: usize,+ _season: usize,+ _episode: usize,page: usize,resolution: Option<&str>,) -> Result<Value, ScraperError> {@@ -58,17 +64,10 @@ impl MovieBoxClient {String::new()};- let path = if season == 0 && episode == 0 {- format!(- "/wefeed-mobile-bff/subject-api/resource?subjectId={}&page={}&perPage=20{}",- subject_id, page, res_param- )- } else {- format!(- "/wefeed-mobile-bff/subject-api/resource?subjectId={}&se={}&ep={}&page={}&perPage=20{}",- subject_id, season, episode, page, res_param- )- };+ let path = format!(+ "/wefeed-mobile-bff/subject-api/resource?subjectId={}&page={}&perPage=20{}",+ subject_id, page, res_param+ );self.get(&path).await}@@ -77,10 +76,14 @@ impl MovieBoxClient {subject_id: &str,season: usize,episode: usize,+ absolute_episode_index: usize,) -> Result<Value, ScraperError> {let resolutions = ["1080", "720", "480", "360", ""];let mut handles = Vec::new();+ let per_page = 20;+ let page = (absolute_episode_index / per_page) + 1;+for res in resolutions {let c = self.clone();let sid = subject_id.to_string();@@ -88,7 +91,7 @@ impl MovieBoxClient {handles.push(tokio::spawn(async move {tokio::time::timeout(std::time::Duration::from_secs(4),- c.get_resources(&sid, season, episode, 1, Some(&r)),+ c.get_resources(&sid, season, episode, page, Some(&r)),).await.unwrap_or(Err(ScraperError::ApiStatus(408)))@@ -102,7 +105,27 @@ impl MovieBoxClient {match res_result {Ok(res) => {if let Some(list) = res.get("list").and_then(|l| l.as_array()) {- all_list.extend(list.clone());+ let target_ep = episode;+ let mut found: Option<&Value> = None;+ for stream in list.iter() {+ let stream_ep =+ stream.get("ep").and_then(|e| e.as_u64()).unwrap_or(1) as usize;+ let stream_se =+ stream.get("se").and_then(|s| s.as_u64()).unwrap_or(1) as usize;++ if stream_ep == target_ep {+ if stream_se == season {+ found = Some(stream);+ break;+ } else if found.is_none() {+ found = Some(stream);+ }+ }+ }++ if let Some(stream) = found {+ all_list.push(stream.clone());+ }}}Err(e) => {diff --git a/src/tui/action.rs b/src/tui/action.rsindex 41b74e7..204bd3c 100644--- a/src/tui/action.rs+++ b/src/tui/action.rs@@ -7,9 +7,16 @@ pub enum Action {SelectLanguage(usize),ToggleLogs,ToggleHelp,- Search { query: String },- SelectSuggestion { query: String },- SearchSuccess { query: String, payload: serde_json::Value },+ Search {+ query: String,+ },+ SelectSuggestion {+ query: String,+ },+ SearchSuccess {+ query: String,+ payload: serde_json::Value,+ },SearchFailure(String),Suggest(String),SuggestSuccess(String, serde_json::Value),@@ -37,6 +44,7 @@ pub enum Action {subject_id: String,season: usize,episode: usize,+ absolute_episode_index: usize,resolution: String,},ResourcesSuccess(serde_json::Value),diff --git a/src/tui/app.rs b/src/tui/app.rsindex 88f9533..7964457 100644--- a/src/tui/app.rs+++ b/src/tui/app.rs@@ -2,13 +2,13 @@ use ratatui::{DefaultTerminal, Frame};use std::time::Duration;use tokio::sync::mpsc;+use crate::providers::moviebox::client::MovieBoxClient;use crate::tui::{action::Action,event::EventHandler,state::{AppState, InputMode, Screen, SearchResult},theme::Theme,};-use crate::providers::moviebox::client::MovieBoxClient;use update_informer::Check;pub struct App {@@ -37,6 +37,48 @@ impl App {}}+ fn get_absolute_episode_index(&self) -> usize {+ let mut absolute_episode_index = 0;+ let selected_season_idx = self.state.season_list_state.selected().unwrap_or(0);+ for (i, season) in self.state.available_seasons.iter().enumerate() {+ if i < selected_season_idx {+ absolute_episode_index +=+ season.get("maxEp").and_then(|m| m.as_i64()).unwrap_or(1) as usize;+ } else {+ break;+ }+ }+ absolute_episode_index += self.state.episode_list_state.selected().unwrap_or(0);+ absolute_episode_index+ }++ fn trigger_episode_fetch(&mut self) {+ if let Some(id) = &self.state.active_subject_id {+ let se_idx = self.state.season_list_state.selected().unwrap_or(0);+ let ep_idx = self.state.episode_list_state.selected().unwrap_or(0);++ if let Some(season) = self.state.available_seasons.get(se_idx) {+ let se = season.get("se").and_then(|s| s.as_i64()).unwrap_or(1) as usize;+ let ep = ep_idx + 1;+ self.state.selected_season = se;+ self.state.selected_episode = ep;+ self.state.resource_list_state.select(None); // Reset stream selection++ let abs_idx = self.get_absolute_episode_index();++ self.action_sender+ .send(Action::FetchResources {+ subject_id: id.clone(),+ season: se,+ episode: ep,+ absolute_episode_index: abs_idx,+ resolution: "".to_string(),+ })+ .ok();+ }+ }+ }+fn get_selected_link(&self) -> Option<String> {self.state.selected_resources@@ -109,9 +151,12 @@ impl App {tokio::task::spawn_blocking(move || {let pkg_name = env!("CARGO_PKG_NAME");let current_version = env!("CARGO_PKG_VERSION");- let informer = update_informer::new(update_informer::registry::Crates, pkg_name, current_version);+ let informer =+ update_informer::new(update_informer::registry::Crates, pkg_name, current_version);if let Ok(Some(version)) = informer.check_version() {- update_sender.send(Action::UpdateAvailable(version.to_string())).ok();+ update_sender+ .send(Action::UpdateAvailable(version.to_string()))+ .ok();}});@@ -149,9 +194,12 @@ impl App {self.state.status_message.clear();}}-+let current_query = self.state.search_query.trim().to_string();- if current_query != self.state.last_suggest_query && self.state.last_search_edit.elapsed() >= std::time::Duration::from_millis(250) {+ if current_query != self.state.last_suggest_query+ && self.state.last_search_edit.elapsed()+ >= std::time::Duration::from_millis(250)+ {self.state.last_suggest_query = current_query.clone();if !current_query.is_empty() {self.action_sender.send(Action::Suggest(current_query)).ok();@@ -196,7 +244,8 @@ impl App {InputMode::Editing => match key.code {KeyCode::Esc => {self.state.input_mode = InputMode::Normal;- self.state.status_message = String::new(); self.state.status_timer = 150;+ self.state.status_message = String::new();+ self.state.status_timer = 150;}KeyCode::Enter => {let query = self.state.search_query.trim().to_string();@@ -233,7 +282,8 @@ impl App {Some(i) => i - 1,};self.state.suggest_index = Some(next_idx);- self.state.search_query = self.state.search_suggestions[next_idx].clone();+ self.state.search_query =+ self.state.search_suggestions[next_idx].clone();}KeyCode::Down if !self.state.search_suggestions.is_empty() => {let max_idx = self.state.search_suggestions.len() - 1;@@ -243,7 +293,8 @@ impl App {Some(i) => i + 1,};self.state.suggest_index = Some(next_idx);- self.state.search_query = self.state.search_suggestions[next_idx].clone();+ self.state.search_query =+ self.state.search_suggestions[next_idx].clone();}_ => {}},@@ -282,7 +333,8 @@ impl App {self.state.search_suggestions.clear();self.state.suggest_index = None;- self.state.status_message = String::new(); self.state.status_timer = 150;+ self.state.status_message = String::new();+ self.state.status_timer = 150;}_ => {}},@@ -327,53 +379,37 @@ impl App {self.action_sender.send(Action::PlayStream).ok();}crate::tui::state::DetailsPane::Seasons => {- self.action_sender.send(Action::MoveRight).ok();- }- crate::tui::state::DetailsPane::Episodes => {- if let Some(res) = &self.state.selected_details- && let Some(id) = res.get("id").and_then(|i| i.as_str())- {- let se_idx = self- .state- .season_list_state- .selected()- .unwrap_or(0);- let ep_idx = self+ self.action_sender.send(Action::MoveRight).ok();+ }+ crate::tui::state::DetailsPane::Episodes => {+ self.trigger_episode_fetch();+ self.action_sender.send(Action::MoveRight).ok();+ }+ crate::tui::state::DetailsPane::Languages => {+ let idx = self.state- .episode_list_state+ .language_list_state.selected().unwrap_or(0);-- if let Some(season) =- self.state.available_seasons.get(se_idx)- {- let se = season- .get("se")- .and_then(|s| s.as_i64())- .unwrap_or(1)- as usize;- let ep = ep_idx + 1;- self.state.selected_season = se;- self.state.selected_episode = ep;- self.state.resource_list_state.select(None); // Reset stream selection- self.action_sender- .send(Action::FetchResources {- subject_id: id.to_string(),- season: se,- episode: ep,- resolution: "".to_string(),- })- .ok();- self.action_sender.send(Action::MoveRight).ok();- }+ self.action_sender+ .send(Action::FetchResources {+ subject_id: self+ .state+ .active_subject_id+ .clone()+ .unwrap_or("".to_string()),+ season: self.state.selected_season,+ episode: self.state.selected_episode,+ absolute_episode_index: self+ .get_absolute_episode_index(),+ resolution: "".to_string(),+ })+ .ok();+ self.action_sender+ .send(Action::SelectLanguage(idx))+ .ok();}}- crate::tui::state::DetailsPane::Languages => {- let idx =- self.state.language_list_state.selected().unwrap_or(0);- self.action_sender.send(Action::SelectLanguage(idx)).ok();- }- }}}_ => {}@@ -413,7 +449,8 @@ impl App {self.state.search_results.clear();self.state.search_query.clear();self.state.search_preview = None;- self.state.status_message = "Search cleared.".to_string(); self.state.status_timer = 150;+ self.state.status_message = "Search cleared.".to_string();+ self.state.status_timer = 150;}}Screen::Search => {@@ -422,7 +459,8 @@ impl App {Screen::Details => {self.state.active_screen = Screen::Home;self.state.status_message =- "Select a movie/series and press Enter".to_string(); self.state.status_timer = 150;+ "Select a movie/series and press Enter".to_string();+ self.state.status_timer = 150;}}}@@ -437,7 +475,8 @@ impl App {self.state.selected_resources = None;self.state.resource_list_state.select(None);self.state.language_chosen = true;- self.state.status_message = "Switching language...".to_string(); self.state.status_timer = 150;+ self.state.status_message = "Switching language...".to_string();+ self.state.status_timer = 150;self.action_sender.send(Action::FetchDetails(next_id)).ok();}}@@ -455,14 +494,14 @@ impl App {if self.state.suggest_index.is_some() {return None;}-+let matches = query == self.state.search_query.trim();if !matches {return None;}-+self.state.search_suggestions.clear();-+let subjects_opt = payload.get("results").and_then(|r| r.as_array())@@ -483,10 +522,16 @@ impl App {.unwrap_or(&raw_title).trim().to_string();-- let normalized_query = query.to_lowercase().replace(|c: char| !c.is_alphanumeric(), "");- let normalized_title = clean_title.to_lowercase().replace(|c: char| !c.is_alphanumeric(), "");- if !normalized_title.contains(&normalized_query) && !normalized_query.is_empty() {++ let normalized_query = query+ .to_lowercase()+ .replace(|c: char| !c.is_alphanumeric(), "");+ let normalized_title = clean_title+ .to_lowercase()+ .replace(|c: char| !c.is_alphanumeric(), "");+ if !normalized_title.contains(&normalized_query)+ && !normalized_query.is_empty()+ {continue;}@@ -508,7 +553,8 @@ impl App {self.state.search_list_state.select(Some(0));self.state.search_suggestions.clear();self.state.suggest_index = None;- self.state.status_message = format!("Searching for '{}'...", query); self.state.status_timer = 150;+ self.state.status_message = format!("Searching for '{}'...", query);+ self.state.status_timer = 150;self.state.add_log(format!("API Search request: {}", query));let client = self.client.clone();@@ -517,7 +563,12 @@ impl App {tokio::spawn(async move {match client.search(&query_clone, 1).await {Ok(res) => {- sender.send(Action::SearchSuccess { query: query_clone, payload: res }).ok();+ sender+ .send(Action::SearchSuccess {+ query: query_clone,+ payload: res,+ })+ .ok();}Err(e) => {sender.send(Action::SearchFailure(format!("{:?}", e))).ok();@@ -531,7 +582,6 @@ impl App {}self.state.is_loading = false;self.state.search_results.clear();- let _ = std::fs::write("search_debug.json", serde_json::to_string_pretty(&payload).unwrap_or_default());let mut count = 0;let subjects_opt = payload.get("results")@@ -560,10 +610,15 @@ impl App {.trim().to_string();-- let normalized_query = query.to_lowercase().replace(|c: char| !c.is_alphanumeric(), "");- let normalized_title = raw_title.to_lowercase().replace(|c: char| !c.is_alphanumeric(), "");- if !normalized_title.contains(&normalized_query) && !normalized_query.is_empty() {+ let normalized_query = query+ .to_lowercase()+ .replace(|c: char| !c.is_alphanumeric(), "");+ let normalized_title = raw_title+ .to_lowercase()+ .replace(|c: char| !c.is_alphanumeric(), "");+ if !normalized_title.contains(&normalized_query)+ && !normalized_query.is_empty()+ {continue;}@@ -577,7 +632,8 @@ impl App {.unwrap_or("N/A").to_string();- let cover_url = item.get("poster")+ let cover_url = item+ .get("poster").or_else(|| item.get("cover")).or_else(|| item.get("pic")).and_then(|c| {@@ -606,14 +662,15 @@ impl App {self.state.search_results.sort_by(|a, b| {let a_title = a.title.to_lowercase();let b_title = b.title.to_lowercase();-+let a_exact = a_title == query_lower;let b_exact = b_title == query_lower;-+let a_starts = a_title.starts_with(&query_lower);let b_starts = b_title.starts_with(&query_lower);-- b_exact.cmp(&a_exact)++ b_exact+ .cmp(&a_exact).then_with(|| b_starts.cmp(&a_starts)).then_with(|| b.stype.cmp(&a.stype)).then_with(|| b.release_year.cmp(&a.release_year))@@ -621,19 +678,32 @@ impl App {}if !self.state.search_results.is_empty() {- let results_to_fetch = self.state.search_results.iter().take(15).map(|r| {- (r.id.clone(), r.stype, r.cover_url.clone())- }).collect::<Vec<_>>();-+ let results_to_fetch = self+ .state+ .search_results+ .iter()+ .take(15)+ .map(|r| (r.id.clone(), r.stype, r.cover_url.clone()))+ .collect::<Vec<_>>();+let sender = self.action_sender.clone();tokio::spawn(async move {for (id, stype, cover_url) in results_to_fetch {let mut url_to_fetch = cover_url;if url_to_fetch.is_none() {let type_str = if stype == 2 { "series" } else { "movie" };- if let Ok(resp) = reqwest::get(&format!("https://v3-cinemeta.strem.io/meta/{}/{}.json", type_str, id)).await {+ if let Ok(resp) = reqwest::get(&format!(+ "https://v3-cinemeta.strem.io/meta/{}/{}.json",+ type_str, id+ ))+ .await+ {if let Ok(json) = resp.json::<serde_json::Value>().await {- url_to_fetch = json.get("meta").and_then(|m| m.get("poster")).and_then(|p| p.as_str()).map(|s| s.to_string());+ url_to_fetch = json+ .get("meta")+ .and_then(|m| m.get("poster"))+ .and_then(|p| p.as_str())+ .map(|s| s.to_string());}}}@@ -641,7 +711,10 @@ impl App {if let Ok(resp) = reqwest::get(&url).await {if let Ok(bytes) = resp.bytes().await {if let Ok(img) = image::load_from_memory(&bytes) {- let _ = sender.send(Action::SearchPosterLoaded(id, Some(std::sync::Arc::new(img))));+ let _ = sender.send(Action::SearchPosterLoaded(+ id,+ Some(std::sync::Arc::new(img)),+ ));}}}@@ -650,7 +723,8 @@ impl App {});}- self.state.status_message = format!("Found {} results.", count); self.state.status_timer = 150;+ self.state.status_message = format!("Found {} results.", count);+ self.state.status_timer = 150;self.state.add_log(format!("Search completed: {} items loaded.", count));@@ -660,14 +734,17 @@ impl App {if let Some(res) = self.state.search_results.first() {self.state.search_list_state.select(Some(0));- self.action_sender.send(Action::FetchPreview(res.id.clone())).ok();+ self.action_sender+ .send(Action::FetchPreview(res.id.clone()))+ .ok();} else {self.state.search_list_state.select(None);}}Action::SearchFailure(err) => {self.state.is_loading = false;- self.state.status_message = format!("Search failed: {}", err); self.state.status_timer = 150;+ self.state.status_message = format!("Search failed: {}", err);+ self.state.status_timer = 150;self.state.add_log(format!("Search API Error: {}", err));}Action::MoveUp => {@@ -690,63 +767,75 @@ impl App {}}}- Screen::Details => {- match self.state.details_pane {- crate::tui::state::DetailsPane::Streams => {- let current =- self.state.resource_list_state.selected().unwrap_or(0);- if current > 0 {- self.state.resource_list_state.select(Some(current - 1));- }+ Screen::Details => match self.state.details_pane {+ crate::tui::state::DetailsPane::Streams => {+ let current = self.state.resource_list_state.selected().unwrap_or(0);+ if current > 0 {+ self.state.resource_list_state.select(Some(current - 1));}- crate::tui::state::DetailsPane::Seasons => {- let current = self.state.season_list_state.selected().unwrap_or(0);- if current > 0 {- self.state.season_list_state.select(Some(current - 1));- self.state.selected_season = current;- }+ }+ crate::tui::state::DetailsPane::Seasons => {+ let current = self.state.season_list_state.selected().unwrap_or(0);+ if current > 0 {+ self.state.season_list_state.select(Some(current - 1));+ self.state.episode_list_state.select(Some(0));+ self.trigger_episode_fetch();}- crate::tui::state::DetailsPane::Episodes => {- let current = self.state.episode_list_state.selected().unwrap_or(0);- if current > 0 {- self.state.episode_list_state.select(Some(current - 1));- }+ }+ crate::tui::state::DetailsPane::Episodes => {+ let current = self.state.episode_list_state.selected().unwrap_or(0);+ if current > 0 {+ self.state.episode_list_state.select(Some(current - 1));+ self.trigger_episode_fetch();}- crate::tui::state::DetailsPane::Languages => {- let current =- self.state.language_list_state.selected().unwrap_or(0);- if current > 0 {- self.state.language_list_state.select(Some(current - 1));- }+ }+ crate::tui::state::DetailsPane::Languages => {+ let current = self.state.language_list_state.selected().unwrap_or(0);+ if current > 0 {+ self.state.language_list_state.select(Some(current - 1));}}- }+ },_ => {}}}Action::TabPane => {if self.state.active_screen == Screen::Details {use crate::tui::state::DetailsPane;- let has_languages = self.state.selected_details.as_ref()+ let has_languages = self+ .state+ .selected_details+ .as_ref().and_then(|d| d.get("dubs")).and_then(|d| d.as_array()).is_some_and(|a| a.len() > 1);-- let is_series = self.state.selected_details.as_ref()++ let is_series = self+ .state+ .selected_details+ .as_ref().and_then(|d| d.get("stype").or_else(|| d.get("subjectType"))).and_then(|t| t.as_i64()).is_some_and(|t| t == 2);-+self.state.details_pane = match self.state.details_pane {DetailsPane::Languages => {- if is_series { DetailsPane::Seasons } else { DetailsPane::Streams }+ if is_series {+ DetailsPane::Seasons+ } else {+ DetailsPane::Streams+ }}DetailsPane::Seasons => DetailsPane::Episodes,DetailsPane::Episodes => DetailsPane::Streams,DetailsPane::Streams => {- if has_languages { DetailsPane::Languages }- else if is_series { DetailsPane::Seasons }- else { DetailsPane::Streams }+ if has_languages {+ DetailsPane::Languages+ } else if is_series {+ DetailsPane::Seasons+ } else {+ DetailsPane::Streams+ }}};}@@ -771,56 +860,55 @@ impl App {}}}- Screen::Details => {- match self.state.details_pane {- crate::tui::state::DetailsPane::Streams => {- let res_opt = &self.state.selected_resources;- let list_opt = res_opt- .as_ref()- .and_then(|r| r.get("list"))- .and_then(|l| l.as_array());- if let Some(list) = list_opt {- let current =- self.state.resource_list_state.selected().unwrap_or(0);- if current + 1 < list.len() {- self.state.resource_list_state.select(Some(current + 1));- }+ Screen::Details => match self.state.details_pane {+ crate::tui::state::DetailsPane::Streams => {+ let res_opt = &self.state.selected_resources;+ let list_opt = res_opt+ .as_ref()+ .and_then(|r| r.get("list"))+ .and_then(|l| l.as_array());+ if let Some(list) = list_opt {+ let current =+ self.state.resource_list_state.selected().unwrap_or(0);+ if current + 1 < list.len() {+ self.state.resource_list_state.select(Some(current + 1));}}- crate::tui::state::DetailsPane::Seasons => {- let current = self.state.season_list_state.selected().unwrap_or(0);- if current + 1 < self.state.available_seasons.len() {- self.state.season_list_state.select(Some(current + 1));- }+ }+ crate::tui::state::DetailsPane::Seasons => {+ let current = self.state.season_list_state.selected().unwrap_or(0);+ if current + 1 < self.state.available_seasons.len() {+ self.state.season_list_state.select(Some(current + 1));+ self.state.episode_list_state.select(Some(0));+ self.trigger_episode_fetch();}- crate::tui::state::DetailsPane::Episodes => {- let current = self.state.episode_list_state.selected().unwrap_or(0);- if let Some(season) = self- .state- .available_seasons- .get(self.state.season_list_state.selected().unwrap_or(0))- {- let max_ep =- season.get("maxEp").and_then(|m| m.as_i64()).unwrap_or(1)- as usize;- if current + 1 < max_ep {- self.state.episode_list_state.select(Some(current + 1));- }+ }+ crate::tui::state::DetailsPane::Episodes => {+ let current = self.state.episode_list_state.selected().unwrap_or(0);+ if let Some(season) = self+ .state+ .available_seasons+ .get(self.state.season_list_state.selected().unwrap_or(0))+ {+ let max_ep =+ season.get("maxEp").and_then(|m| m.as_i64()).unwrap_or(1)+ as usize;+ if current + 1 < max_ep {+ self.state.episode_list_state.select(Some(current + 1));+ self.trigger_episode_fetch();}}- crate::tui::state::DetailsPane::Languages => {- let current =- self.state.language_list_state.selected().unwrap_or(0);- if let Some(details) = &self.state.selected_details- && let Some(dubs) =- details.get("dubs").and_then(|d| d.as_array())- && current + 1 < dubs.len()- {- self.state.language_list_state.select(Some(current + 1));- }+ }+ crate::tui::state::DetailsPane::Languages => {+ let current = self.state.language_list_state.selected().unwrap_or(0);+ if let Some(details) = &self.state.selected_details+ && let Some(dubs) = details.get("dubs").and_then(|d| d.as_array())+ && current + 1 < dubs.len()+ {+ self.state.language_list_state.select(Some(current + 1));}}- }+ },_ => {}}}@@ -833,16 +921,25 @@ impl App {} else {self.state.search_list_state.select(Some(0));}- if let Some(res) = self.state.search_results.get(self.state.search_list_state.selected().unwrap_or(0)) {- self.action_sender.send(Action::FetchPreview(res.id.clone())).ok();+ if let Some(res) = self+ .state+ .search_results+ .get(self.state.search_list_state.selected().unwrap_or(0))+ {+ self.action_sender+ .send(Action::FetchPreview(res.id.clone()))+ .ok();}} else if self.state.active_screen == Screen::Details {- let has_languages = self.state.selected_details.as_ref()+ let has_languages = self+ .state+ .selected_details+ .as_ref().and_then(|d| d.get("dubs")).and_then(|d| d.as_array()).is_some_and(|a| a.len() > 1);let is_series = !self.state.available_seasons.is_empty();-+match self.state.details_pane {crate::tui::state::DetailsPane::Streams => {if is_series {@@ -873,23 +970,34 @@ impl App {} else if total > 0 {self.state.search_list_state.select(Some(total - 1));}- if let Some(res) = self.state.search_results.get(self.state.search_list_state.selected().unwrap_or(0)) {- self.action_sender.send(Action::FetchPreview(res.id.clone())).ok();+ if let Some(res) = self+ .state+ .search_results+ .get(self.state.search_list_state.selected().unwrap_or(0))+ {+ self.action_sender+ .send(Action::FetchPreview(res.id.clone()))+ .ok();}} else if self.state.active_screen == Screen::Details {- let has_languages = self.state.selected_details.as_ref()+ let has_languages = self+ .state+ .selected_details+ .as_ref().and_then(|d| d.get("dubs")).and_then(|d| d.as_array()).is_some_and(|a| a.len() > 1);let is_series = !self.state.available_seasons.is_empty();-+match self.state.details_pane {crate::tui::state::DetailsPane::Languages => {if !has_languages || self.state.language_chosen {if is_series {- self.state.details_pane = crate::tui::state::DetailsPane::Seasons;+ self.state.details_pane =+ crate::tui::state::DetailsPane::Seasons;} else {- self.state.details_pane = crate::tui::state::DetailsPane::Streams;+ self.state.details_pane =+ crate::tui::state::DetailsPane::Streams;}}}@@ -915,7 +1023,9 @@ impl App {let idx = self.state.subtitle_list_state.selected().unwrap_or(0);let sub_url = self.state.subtitle_list.get(idx).map(|(_, u)| u.clone());if let Some(link) = self.state.pending_play_link.take() {- self.action_sender.send(Action::LaunchMpv(link, sub_url)).ok();+ self.action_sender+ .send(Action::LaunchMpv(link, sub_url))+ .ok();}return None;}@@ -936,7 +1046,8 @@ impl App {self.state.poster_protocol = None;self.state.available_seasons.clear();self.state.status_message =- format!("Loading details for {}...", item.title); self.state.status_timer = 150;+ format!("Loading details for {}...", item.title);+ self.state.status_timer = 150;let sender = self.action_sender.clone();sender.send(Action::FetchDetails(item.id)).ok();@@ -978,7 +1089,15 @@ impl App {}Action::PreviewSuccess(id, json) => {let current_id = if self.state.active_screen == Screen::Details {- self.state.selected_details.as_ref().and_then(|d| d.get("id")).and_then(|i| i.as_i64().map(|n| n.to_string()).or_else(|| i.as_str().map(|s| s.to_string())))+ self.state+ .selected_details+ .as_ref()+ .and_then(|d| d.get("id"))+ .and_then(|i| {+ i.as_i64()+ .map(|n| n.to_string())+ .or_else(|| i.as_str().map(|s| s.to_string()))+ })} else {self.state.search_list_state@@ -990,8 +1109,6 @@ impl App {if current_id.as_deref() != Some(id.as_str()) {return None;}-- let _ = std::fs::write("preview_debug.json", serde_json::to_string_pretty(&json).unwrap_or_default());self.state.preview_loading = false;self.state.search_preview = Some(json.clone());@@ -1007,7 +1124,11 @@ impl App {let id_clone = id.clone();tokio::spawn(async move {let client = reqwest::Client::new();- if let Ok(resp) = client.get(&url_clone).header("User-Agent", "MovieBox-Tui/1.0").send().await+ if let Ok(resp) = client+ .get(&url_clone)+ .header("User-Agent", "MovieBox-Tui/1.0")+ .send()+ .await&& let Ok(bytes) = resp.bytes().await&& let Ok(img) = image::load_from_memory(&bytes){@@ -1019,8 +1140,9 @@ impl App {}Action::PosterSuccess(id, img) => {self.state.image_cache.put(id.clone(), img.clone());-- let current_id = self.state++ let current_id = self+ .state.search_list_state.selected().and_then(|idx| self.state.search_results.get(idx))@@ -1049,11 +1171,11 @@ impl App {let _ = clipboard.set_text(link.clone());self.state.toast_message = Some("✓ Copied stream link!".to_string());self.state.toast_timer = 30;- self.state.add_log(- "Stream link successfully copied to clipboard.".to_string(),- );+ self.state+ .add_log("Stream link successfully copied to clipboard.".to_string());} else {- self.state.status_message = format!("Link: {}", link); self.state.status_timer = 150;+ self.state.status_message = format!("Link: {}", link);+ self.state.status_timer = 150;}}}@@ -1087,11 +1209,21 @@ impl App {}Action::ShowSubtitlePopup(link, ext_captions) => {let mut options = vec![("None".to_string(), "".to_string())];-- if let Some(captions_list) = ext_captions.get("extCaptions").and_then(|c| c.as_array()) {++ if let Some(captions_list) =+ ext_captions.get("extCaptions").and_then(|c| c.as_array())+ {for cap in captions_list {- let name = cap.get("lanName").and_then(|n| n.as_str()).unwrap_or("Unknown").to_string();- let url = cap.get("url").and_then(|u| u.as_str()).unwrap_or("").to_string();+ let name = cap+ .get("lanName")+ .and_then(|n| n.as_str())+ .unwrap_or("Unknown")+ .to_string();+ let url = cap+ .get("url")+ .and_then(|u| u.as_str())+ .unwrap_or("")+ .to_string();if !url.is_empty() {options.push((name, url));}@@ -1111,22 +1243,24 @@ impl App {use std::process::{Command, Stdio};self.state.toast_message = Some("✓ Launching MPV...".to_string());self.state.toast_timer = 40;-+let mut cmd = Command::new("mpv");cmd.arg(&link).stdout(Stdio::null()).stderr(Stdio::null());-+if let Some(sub) = subtitle_url {if !sub.is_empty() {cmd.arg(format!("--sub-file={}", sub));}}-+if cmd.spawn().is_ok() {self.state.add_log("MPV started successfully.".to_string());} else {- self.state.toast_message = Some("✗ Error: mpv player not found in PATH".to_string());+ self.state.toast_message =+ Some("✗ Error: mpv player not found in PATH".to_string());self.state.toast_timer = 60;- self.state.add_log("Error starting mpv process. Command failed.".to_string());+ self.state+ .add_log("Error starting mpv process. Command failed.".to_string());}}Action::DownloadStream => {@@ -1572,8 +1706,9 @@ impl App {}}Action::DetailsSuccess(id, payload) => {+ self.state.active_subject_id = Some(id.clone());self.state.selected_details = Some(payload.clone());-+if self.state.poster_image.is_none() {if let Some(cached_img) = self.state.image_cache.get(&id) {self.state.poster_image = Some((**cached_img).clone());@@ -1585,11 +1720,18 @@ impl App {let id_clone = id.clone();tokio::spawn(async move {let client = reqwest::Client::new();- if let Ok(resp) = client.get(&url_clone).header("User-Agent", "MovieBox-Tui/1.0").send().await+ if let Ok(resp) = client+ .get(&url_clone)+ .header("User-Agent", "MovieBox-Tui/1.0")+ .send()+ .await&& let Ok(bytes) = resp.bytes().await&& let Ok(img) = image::load_from_memory(&bytes){- let _ = action_tx.send(Action::PosterSuccess(id_clone, std::sync::Arc::new(img)));+ let _ = action_tx.send(Action::PosterSuccess(+ id_clone,+ std::sync::Arc::new(img),+ ));}});}@@ -1630,9 +1772,20 @@ impl App {if let Some(dubs) = payload.get("dubs").and_then(|d| d.as_array()) {let mut current_idx = 0;- let current_id = payload.get("id").and_then(|i| i.as_i64().map(|n| n.to_string()).or_else(|| i.as_str().map(|s| s.to_string()))).unwrap_or_default();+ let current_id = payload+ .get("id")+ .and_then(|i| {+ i.as_i64()+ .map(|n| n.to_string())+ .or_else(|| i.as_str().map(|s| s.to_string()))+ })+ .unwrap_or_default();for (i, dub) in dubs.iter().enumerate() {- let dub_id = dub.get("subjectId").and_then(|i| i.as_i64().map(|n| n.to_string()).or_else(|| i.as_str().map(|s| s.to_string())));+ let dub_id = dub.get("subjectId").and_then(|i| {+ i.as_i64()+ .map(|n| n.to_string())+ .or_else(|| i.as_str().map(|s| s.to_string()))+ });if dub_id == Some(current_id.clone()) {current_idx = i;}@@ -1653,7 +1806,8 @@ impl App {if has_multiple_dubs && !self.state.language_chosen {self.state.details_pane = crate::tui::state::DetailsPane::Languages;self.state.is_loading = false;- self.state.status_message = "Please select a language dubbing.".to_string(); self.state.status_timer = 150;+ self.state.status_message = "Please select a language dubbing.".to_string();+ self.state.status_timer = 150;} else {if stype == 2 && !self.state.available_seasons.is_empty() {self.state.details_pane = crate::tui::state::DetailsPane::Episodes;@@ -1672,6 +1826,7 @@ impl App {subject_id: id,season: se,episode: ep,+ absolute_episode_index: self.get_absolute_episode_index(),resolution: "".to_string(),}).ok();@@ -1679,18 +1834,26 @@ impl App {}Action::DetailsFailure(err) => {self.state.is_loading = false;- self.state.status_message = format!("Details fetch failed: {}", err); self.state.status_timer = 150;+ self.state.status_message = format!("Details fetch failed: {}", err);+ self.state.status_timer = 150;}Action::FetchResources {subject_id,season,episode,+ absolute_episode_index,resolution: _,} => {+ self.state.is_loading = true;+ self.state.selected_resources = None;+let client = self.client.clone();let sender = self.action_sender.clone();tokio::spawn(async move {- match client.get_all_resources(&subject_id, season, episode).await {+ match client+ .get_all_resources(&subject_id, season, episode, absolute_episode_index)+ .await+ {Ok(res) => {sender.send(Action::ResourcesSuccess(res)).ok();}@@ -1724,15 +1887,18 @@ impl App {self.state.resource_list_state.select(if count > 0 { Some(0) } else { None });- self.state.status_message = format!("Resolved {} direct stream sources.", count); self.state.status_timer = 150;+ self.state.status_message = format!("Resolved {} direct stream sources.", count);+ self.state.status_timer = 150;}Action::ResourcesFailure(err) => {self.state.is_loading = false;if err.contains("406") || err.to_lowercase().contains("exhausted") {self.state.status_message =- "Error: No streams found on server (unreleased or removed).".to_string(); self.state.status_timer = 150;+ "Error: No streams found on server (unreleased or removed).".to_string();+ self.state.status_timer = 150;} else {- self.state.status_message = format!("Error: Links resolution failed: {}", err); self.state.status_timer = 150;+ self.state.status_message = format!("Error: Links resolution failed: {}", err);+ self.state.status_timer = 150;}}Action::UpdateDownload(prog, stat) => {@@ -1815,16 +1981,22 @@ impl App {let chunks = Layout::default().direction(Direction::Vertical)- .constraints([Constraint::Min(0), Constraint::Length(1)])+ .constraints([Constraint::Length(1), Constraint::Min(0)]).split(area);let toast_area = Layout::default().direction(Direction::Horizontal)- .constraints([Constraint::Min(0), Constraint::Length(msg.chars().count() as u16 + 2)])- .split(chunks[1])[1];--- let color = if self.state.toast_timer < 10 { self.theme.muted } else { self.theme.success };+ .constraints([+ Constraint::Min(0),+ Constraint::Length(msg.chars().count() as u16 + 2),+ ])+ .split(chunks[0])[1];++ let color = if self.state.toast_timer < 10 {+ self.theme.muted+ } else {+ self.theme.success+ };let p = Paragraph::new(msg.clone()).style(color.add_modifier(ratatui::style::Modifier::BOLD));diff --git a/src/tui/screens/details.rs b/src/tui/screens/details.rsindex 9853980..531c5f2 100644--- a/src/tui/screens/details.rs+++ b/src/tui/screens/details.rs@@ -3,7 +3,10 @@ use ratatui::{Frame,layout::{Alignment, Constraint, Direction, Layout, Rect},text::{Line, Span},- widgets::{Block, Borders, List, ListItem, Paragraph, Wrap},+ widgets::{+ Block, Borders, List, ListItem, Paragraph, Scrollbar, ScrollbarOrientation, ScrollbarState,+ Wrap,+ },};pub fn draw(frame: &mut Frame, area: Rect, state: &mut AppState, theme: &Theme) {@@ -67,10 +70,22 @@ pub fn draw(frame: &mut Frame, area: Rect, state: &mut AppState, theme: &Theme).get("genre").and_then(|g| {if let Some(a) = g.as_array() {- let joined = a.iter().filter_map(|v| v.as_str()).collect::<Vec<_>>().join(", ");- if joined.is_empty() { None } else { Some(joined) }+ let joined = a+ .iter()+ .filter_map(|v| v.as_str())+ .collect::<Vec<_>>()+ .join(", ");+ if joined.is_empty() {+ None+ } else {+ Some(joined)+ }} else if let Some(s) = g.as_str() {- if s.is_empty() { None } else { Some(s.to_string()) }+ if s.is_empty() {+ None+ } else {+ Some(s.to_string())+ }} else {None}@@ -128,8 +143,6 @@ pub fn draw(frame: &mut Frame, area: Rect, state: &mut AppState, theme: &Theme)};let right_area = h_chunks[2];--if let Some(img) = &state.poster_image {if state.poster_protocol.as_ref().map(|(r, _)| *r) != Some(poster_area)&& let Some(picker) = &mut state.image_picker@@ -156,9 +169,9 @@ pub fn draw(frame: &mut Frame, area: Rect, state: &mut AppState, theme: &Theme)let placeholder_block = Block::default().borders(Borders::ALL).border_style(theme.muted);-+let inner = placeholder_block.inner(poster_area);-+let (pad, msg) = if state.is_loading {let p = "\n".repeat((inner.height.saturating_sub(1) / 2) as usize);(p, format!("{}\nLoading Art", current_spinner))@@ -166,7 +179,7 @@ pub fn draw(frame: &mut Frame, area: Rect, state: &mut AppState, theme: &Theme)let p = "\n".repeat((inner.height.saturating_sub(1) / 2) as usize);(p, title.to_string())};-+let placeholder = Paragraph::new(format!("{}{}", pad, msg)).style(theme.text_dim).alignment(Alignment::Center)@@ -175,10 +188,11 @@ pub fn draw(frame: &mut Frame, area: Rect, state: &mut AppState, theme: &Theme)frame.render_widget(placeholder, poster_area);}--let title_line = Line::from(vec![- Span::styled(title.to_string(), theme.text.add_modifier(ratatui::style::Modifier::BOLD)),+ Span::styled(+ title.to_string(),+ theme.text.add_modifier(ratatui::style::Modifier::BOLD),+ ),Span::styled(" ", theme.text),Span::styled(format!("★ IMDb {}", imdb_rating), theme.rating),]);@@ -189,14 +203,13 @@ pub fn draw(frame: &mut Frame, area: Rect, state: &mut AppState, theme: &Theme)format!(" • {}", duration)};- let meta_line = Line::from(vec![- Span::styled(format!("{} • {} • {}{}", type_str, year, country, duration_str), theme.text),- ]);+ let meta_line = Line::from(vec![Span::styled(+ format!("{} • {} • {}{}", type_str, year, country, duration_str),+ theme.text,+ )]);++ let genre_line = Line::from(vec![Span::styled(genres.to_string(), theme.text_dim)]);- let genre_line = Line::from(vec![- Span::styled(genres.to_string(), theme.text_dim),- ]);-let top_meta = vec![title_line,meta_line,@@ -204,21 +217,19 @@ pub fn draw(frame: &mut Frame, area: Rect, state: &mut AppState, theme: &Theme)Line::from(vec![]),Line::from(vec![Span::styled("Synopsis", theme.text)]),];-+let meta_chunks = Layout::default().direction(Direction::Vertical)- .constraints([- Constraint::Length(5),- Constraint::Min(1),- ])+ .constraints([Constraint::Length(5), Constraint::Min(1)]).split(right_area);let meta_p = Paragraph::new(top_meta).wrap(Wrap { trim: true });frame.render_widget(meta_p, meta_chunks[0]);- let syn_lines = vec![- Line::from(vec![Span::styled(intro, theme.text_dim.add_modifier(ratatui::style::Modifier::DIM))])- ];+ let syn_lines = vec![Line::from(vec![Span::styled(+ intro,+ theme.text_dim.add_modifier(ratatui::style::Modifier::DIM),+ )])];let intro_p = Paragraph::new(syn_lines).wrap(Wrap { trim: true });frame.render_widget(intro_p, meta_chunks[1]);@@ -239,17 +250,17 @@ pub fn draw(frame: &mut Frame, area: Rect, state: &mut AppState, theme: &Theme)c.push(Constraint::Length(15));}c.push(Constraint::Min(1));-+let bottom_chunks = Layout::default().direction(Direction::Horizontal).constraints(c).split(bottom_area);-+let mut chunk_idx = 0;let mut lang_area = None;let mut seasons_area = None;let mut eps_area = None;-+if has_languages {lang_area = Some(bottom_chunks[chunk_idx]);chunk_idx += 1;@@ -283,7 +294,7 @@ pub fn draw(frame: &mut Frame, area: Rect, state: &mut AppState, theme: &Theme)}}}-+let lang_border = if state.details_pane == crate::tui::state::DetailsPane::Languages {theme.border_focus} else {@@ -384,7 +395,7 @@ pub fn draw(frame: &mut Frame, area: Rect, state: &mut AppState, theme: &Theme)streams_count = list.len();}}-+let streams_title = if streams_count > 0 {format!(" Streams • {} Available ", streams_count)} else {@@ -399,7 +410,6 @@ pub fn draw(frame: &mut Frame, area: Rect, state: &mut AppState, theme: &Theme).border_style(streams_border).padding(ratatui::widgets::Padding::horizontal(1));- let mut render_list = None;match &state.selected_resources {Some(res) => {if let Some(list) = res.get("list").and_then(|l| l.as_array()) {@@ -410,16 +420,23 @@ pub fn draw(frame: &mut Frame, area: Rect, state: &mut AppState, theme: &Theme).iter().enumerate().map(|(i, file)| {- let resolution = file.get("resolution").and_then(|r| r.as_i64()).unwrap_or(0);+ let resolution =+ file.get("resolution").and_then(|r| r.as_i64()).unwrap_or(0);let quality_str = format!("{}p", resolution);-+let is_first_of_quality = quality_str != prev_quality;prev_quality = quality_str.clone();- let codec = file.get("codecName").and_then(|c| c.as_str()).unwrap_or("None");- let _upload_by = file.get("uploadBy").and_then(|u| u.as_str()).unwrap_or("None");+ let codec = file+ .get("codecName")+ .and_then(|c| c.as_str())+ .unwrap_or("None");+ let _upload_by = file+ .get("uploadBy")+ .and_then(|u| u.as_str())+ .unwrap_or("None");let size_str = file.get("size").and_then(|s| s.as_str()).unwrap_or("0");-+let size_formatted = if let Ok(bytes) = size_str.parse::<f64>() {let mb = bytes / 1024.0 / 1024.0;if mb > 1024.0 {@@ -433,20 +450,21 @@ pub fn draw(frame: &mut Frame, area: Rect, state: &mut AppState, theme: &Theme)let is_selected = Some(i) == selected_idx;let pointer = if is_selected { "▌ " } else { " " };-+let stream_style = if is_selected {theme.highlight.clone()} else {theme.text_dim.clone()};--let stream_line = ratatui::text::Line::from(vec![ratatui::text::Span::styled(pointer, theme.accent),- ratatui::text::Span::styled(format!("{:<7} {:<6} ", size_formatted, codec), stream_style),+ ratatui::text::Span::styled(+ format!("{:<7} {:<6} ", size_formatted, codec),+ stream_style,+ ),]);-+let mut lines = vec![];if is_first_of_quality {if i > 0 {@@ -454,10 +472,10 @@ pub fn draw(frame: &mut Frame, area: Rect, state: &mut AppState, theme: &Theme)}lines.push(ratatui::text::Line::from(ratatui::text::Span::styled(quality_str,- theme.accent+ theme.accent,)));}-+lines.push(stream_line);ListItem::new(lines)})@@ -466,7 +484,28 @@ pub fn draw(frame: &mut Frame, area: Rect, state: &mut AppState, theme: &Theme)let l = List::new(list_items).block(streams_block.clone()).highlight_symbol("");- render_list = Some(l);++ let mut scrollbar_state = ScrollbarState::default()+ .content_length(+ streams_count+ .saturating_sub(streams_area.height.saturating_sub(2) as usize),+ )+ .position(state.resource_list_state.selected().unwrap_or(0));++ let scrollbar = Scrollbar::default()+ .orientation(ScrollbarOrientation::VerticalRight)+ .begin_symbol(Some("▲"))+ .end_symbol(Some("▼"));++ frame.render_stateful_widget(l, streams_area, &mut state.resource_list_state);+ frame.render_stateful_widget(+ scrollbar,+ streams_area.inner(ratatui::layout::Margin {+ vertical: 1,+ horizontal: 0,+ }),+ &mut scrollbar_state,+ );} else {let has_multiple_dubs = state.selected_details@@ -479,7 +518,7 @@ pub fn draw(frame: &mut Frame, area: Rect, state: &mut AppState, theme: &Theme)} else {"No streaming files available."};-+let inner = streams_block.inner(streams_area);let pad = "\n".repeat((inner.height.saturating_sub(1) / 2) as usize);let p = Paragraph::new(format!("{}{}", pad, msg))@@ -511,7 +550,7 @@ pub fn draw(frame: &mut Frame, area: Rect, state: &mut AppState, theme: &Theme)} else {"Failed to load streams.".to_string()};-+let style = if state.is_loading || (has_multiple_dubs && !state.language_chosen) {theme.text_dim} else {@@ -528,18 +567,13 @@ pub fn draw(frame: &mut Frame, area: Rect, state: &mut AppState, theme: &Theme)frame.render_widget(p, streams_area);}}-- if let Some(l) = render_list {- frame.render_stateful_widget(l, streams_area, &mut state.resource_list_state);- } else {+ if !state.selected_resources.is_some() {frame.render_widget(streams_block, streams_area);}--if state.subtitle_popup {let popup_width = 50;let popup_height = std::cmp::min(15, state.subtitle_list.len() as u16 + 2);-+let area = frame.area();let popup_area = ratatui::layout::Rect {x: area.width.saturating_sub(popup_width) / 2,diff --git a/src/tui/screens/help.rs b/src/tui/screens/help.rsindex cafe26c..96d84dc 100644--- a/src/tui/screens/help.rs+++ b/src/tui/screens/help.rs@@ -11,7 +11,7 @@ pub fn draw(frame: &mut Frame, area: Rect, _state: &AppState, theme: &Theme) {.direction(Direction::Vertical).constraints([Constraint::Percentage(25),- Constraint::Length(14),+ Constraint::Length(16),Constraint::Percentage(25),]).split(area);@@ -20,7 +20,7 @@ pub fn draw(frame: &mut Frame, area: Rect, _state: &AppState, theme: &Theme) {.direction(Direction::Horizontal).constraints([Constraint::Percentage(25),- Constraint::Min(40),+ Constraint::Min(45),Constraint::Percentage(25),]).split(popup_layout[1])[1];@@ -28,41 +28,64 @@ pub fn draw(frame: &mut Frame, area: Rect, _state: &AppState, theme: &Theme) {frame.render_widget(Clear, popup_chunk);let help_text = vec![+ Line::from(vec![Span::styled(+ " Global",+ theme+ .header+ .add_modifier(ratatui::style::Modifier::BOLD)+ .add_modifier(ratatui::style::Modifier::UNDERLINED),+ )]),Line::from(vec![- Span::styled(" [q] ", theme.header),- Span::styled("Quit Application", theme.text),+ Span::styled(" [?] ", theme.header),+ Span::styled("Toggle Help Menu", theme.text),]),Line::from(vec![- Span::styled(" [?] ", theme.header),- Span::styled("Toggle Help Menu", theme.text),+ Span::styled(" [q] ", theme.header),+ Span::styled("Quit Application", theme.text),]),Line::from(vec![- Span::styled(" [/], [s] ", theme.header),- Span::styled("Search Movies/Series", theme.text),+ Span::styled(" [Esc] ", theme.header),+ Span::styled("Go Back / Clear", theme.text),]),+ Line::from(vec![]),+ Line::from(vec![Span::styled(+ " Navigation",+ theme+ .header+ .add_modifier(ratatui::style::Modifier::BOLD)+ .add_modifier(ratatui::style::Modifier::UNDERLINED),+ )]),Line::from(vec![- Span::styled(" [l] ", theme.header),- Span::styled("Toggle Logs", theme.text),+ Span::styled(" [↑] / [↓] ", theme.header),+ Span::styled("Scroll Lists", theme.text),]),Line::from(vec![- Span::styled(" [b], ESC ", theme.header),- Span::styled("Go Back / Clear", theme.text),+ Span::styled(" [←] / [→] ", theme.header),+ Span::styled("Switch Panels", theme.text),]),Line::from(vec![- Span::styled(" [↑]/[k] ", theme.header),- Span::styled("Move Up", theme.text),+ Span::styled(" [Enter] ", theme.header),+ Span::styled("Select / Submit", theme.text),]),+ Line::from(vec![]),+ Line::from(vec![Span::styled(+ " Stream Controls",+ theme+ .header+ .add_modifier(ratatui::style::Modifier::BOLD)+ .add_modifier(ratatui::style::Modifier::UNDERLINED),+ )]),Line::from(vec![- Span::styled(" [↓]/[j] ", theme.header),- Span::styled("Move Down", theme.text),+ Span::styled(" [p] ", theme.header),+ Span::styled("Play Video", theme.text),]),Line::from(vec![- Span::styled(" [Enter] ", theme.header),- Span::styled("Select / Submit", theme.text),+ Span::styled(" [d] ", theme.header),+ Span::styled("Download Video", theme.text),]),Line::from(vec![- Span::styled(" [y] ", theme.header),- Span::styled("Copy URL (Details Screen)", theme.text),+ Span::styled(" [c] ", theme.header),+ Span::styled("Copy URL to Clipboard", theme.text),]),];diff --git a/src/tui/screens/home.rs b/src/tui/screens/home.rsindex a3ca8e6..4c359e7 100644--- a/src/tui/screens/home.rs+++ b/src/tui/screens/home.rs@@ -10,56 +10,73 @@ use ratatui::{pub fn draw(frame: &mut Frame, area: Rect, state: &mut AppState, theme: &Theme) {let show_cursor = (state.tick_count % 16) < 8;- let search_content = if !state.status_message.is_empty() && state.input_mode == InputMode::Normal {- format!("> {}", state.status_message)- } else if state.search_query.is_empty() {- let prompts = ["Search for a movie...", "Search for a TV series...", "Search by genre..."];- let type_speed = 3;- let del_speed = 1;- let pause1 = 60; // ~1 sec- let pause2 = 15; // ~250 ms-- let mut total_ticks = 0;- for p in prompts.iter() {- total_ticks += p.len() * type_speed + pause1 + p.len() * del_speed + pause2;- }- let mut t = (state.tick_count as usize) % total_ticks;-- let mut animated_text = String::new();- for p in prompts.iter() {- let t_type = p.len() * type_speed;- let t_del = p.len() * del_speed;- let cycle = t_type + pause1 + t_del + pause2;-- if t < cycle {- let display_len = if t < t_type {- t / type_speed- } else if t < t_type + pause1 {- p.len()- } else if t < t_type + pause1 + t_del {- p.len().saturating_sub((t - (t_type + pause1)) / del_speed)+ let search_content =+ if !state.status_message.is_empty() && state.input_mode == InputMode::Normal {+ format!("> {}", state.status_message)+ } else if state.search_query.is_empty() {+ let prompts = [+ "Search for a movie...",+ "Search for a TV series...",+ "Search by genre...",+ ];+ let type_speed = 3;+ let del_speed = 1;+ let pause1 = 60; // ~1 sec+ let pause2 = 15; // ~250 ms++ let mut total_ticks = 0;+ for p in prompts.iter() {+ total_ticks += p.len() * type_speed + pause1 + p.len() * del_speed + pause2;+ }+ let mut t = (state.tick_count as usize) % total_ticks;++ let mut animated_text = String::new();+ for p in prompts.iter() {+ let t_type = p.len() * type_speed;+ let t_del = p.len() * del_speed;+ let cycle = t_type + pause1 + t_del + pause2;++ if t < cycle {+ let display_len = if t < t_type {+ t / type_speed+ } else if t < t_type + pause1 {+ p.len()+ } else if t < t_type + pause1 + t_del {+ p.len().saturating_sub((t - (t_type + pause1)) / del_speed)+ } else {+ 0+ };+ animated_text = p[0..display_len].to_string();+ break;} else {- 0- };- animated_text = p[0..display_len].to_string();- break;- } else {- t -= cycle;+ t -= cycle;+ }}- }- if state.input_mode == InputMode::Editing {- if show_cursor { format!("> {}█", animated_text) } else { format!("> {} ", animated_text) }- } else {- if show_cursor { format!("> {}|", animated_text) } else { format!("> {} ", animated_text) }- }- } else {- if state.input_mode == InputMode::Editing {- if show_cursor { format!("> {}█", state.search_query) } else { format!("> {} ", state.search_query) }+ if state.input_mode == InputMode::Editing {+ if show_cursor {+ format!("> {}█", animated_text)+ } else {+ format!("> {} ", animated_text)+ }+ } else {+ if show_cursor {+ format!("> {}|", animated_text)+ } else {+ format!("> {} ", animated_text)+ }+ }} else {- format!("> {}", state.search_query)- }- };+ if state.input_mode == InputMode::Editing {+ if show_cursor {+ format!("> {}█", state.search_query)+ } else {+ format!("> {} ", state.search_query)+ }+ } else {+ format!("> {}", state.search_query)+ }+ };let mut search_bar_area = Rect::default();@@ -73,7 +90,13 @@ pub fn draw(frame: &mut Frame, area: Rect, state: &mut AppState, theme: &Theme)let is_narrow = area.width < 60;let is_wide = area.width >= 100;- let logo_height = if is_narrow { 2 } else if is_wide { 6 } else { 4 };+ let logo_height = if is_narrow {+ 2+ } else if is_wide {+ 6+ } else {+ 4+ };let logo_text = if is_narrow {"█▀▄▀█ █▀█ █ █ █ █▀▀ █▀▄ █▀█ ▀▄▀\n█ ▀ █ █▄█ ▀▄▀ █ ██▄ █▄▀ █▄█ █ █"} else if is_wide {@@ -104,7 +127,13 @@ pub fn draw(frame: &mut Frame, area: Rect, state: &mut AppState, theme: &Theme)]).split(area);- let logo_width = if is_narrow { 31 } else if is_wide { 73 } else { 55 };+ let logo_width = if is_narrow {+ 31+ } else if is_wide {+ 73+ } else {+ 55+ };let pad = area.width.saturating_sub(logo_width) / 2;let horizontal_chunks = Layout::default().direction(Direction::Horizontal)@@ -159,7 +188,7 @@ pub fn draw(frame: &mut Frame, area: Rect, state: &mut AppState, theme: &Theme)Constraint::Percentage(25),]).split(vertical_chunks[4]);-+search_bar_area = search_chunks[1];let search_bar = Paragraph::new(search_content.clone())@@ -171,25 +200,25 @@ pub fn draw(frame: &mut Frame, area: Rect, state: &mut AppState, theme: &Theme)frame.render_widget(search_bar, search_bar_area);- let legend = Paragraph::new("Type to Search ↑↓ Browse F1/? Help")+ let legend = Paragraph::new("Type to Search ↑↓ Browse ? Help").alignment(Alignment::Center).style(theme.text_dim);frame.render_widget(legend, vertical_chunks[6]);if let Some(version_str) = &state.update_available {- let update_text = Paragraph::new(format!("Update v{} available! Run: cargo install moviebox-tui", version_str))- .alignment(Alignment::Center)- .style(theme.highlight);+ let update_text = Paragraph::new(format!(+ "Update v{} available! Run: cargo install moviebox-tui",+ version_str+ ))+ .alignment(Alignment::Center)+ .style(theme.highlight);frame.render_widget(update_text, vertical_chunks[7]);}}} else {let chunks = Layout::default().direction(Direction::Vertical)- .constraints([- Constraint::Length(1),- Constraint::Min(0),- ])+ .constraints([Constraint::Length(1), Constraint::Min(0)]).split(area);search_bar_area = chunks[0];@@ -230,11 +259,9 @@ pub fn draw(frame: &mut Frame, area: Rect, state: &mut AppState, theme: &Theme).style(theme.text_dim);frame.render_widget(p, v_chunks[1]);} else if !state.search_results.is_empty() {-let selected_idx = state.search_list_state.selected();let offset = state.search_list_state.offset();--+let row_height = 3;state.visible_items = (chunks[1].height as usize) / (row_height as usize);let rows: Vec<Row> = state@@ -243,8 +270,7 @@ pub fn draw(frame: &mut Frame, area: Rect, state: &mut AppState, theme: &Theme).map(|_| Row::new(vec![Cell::from("")]).height(row_height)).collect();- let table = Table::new(rows, [Constraint::Percentage(100)])- .block(list_block);+ let table = Table::new(rows, [Constraint::Percentage(100)]).block(list_block);frame.render_stateful_widget(table, chunks[1], &mut state.search_list_state);@@ -260,18 +286,20 @@ pub fn draw(frame: &mut Frame, area: Rect, state: &mut AppState, theme: &Theme)if current_y >= inner_area.y + inner_area.height {break;}-+let item_area = Rect {x: inner_area.x,y: current_y,width: inner_area.width,height: 3.min(inner_area.y + inner_area.height.saturating_sub(current_y)),};-- if item_area.height == 0 { break; }-++ if item_area.height == 0 {+ break;+ }+let is_selected = Some(i) == selected_idx;-+let layout = Layout::default().direction(Direction::Horizontal).constraints([@@ -281,16 +309,16 @@ pub fn draw(frame: &mut Frame, area: Rect, state: &mut AppState, theme: &Theme)Constraint::Min(0),]).split(item_area);-+let highlight_area = layout[0];let poster_area = layout[1];let text_area = layout[3];if is_selected {let indicator = Paragraph::new(ratatui::text::Line::from(vec![- ratatui::text::Span::styled("▌ ", theme.accent.clone())+ ratatui::text::Span::styled("▌ ", theme.accent.clone()),]));-+let v_layout = Layout::default().direction(Direction::Vertical).constraints([@@ -299,37 +327,53 @@ pub fn draw(frame: &mut Frame, area: Rect, state: &mut AppState, theme: &Theme)Constraint::Min(0),]).split(highlight_area);-+frame.render_widget(indicator, v_layout[1]);}-+let mut poster_rendered = false;if let Some(img) = state.search_posters.get(&res.id) {if state.image_supported {- let needs_protocol = state.search_poster_protocols.get(&res.id).map(|(r, _)| *r) != Some(poster_area);+ let needs_protocol =+ state.search_poster_protocols.get(&res.id).map(|(r, _)| *r)+ != Some(poster_area);if needs_protocol {if let Some(picker) = &mut state.image_picker {- let size = ratatui::layout::Size::new(poster_area.width, poster_area.height.min(3));- if let Ok(proto) = picker.new_protocol((**img).clone(), size, ratatui_image::Resize::Fit(None)) {- state.search_poster_protocols.insert(res.id.clone(), (poster_area, proto));+ let size = ratatui::layout::Size::new(+ poster_area.width,+ poster_area.height.min(3),+ );+ if let Ok(proto) = picker.new_protocol(+ (**img).clone(),+ size,+ ratatui_image::Resize::Fit(None),+ ) {+ state+ .search_poster_protocols+ .insert(res.id.clone(), (poster_area, proto));}}}if let Some((_, proto)) = state.search_poster_protocols.get(&res.id) {- let p_area = Rect { height: poster_area.height.min(3), ..poster_area };+ let p_area = Rect {+ height: poster_area.height.min(3),+ ..poster_area+ };frame.render_widget(ratatui_image::Image::new(proto), p_area);poster_rendered = true;}}}-+if !poster_rendered {- let p = Paragraph::new("████\n████\n████")- .style(theme.muted);- let p_area = Rect { height: poster_area.height.min(3), ..poster_area };+ let p = Paragraph::new("████\n████\n████").style(theme.muted);+ let p_area = Rect {+ height: poster_area.height.min(3),+ ..poster_area+ };frame.render_widget(p, p_area);}-+let text_layout = Layout::default().direction(Direction::Vertical).constraints([@@ -338,24 +382,34 @@ pub fn draw(frame: &mut Frame, area: Rect, state: &mut AppState, theme: &Theme)Constraint::Min(0),]).split(text_area);-+let title_style = if is_selected { theme.title } else { theme.text };let max_title_width = text_area.width.saturating_sub(4) as usize;let mut display_title = res.title.clone();if display_title.chars().count() > max_title_width && max_title_width > 3 {- display_title = display_title.chars().take(max_title_width - 3).collect::<String>();+ display_title = display_title+ .chars()+ .take(max_title_width - 3)+ .collect::<String>();display_title.push_str("...");}-- let type_tag = if res.stype == 1 { "Movie" } else if res.stype == 2 { "TV Series" } else { "Other" };-- let title_line = ratatui::text::Line::from(vec![- ratatui::text::Span::styled(display_title, title_style),- ]);++ let type_tag = if res.stype == 1 {+ "Movie"+ } else if res.stype == 2 {+ "TV Series"+ } else {+ "Other"+ };++ let title_line = ratatui::text::Line::from(vec![ratatui::text::Span::styled(+ display_title,+ title_style,+ )]);if text_layout[0].height > 0 {frame.render_widget(Paragraph::new(title_line), text_layout[0]);}-+let mut info_spans = vec![];if is_selected {@@ -366,23 +420,33 @@ pub fn draw(frame: &mut Frame, area: Rect, state: &mut AppState, theme: &Theme)info_spans.push(ratatui::text::Span::styled(" • ", theme.text_dim));info_spans.push(ratatui::text::Span::styled("Loading...", theme.text_dim));} else if let Some(meta) = &state.search_preview {- let rating = meta.get("imdbRating").or_else(|| meta.get("imdbRatingValue")).and_then(|v| v.as_str());+ let rating = meta+ .get("imdbRating")+ .or_else(|| meta.get("imdbRatingValue"))+ .and_then(|v| v.as_str());if let Some(r) = rating {- info_spans.push(ratatui::text::Span::styled("★ ", theme.rating.clone()));+ info_spans+ .push(ratatui::text::Span::styled("★ ", theme.rating.clone()));info_spans.push(ratatui::text::Span::styled(r, theme.text));info_spans.push(ratatui::text::Span::styled(" • ", theme.text_dim));}info_spans.push(ratatui::text::Span::styled(&res.release_year, theme.text));info_spans.push(ratatui::text::Span::styled(" • ", theme.text_dim));-+let mut g_names = vec![];if let Some(genres) = meta.get("genres").and_then(|g| g.as_array()) {- g_names = genres.iter()- .filter_map(|g| g.get("name").and_then(|n| n.as_str()).map(|s| s.to_string()))+ g_names = genres+ .iter()+ .filter_map(|g| {+ g.get("name")+ .and_then(|n| n.as_str())+ .map(|s| s.to_string())+ }).collect();}if !g_names.is_empty() {- info_spans.push(ratatui::text::Span::styled(g_names.join(" • "), theme.text));+ info_spans+ .push(ratatui::text::Span::styled(g_names.join(" • "), theme.text));info_spans.push(ratatui::text::Span::styled(" • ", theme.text_dim));}info_spans.push(ratatui::text::Span::styled(type_tag, theme.text));@@ -396,15 +460,16 @@ pub fn draw(frame: &mut Frame, area: Rect, state: &mut AppState, theme: &Theme)info_spans.push(ratatui::text::Span::styled(" • ", theme.text_dim));info_spans.push(ratatui::text::Span::styled(type_tag, theme.text));}-+if text_layout[1].height > 0 && !info_spans.is_empty() {- frame.render_widget(Paragraph::new(ratatui::text::Line::from(info_spans)), text_layout[1]);+ frame.render_widget(+ Paragraph::new(ratatui::text::Line::from(info_spans)),+ text_layout[1],+ );}-- current_y += row_height;+ current_y += row_height;}-} else {let inner_area = list_block.inner(chunks[1]);frame.render_widget(list_block, chunks[1]);@@ -425,20 +490,30 @@ pub fn draw(frame: &mut Frame, area: Rect, state: &mut AppState, theme: &Theme)}}- if state.input_mode == InputMode::Editing && !state.search_suggestions.is_empty() && search_bar_area.width > 0 {+ if state.input_mode == InputMode::Editing+ && !state.search_suggestions.is_empty()+ && search_bar_area.width > 0+ {let search_area = search_bar_area;let dropdown_height = std::cmp::min(state.search_suggestions.len() as u16 + 2, 10);-- let is_home_screen = state.search_results.is_empty() && !state.is_loading && !state.status_message.to_lowercase().contains("fail");-++ let is_home_screen = state.search_results.is_empty()+ && !state.is_loading+ && !state.status_message.to_lowercase().contains("fail");+let dropdown_y = if !is_home_screen && search_area.y > area.height / 2 {search_area.y.saturating_sub(dropdown_height)} else {search_area.y + search_area.height};-- let max_len = state.search_suggestions.iter().map(|s| s.len()).max().unwrap_or(0) as u16;++ let max_len = state+ .search_suggestions+ .iter()+ .map(|s| s.len())+ .max()+ .unwrap_or(0) as u16;let dropdown_width = std::cmp::min(std::cmp::max(max_len + 8, 30), search_area.width);let dropdown_x = search_area.x + (search_area.width.saturating_sub(dropdown_width)) / 2;@@ -449,20 +524,36 @@ pub fn draw(frame: &mut Frame, area: Rect, state: &mut AppState, theme: &Theme)height: dropdown_height,};- if dropdown_area.y + dropdown_area.height <= area.height || search_area.y > area.height / 2 {+ if dropdown_area.y + dropdown_area.height <= area.height || search_area.y > area.height / 2+ {frame.render_widget(ratatui::widgets::Clear, dropdown_area);- let items: Vec<ratatui::widgets::ListItem> = state.search_suggestions.iter().enumerate().map(|(i, s)| {- let text = if Some(i) == state.suggest_index { format!("▌ {}", s) } else { format!(" {}", s) };- let style = if Some(i) == state.suggest_index { theme.highlight } else { theme.text };- ratatui::widgets::ListItem::new(ratatui::text::Line::from(ratatui::text::Span::styled(text, style)).alignment(ratatui::layout::Alignment::Left))- }).collect();- let list = ratatui::widgets::List::new(items)- .block(- ratatui::widgets::Block::default()- .borders(ratatui::widgets::Borders::ALL)- .border_style(theme.border_focus)- .border_type(ratatui::widgets::BorderType::Rounded)- );+ let items: Vec<ratatui::widgets::ListItem> = state+ .search_suggestions+ .iter()+ .enumerate()+ .map(|(i, s)| {+ let text = if Some(i) == state.suggest_index {+ format!("▌ {}", s)+ } else {+ format!(" {}", s)+ };+ let style = if Some(i) == state.suggest_index {+ theme.highlight+ } else {+ theme.text+ };+ ratatui::widgets::ListItem::new(+ ratatui::text::Line::from(ratatui::text::Span::styled(text, style))+ .alignment(ratatui::layout::Alignment::Left),+ )+ })+ .collect();+ let list = ratatui::widgets::List::new(items).block(+ ratatui::widgets::Block::default()+ .borders(ratatui::widgets::Borders::ALL)+ .border_style(theme.border_focus)+ .border_type(ratatui::widgets::BorderType::Rounded),+ );frame.render_widget(list, dropdown_area);}}diff --git a/src/tui/state.rs b/src/tui/state.rsindex e576ef6..d1a6af0 100644--- a/src/tui/state.rs+++ b/src/tui/state.rs@@ -41,14 +41,19 @@ pub struct AppState {pub suggest_index: Option<usize>,pub search_results: Vec<SearchResult>,pub search_posters: std::collections::HashMap<String, std::sync::Arc<image::DynamicImage>>,- pub search_poster_protocols: std::collections::HashMap<String, (ratatui::layout::Rect, ratatui_image::protocol::Protocol)>,+ pub search_poster_protocols: std::collections::HashMap<+ String,+ (ratatui::layout::Rect, ratatui_image::protocol::Protocol),+ >,pub search_list_state: TableState,pub selected_details: Option<serde_json::Value>,+ pub active_subject_id: Option<String>,pub selected_resources: Option<serde_json::Value>,pub active_popup: Option<String>,pub selected_poster: Option<std::sync::Arc<image::DynamicImage>>,- pub selected_poster_protocol: Option<(ratatui::layout::Rect, ratatui_image::protocol::Protocol)>,+ pub selected_poster_protocol:+ Option<(ratatui::layout::Rect, ratatui_image::protocol::Protocol)>,pub resource_list_state: ListState,pub details_pane: DetailsPane,@@ -112,6 +117,7 @@ impl Default for AppState {search_list_state: TableState::default(),basic_terminal: std::env::var("TERM_PROGRAM").unwrap_or_default() == "Apple_Terminal",selected_details: None,+ active_subject_id: None,selected_resources: None,active_popup: None,selected_poster: None,diff --git a/src/tui/theme.rs b/src/tui/theme.rsindex 82fe603..06c5d6e 100644--- a/src/tui/theme.rs+++ b/src/tui/theme.rs@@ -39,8 +39,10 @@ impl Default for Theme {shortcut: Style::default().fg(Color::Rgb(250, 179, 135)),overlay: Style::default().fg(Color::Rgb(108, 112, 134)),rating: Style::default().fg(Color::Rgb(249, 226, 175)), // Yellow- accent: Style::default().fg(Color::Rgb(137, 220, 235)).add_modifier(Modifier::BOLD), // Sky- muted: Style::default().fg(Color::Rgb(88, 91, 112)), // Surface 1+ accent: Style::default()+ .fg(Color::Rgb(137, 220, 235))+ .add_modifier(Modifier::BOLD), // Sky+ muted: Style::default().fg(Color::Rgb(88, 91, 112)), // Surface 1}}}