fix: two medium bugs from the final adversarial review
- Retry was broken for the common case: retry_selected_download removed the failed download only from the UI list, not the client's DownloadStore. Since Client::download re-derives the same md5 token from the unchanged filename, retrying a still-Failed download left a duplicate-token entry; the token-migration path then deleted both, misrouting completion so the retried file downloaded to disk but the UI showed 'Queued' forever. Add Client::remove_download / DownloadStore::remove_by_file (status-agnostic) and clear the stale entry before re-issuing. Regression-tested. - Chat-room member selection could point out of range: RoomEvent::UserLeft shrank the active room's member list without clamping user_selected, so the highlight silently shifted to the wrong user (or vanished, making 'b'/'m' no-ops, and blanking the member pane). Clamp user_selected after every applied room event. Regression-tested.
This commit is contained in:
@@ -284,6 +284,16 @@ impl RoomsState {
|
||||
}
|
||||
}
|
||||
}
|
||||
// The active room's member list may have grown/shrunk (join/leave or a
|
||||
// wholesale replace on Joined); keep the selection highlight in range so
|
||||
// 'b'/'m' never act on the wrong member or a phantom one.
|
||||
self.clamp_user_selected();
|
||||
}
|
||||
|
||||
/// Keep `user_selected` within the active room's member list.
|
||||
fn clamp_user_selected(&mut self) {
|
||||
let len = self.active_room().map_or(0, |r| r.users.len());
|
||||
self.user_selected = self.user_selected.min(len.saturating_sub(1));
|
||||
}
|
||||
|
||||
/// Index of the open room `name`, creating an empty tab if necessary.
|
||||
@@ -526,6 +536,54 @@ mod tests {
|
||||
assert_eq!(state.selected_user(), None); // blues has no members yet
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn user_selection_stays_in_range_when_members_leave() {
|
||||
let mut state = RoomsState::new();
|
||||
state.apply_event(
|
||||
RoomEvent::Joined {
|
||||
room: "jazz".to_string(),
|
||||
users: vec![
|
||||
"alice".to_string(),
|
||||
"bob".to_string(),
|
||||
"carol".to_string(),
|
||||
],
|
||||
},
|
||||
None,
|
||||
);
|
||||
state.focus_or_open("jazz");
|
||||
state.user_selected = 2; // carol highlighted (last)
|
||||
|
||||
// carol leaves: selection must clamp to the new last index, not point
|
||||
// past the end (which would make 'b'/'m' silent no-ops).
|
||||
state.apply_event(
|
||||
RoomEvent::UserLeft {
|
||||
room: "jazz".to_string(),
|
||||
username: "carol".to_string(),
|
||||
},
|
||||
None,
|
||||
);
|
||||
assert_eq!(state.user_selected, 1);
|
||||
assert_eq!(state.selected_user().as_deref(), Some("bob"));
|
||||
|
||||
// Everyone leaves: selection collapses to 0 and yields no user.
|
||||
state.apply_event(
|
||||
RoomEvent::UserLeft {
|
||||
room: "jazz".to_string(),
|
||||
username: "bob".to_string(),
|
||||
},
|
||||
None,
|
||||
);
|
||||
state.apply_event(
|
||||
RoomEvent::UserLeft {
|
||||
room: "jazz".to_string(),
|
||||
username: "alice".to_string(),
|
||||
},
|
||||
None,
|
||||
);
|
||||
assert_eq!(state.user_selected, 0);
|
||||
assert_eq!(state.selected_user(), None);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn user_joined_and_left_update_membership() {
|
||||
let mut state = RoomsState::new();
|
||||
|
||||
@@ -1324,9 +1324,13 @@ impl MainTui {
|
||||
let client = self.client.clone();
|
||||
let sender = self.state.downloads_sender_channel.clone().unwrap();
|
||||
|
||||
// Drop the old failed entry; the retry pushes a fresh one.
|
||||
// Drop the old failed entry from both the UI list and the client's
|
||||
// download store; otherwise the stale entry (same md5-derived token and
|
||||
// filename) shadows the retry and its completion is misrouted, leaving
|
||||
// the retried download stuck showing "Queued".
|
||||
self.state.downloads.remove(index);
|
||||
self.select_download_after_removal(index);
|
||||
let _ = self.client.remove_download(&username, &filename);
|
||||
|
||||
thread::spawn(move || {
|
||||
match client.download(filename.clone(), username, size, directory) {
|
||||
|
||||
Reference in New Issue
Block a user