Terminal interface to find, download, and stream movies, TV shows, and live TV using local media players.
fix(details): ignore stale same-provider responses
Samir Hossains13f8bf8ad002
diff --git a/src/tui/action.rs b/src/tui/action.rsindex 1721b75..897e42e 100644--- a/src/tui/action.rs+++ b/src/tui/action.rs@@ -77,10 +77,11 @@ pub enum Action {FetchDetails(String, bool),DetailsSuccess(crate::providers::models::RequestContext,+ u64,String,serde_json::Value,),- DetailsFailure(crate::providers::models::RequestContext, String),+ DetailsFailure(crate::providers::models::RequestContext, u64, String),InitStreamPool(String),StreamPoolInitialized(String, Vec<u32>),FetchEpisodeStreams {diff --git a/src/tui/app/requests.rs b/src/tui/app/requests.rsindex 6135e61..324c726 100644--- a/src/tui/app/requests.rs+++ b/src/tui/app/requests.rs@@ -727,7 +727,10 @@ impl App {.set_status(format!("Preview failed: {}", err), 150);}- Action::DetailsSuccess(context, id, payload) => {+ Action::DetailsSuccess(context, request_id, id, payload) => {+ if request_id != self.state.active_details_request {+ return None;+ }if !self.context_is_current(context) || self.state.active_screen != Screen::Details{return None;@@ -943,7 +946,10 @@ impl App {}}- Action::DetailsFailure(context, err) => {+ Action::DetailsFailure(context, request_id, err) => {+ if request_id != self.state.active_details_request {+ return None;+ }if !self.context_is_current(context) {return None;}diff --git a/src/tui/app/search.rs b/src/tui/app/search.rsindex def2365..3f2c645 100644--- a/src/tui/app/search.rs+++ b/src/tui/app/search.rs@@ -304,6 +304,7 @@ impl App {pub(super) fn prepare_details_request(&mut self, id: &str) -> RequestContext {self.state.poster_protocol = None;self.state.is_loading = true;+ self.state.active_details_request = self.state.active_details_request.wrapping_add(1);self.state.fetch_cancel.store(false, std::sync::atomic::Ordering::Relaxed);@@ -323,6 +324,7 @@ impl App {force_refresh: bool,context: RequestContext,) {+ let request_id = self.state.active_details_request;let client = self.client.clone();let fourk_client = self.fourk_client.clone();let circleftp_client = self.circleftp_client.clone();@@ -337,7 +339,12 @@ impl App {.await{sender- .send(Action::DetailsSuccess(context, id.clone(), cached))+ .send(Action::DetailsSuccess(+ context,+ request_id,+ id.clone(),+ cached,+ )).ok();return;}@@ -365,11 +372,13 @@ impl App {}).await;sender- .send(Action::DetailsSuccess(context, id, details))+ .send(Action::DetailsSuccess(context, request_id, id, details)).ok();}Err(error) => {- sender.send(Action::DetailsFailure(context, error)).ok();+ sender+ .send(Action::DetailsFailure(context, request_id, error))+ .ok();}}});diff --git a/src/tui/state.rs b/src/tui/state.rsindex 7e6963b..eceb6c0 100644--- a/src/tui/state.rs+++ b/src/tui/state.rs@@ -147,6 +147,7 @@ pub struct AppState {pub visible_items: usize,pub active_resource_request: u64,+ pub active_details_request: u64,pub pending_episode_fetch: Option<(String, usize, usize)>,pub last_episode_nav: std::time::Instant,pub player_picker_popup: bool,@@ -257,6 +258,7 @@ impl Default for AppState {show_help: false,visible_items: 10,active_resource_request: 0,+ active_details_request: 0,pending_episode_fetch: None,last_episode_nav: std::time::Instant::now(),player_picker_popup: false,