Terminal interface to find, download, and stream movies, TV shows, and live TV using local media players.
fix(preview): ignore stale preview responses
Samir Hossainsda694bfee009
diff --git a/src/tui/action.rs b/src/tui/action.rsindex 370602d..0271a2f 100644--- a/src/tui/action.rs+++ b/src/tui/action.rs@@ -55,8 +55,8 @@ pub enum Action {TabPane,BackTabPane,FetchPreview(String),- PreviewSuccess(String, serde_json::Value),- PreviewFailure(String),+ PreviewSuccess(u64, String, serde_json::Value),+ PreviewFailure(u64, String),PlayStream(bool),ShowSubtitlePopup(String, serde_json::Value, bool),ShowDownloadSubtitlePopup(serde_json::Value),diff --git a/src/tui/app/requests.rs b/src/tui/app/requests.rsindex 50ea611..c77a22a 100644--- a/src/tui/app/requests.rs+++ b/src/tui/app/requests.rs@@ -488,6 +488,9 @@ impl App {}Action::FetchPreview(id) => {+ self.state.active_preview_request =+ self.state.active_preview_request.wrapping_add(1);+ let request_id = self.state.active_preview_request;if self.state.is_tv_mode {self.state.preview_loading = false;if !self.state.image_cache.contains(&id) {@@ -616,7 +619,7 @@ impl App {.await{sender- .send(Action::PreviewSuccess(id_clone, cached_disk))+ .send(Action::PreviewSuccess(request_id, id_clone, cached_disk)).ok();return;}@@ -629,16 +632,23 @@ impl App {crate::cache::set_provider_details_cache(prov, &id_save, &det_save)}).await;- sender.send(Action::PreviewSuccess(id_clone, details)).ok();+ sender+ .send(Action::PreviewSuccess(request_id, id_clone, details))+ .ok();}Err(e) => {- sender.send(Action::PreviewFailure(format!("{:?}", e))).ok();+ sender+ .send(Action::PreviewFailure(request_id, format!("{:?}", e)))+ .ok();}}});}- Action::PreviewSuccess(id, json) => {+ Action::PreviewSuccess(request_id, id, json) => {+ if request_id != self.state.active_preview_request {+ return None;+ }let current_id = if self.state.active_screen == Screen::Details {self.state.selected_details@@ -735,7 +745,10 @@ impl App {}}- Action::PreviewFailure(err) => {+ Action::PreviewFailure(request_id, err) => {+ if request_id != self.state.active_preview_request {+ return None;+ }self.state.preview_loading = false;self.state.set_status(format!("Preview failed: {}", err), 150);diff --git a/src/tui/state.rs b/src/tui/state.rsindex 7680962..f341155 100644--- a/src/tui/state.rs+++ b/src/tui/state.rs@@ -150,6 +150,7 @@ pub struct AppState {pub active_search_request: u64,pub active_homepage_request: u64,pub active_details_request: u64,+ pub active_preview_request: u64,pub pending_episode_fetch: Option<(String, usize, usize)>,pub last_episode_nav: std::time::Instant,pub player_picker_popup: bool,@@ -263,6 +264,7 @@ impl Default for AppState {active_search_request: 0,active_homepage_request: 0,active_details_request: 0,+ active_preview_request: 0,pending_episode_fetch: None,last_episode_nav: std::time::Instant::now(),player_picker_popup: false,