Skip to content

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

fix(search): ignore stale same-query responses

Samir Hossains9a39919f794c
diff --git a/src/tui/action.rs b/src/tui/action.rs
index 25a2cf3..370602d 100644
--- a/src/tui/action.rs
+++ b/src/tui/action.rs
@@ -28,11 +28,12 @@ pub enum Action {
},
SearchSuccess {
context: crate::providers::models::RequestContext,
+ request_id: u64,
query: String,
page: usize,
payload: serde_json::Value,
},
- SearchFailure(crate::providers::models::RequestContext, usize, String),
+ SearchFailure(crate::providers::models::RequestContext, u64, usize, String),
FetchHomepage {
tab_id: String,
page: usize,
diff --git a/src/tui/app/navigation.rs b/src/tui/app/navigation.rs
index d92b55f..b185091 100644
--- a/src/tui/app/navigation.rs
+++ b/src/tui/app/navigation.rs
@@ -504,6 +504,7 @@ impl App {
let dhakaflix_client = self.dhakaflix_client.clone();
let sender = self.action_sender.clone();
let context = self.request_context();
+ let request_id = self.state.active_search_request;
self.state.is_loading = true;
self.state
.set_status(format!("Loading page {}...", next_page), 150);
@@ -523,6 +524,7 @@ impl App {
sender
.send(Action::SearchSuccess {
context,
+ request_id,
query,
page: next_page,
payload: res,
@@ -531,7 +533,9 @@ impl App {
}
Err(e) => {
sender
- .send(Action::SearchFailure(context, next_page, e))
+ .send(Action::SearchFailure(
+ context, request_id, next_page, e,
+ ))
.ok();
}
}
diff --git a/src/tui/app/requests.rs b/src/tui/app/requests.rs
index 5dcb842..50ea611 100644
--- a/src/tui/app/requests.rs
+++ b/src/tui/app/requests.rs
@@ -216,10 +216,14 @@ impl App {
Action::SearchSuccess {
context,
+ request_id,
query,
page,
payload,
} => {
+ if request_id != self.state.active_search_request {
+ return None;
+ }
if !self.context_is_current(context) || query != self.state.search_query.trim() {
return None;
}
@@ -396,7 +400,10 @@ impl App {
}
}
- Action::SearchFailure(context, page, err) => {
+ Action::SearchFailure(context, request_id, page, err) => {
+ if request_id != self.state.active_search_request {
+ return None;
+ }
if !self.context_is_current(context) {
return None;
}
diff --git a/src/tui/app/search.rs b/src/tui/app/search.rs
index ceadaed..919e9da 100644
--- a/src/tui/app/search.rs
+++ b/src/tui/app/search.rs
@@ -188,6 +188,7 @@ impl App {
}
pub(super) fn prepare_search_request(&mut self, query: &str) -> RequestContext {
+ self.state.active_search_request = self.state.active_search_request.wrapping_add(1);
self.state.is_homepage_mode = false;
self.state.current_page = 1;
self.state.active_screen = Screen::Home;
@@ -214,6 +215,7 @@ impl App {
force_refresh: bool,
context: RequestContext,
) {
+ let request_id = self.state.active_search_request;
let page = 1;
let sender = self.action_sender.clone();
let client = self.client.clone();
@@ -232,6 +234,7 @@ impl App {
sender
.send(Action::SearchSuccess {
context,
+ request_id,
query: query.clone(),
page,
payload: cached,
@@ -262,6 +265,7 @@ impl App {
sender
.send(Action::SearchSuccess {
context,
+ request_id,
query,
page,
payload: res,
@@ -270,7 +274,7 @@ impl App {
}
Err(error) => {
sender
- .send(Action::SearchFailure(context, page, error))
+ .send(Action::SearchFailure(context, request_id, page, error))
.ok();
}
}
diff --git a/src/tui/state.rs b/src/tui/state.rs
index d663f6f..7680962 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_search_request: u64,
pub active_homepage_request: u64,
pub active_details_request: u64,
pub pending_episode_fetch: Option<(String, usize, usize)>,
@@ -259,6 +260,7 @@ impl Default for AppState {
show_help: false,
visible_items: 10,
active_resource_request: 0,
+ active_search_request: 0,
active_homepage_request: 0,
active_details_request: 0,
pending_episode_fetch: None,