Terminal interface to find, download, and stream movies, TV shows, and live TV using local media players.
fix(tui): clear stale state
Samir Hossains5f7caa7011e9
diff --git a/src/history.rs b/src/history.rsindex 0c65873..0c25922 100644--- a/src/history.rs+++ b/src/history.rs@@ -34,6 +34,7 @@ impl HistoryManager {return history;}}+ let _ = fs::remove_file(path);}}Self::default()diff --git a/src/providers/m3u.rs b/src/providers/m3u.rsindex ac39db5..e309aeb 100644--- a/src/providers/m3u.rs+++ b/src/providers/m3u.rs@@ -41,7 +41,8 @@ impl M3UParser {url: &str,) -> Result<Vec<Channel>, Box<dyn std::error::Error>> {let trimmed = url.trim();- let content = if trimmed.starts_with("http://") || trimmed.starts_with("https://") {+ let is_remote = trimmed.starts_with("http://") || trimmed.starts_with("https://");+ let content = if is_remote {let file_path = self.cache_dir.join(cache_filename(trimmed));let mut needs_download = true;@@ -69,7 +70,19 @@ impl M3UParser {let _ = write_cache_file(&file_path, res.as_bytes()).await;res} else {- tokio::fs::read_to_string(&file_path).await?+ match tokio::fs::read_to_string(&file_path).await {+ Ok(content) => content,+ Err(_) => {+ let _ = tokio::fs::remove_file(&file_path).await;+ self.client+ .get(trimmed)+ .send()+ .await?+ .error_for_status()?+ .text()+ .await?+ }+ }}} else {let path = std::path::PathBuf::from(trimmed);@@ -78,7 +91,26 @@ impl M3UParser {.map_err(|error| format!("failed to read playlist file {}: {error}", trimmed))?};- Ok(self.parse_m3u(&content))+ let channels = self.parse_m3u(&content);+ if is_remote && channels.is_empty() {+ let file_path = self.cache_dir.join(cache_filename(trimmed));+ let _ = tokio::fs::remove_file(&file_path).await;+ let fresh = self+ .client+ .get(trimmed)+ .send()+ .await?+ .error_for_status()?+ .text()+ .await?;+ let fresh_channels = self.parse_m3u(&fresh);+ if fresh_channels.is_empty() {+ return Ok(fresh_channels);+ }+ let _ = write_cache_file(&file_path, fresh.as_bytes()).await;+ return Ok(fresh_channels);+ }+ Ok(channels)}fn parse_m3u(&self, content: &str) -> Vec<Channel> {diff --git a/src/tui/app/mod.rs b/src/tui/app/mod.rsindex dd6ec6e..6bcc27c 100644--- a/src/tui/app/mod.rs+++ b/src/tui/app/mod.rs@@ -127,13 +127,23 @@ impl App {}fn load_tv_playlists_from_config(&mut self) {+ self.state.tv_playlists.clear();if let Some(config_dir) = dirs::config_dir() {let path = config_dir.join("moviebox-tui").join("tv_config.json");- if let Ok(content) = std::fs::read_to_string(path)+ if let Ok(content) = std::fs::read_to_string(&path)&& let Ok(list) = serde_json::from_str::<Vec<String>>(&content)- && !list.is_empty(){- self.state.tv_playlists = list;+ let mut seen = std::collections::HashSet::new();+ self.state.tv_playlists = list+ .into_iter()+ .map(|item| item.trim().to_string())+ .filter(|item| !item.is_empty() && seen.insert(item.clone()))+ .collect();+ if self.state.tv_playlists.is_empty() {+ let _ = std::fs::remove_file(path);+ }+ } else {+ let _ = std::fs::remove_file(path);}}}diff --git a/src/tui/app/navigation.rs b/src/tui/app/navigation.rsindex 3dec580..bf38263 100644--- a/src/tui/app/navigation.rs+++ b/src/tui/app/navigation.rs@@ -46,10 +46,26 @@ impl App {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);+ self.state.download_progress = None;+ self.state.download_status = None;+ self.state.download_queue.clear();+ self.state.download_queue_total = 0;+ self.state.is_waiting_for_download_stream = false;self.state.search_posters.clear();self.state.search_poster_protocols.clear();self.state.image_cache.clear();diff --git a/src/tui/app/requests.rs b/src/tui/app/requests.rsindex a2d9f94..5ec7b79 100644--- a/src/tui/app/requests.rs+++ b/src/tui/app/requests.rs@@ -438,6 +438,15 @@ impl App {context.provider.cache_key());self.state.is_loading = false;+ if page <= 1 {+ self.state.search_results.clear();+ self.state.search_list_state.select(None);+ self.state.search_preview = None;+ self.state.poster_image = None;+ self.state.poster_protocol = None;+ self.state.search_posters.clear();+ self.state.search_poster_protocols.clear();+ }self.state.search_error = Some(err.clone());self.state.set_status(format!("Search failed: {}", err), 150);@@ -501,6 +510,13 @@ impl App {}log::error!("discover failed: {err}");self.state.is_loading = false;+ self.state.search_results.clear();+ self.state.search_list_state.select(None);+ self.state.search_preview = None;+ self.state.poster_image = None;+ self.state.poster_protocol = None;+ self.state.search_posters.clear();+ self.state.search_poster_protocols.clear();self.state.set_status(format!("Discover failed: {}", err), 150);}@@ -1013,6 +1029,23 @@ impl App {context.provider.cache_key());self.state.is_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.available_seasons.clear();+ self.state.available_episode_numbers.clear();+ self.state.stream_pool.clear();+ self.state.poster_image = None;+ self.state.poster_protocol = None;+ self.state.search_preview = None;+ self.state.preview_loading = false;self.state.set_status(format!("Details fetch failed: {}", err), 150);}diff --git a/src/tui/app/system.rs b/src/tui/app/system.rsindex fe03833..311b2b3 100644--- a/src/tui/app/system.rs+++ b/src/tui/app/system.rs@@ -196,7 +196,18 @@ impl App {self.state.poster_image = None;self.state.poster_protocol = None;self.state.search_preview = None;+ self.state.search_error = None;+ self.state.search_list_state.select(None);self.state.selected_resources = None;+ self.state.active_subject_id = None;+ self.state.selected_details = 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.available_seasons.clear();self.state.available_episode_numbers.clear();if self.state.is_tv_mode {diff --git a/src/tui/app/tv.rs b/src/tui/app/tv.rsindex 4a82a7b..a374a95 100644--- a/src/tui/app/tv.rs+++ b/src/tui/app/tv.rs@@ -52,6 +52,7 @@ impl App {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);@@ -131,6 +132,13 @@ impl App {self.apply_tv_search_results(&query, &lower_query);return None;}+ self.state+ .search_list_state+ .select(if self.state.tv_channels.is_empty() {+ None+ } else {+ Some(0)+ });if self.state.tv_channels.is_empty() {let status = if failed > 0 {format!(diff --git a/src/tui/config.rs b/src/tui/config.rsindex 097a610..1fd36eb 100644--- a/src/tui/config.rs+++ b/src/tui/config.rs@@ -32,10 +32,11 @@ pub fn load() -> Config {let Some(path) = path() else {return config;};- let Ok(content) = std::fs::read_to_string(path) else {+ let Ok(content) = std::fs::read_to_string(&path) else {return config;};let Ok(value) = serde_json::from_str::<serde_json::Value>(&content) else {+ let _ = std::fs::remove_file(path);return config;};if let Some(v) = value.get("auto_update").and_then(|v| v.as_bool()) {