refactor: split the files that had grown past reading size
Five files ran between 1.2k and 2.4k lines, and one function past the length the quality gate allows. None of it was doing anything wrong; they had simply accumulated until you had to scroll to hold one in your head. The move throughout is into *child* modules rather than siblings, because a child still sees its parent's private items. So `ClientContext` keeps its private fields and `ServerActor` keeps its private state, while the methods that work on them move out — no encapsulation is widened for the sake of the split. Three `ServerActor` methods become `pub(super)`, which is only acknowledging the calls the parent already made. The client's operation loop and the actor's standing-message match are split by subject: the arms move out whole, so the bodies read exactly as they did inside. Where an arm said `continue` it now says `return` — the match was the last thing the loop did, and none of the arms that moved holds a loop of its own, so skipping the rest of an arm and ending its handler are the same move. The test modules split by topic the same way, which is most of the size: main_tui's alone was 2.1k of the 2.4k lines. No behaviour changes. Verified against a live server: the full e2e suite passes, including the 98 CLI and 19 daemon-protocol cases that drive the dispatch loop this touches.
This commit is contained in:
Michel de Graaf
File diff suppressed because it is too large
Load Diff
@@ -0,0 +1,509 @@
|
||||
mod shortcuts;
|
||||
|
||||
use super::MainTui;
|
||||
use crate::models::{CommandBarMode, FocusedPane, PaneLayout, RoomsView};
|
||||
use crate::ui::panes::{
|
||||
InfoSubject, ResultsPaneParams, render_browse_pane, render_chat_pane,
|
||||
render_download_info_pane, render_downloads_pane, render_results_pane,
|
||||
render_rooms_pane, render_searches_pane, selected_transfer,
|
||||
};
|
||||
use crate::ui::{
|
||||
GLYPH_CURSOR, accent_style, body_style, dimmed_style, info_style, mask,
|
||||
pack_shortcuts, pane_block, plain_title, primary_style,
|
||||
render_download_stats, warning_style,
|
||||
};
|
||||
use ratatui::{
|
||||
Frame,
|
||||
layout::{Alignment, Constraint, Layout, Position, Rect},
|
||||
style::Modifier,
|
||||
text::{Line, Span},
|
||||
widgets::Paragraph,
|
||||
};
|
||||
impl MainTui {
|
||||
/// Draw the whole window.
|
||||
pub fn render(&mut self, frame: &mut Frame) {
|
||||
let shortcuts = self.shortcut_rows(frame.area().width);
|
||||
let mut constraints = vec![
|
||||
Constraint::Length(3), // Status bar
|
||||
Constraint::Fill(1), // Main content
|
||||
];
|
||||
if self.state.command_bar_active {
|
||||
constraints.push(Constraint::Length(3)); // Command bar
|
||||
}
|
||||
constraints.push(Constraint::Length(shortcuts.len() as u16 + 2));
|
||||
let main_chunks = Layout::vertical(constraints).split(frame.area());
|
||||
|
||||
let daemon = self.client.daemon_endpoint();
|
||||
render_download_stats(
|
||||
frame,
|
||||
main_chunks[0],
|
||||
&self.state.downloads,
|
||||
self.state.active_downloads_count,
|
||||
daemon.as_deref(),
|
||||
);
|
||||
|
||||
self.render_content(frame, main_chunks[1]);
|
||||
|
||||
// Render command bar if active (vim-style, above shortcuts)
|
||||
if self.state.command_bar_active {
|
||||
self.render_command_bar(frame, main_chunks[2]);
|
||||
self.render_shortcuts(frame, main_chunks[3], shortcuts);
|
||||
} else {
|
||||
self.render_shortcuts(frame, main_chunks[2], shortcuts);
|
||||
}
|
||||
|
||||
self.render_overlays(frame);
|
||||
}
|
||||
|
||||
/// Results across the top, where a long file name has the whole width;
|
||||
/// Searches, Downloads and Info in a row underneath. A hidden pane drops
|
||||
/// out of its row and the rest widen; a zoomed one has the area alone.
|
||||
fn render_content(&mut self, frame: &mut Frame, area: Rect) {
|
||||
// Only what is drawn can be clicked.
|
||||
self.state.searches_pane_area = None;
|
||||
self.state.results_pane_area = None;
|
||||
self.state.downloads_pane_area = None;
|
||||
self.state.info_pane_area = None;
|
||||
self.state.hsplit_divider = None;
|
||||
self.state.vsplit_dividers.clear();
|
||||
self.state.row_area = None;
|
||||
|
||||
if self.state.layout.zoomed {
|
||||
self.render_pane(frame, area, self.state.focused_pane);
|
||||
return;
|
||||
}
|
||||
self.state.content_area = Some(area);
|
||||
|
||||
// Transfers carry the most columns, so they get the most width.
|
||||
let row_panes: Vec<(FocusedPane, u16)> =
|
||||
[(FocusedPane::Searches, 5), (FocusedPane::Downloads, 10)]
|
||||
.into_iter()
|
||||
.filter(|(pane, _)| self.state.layout.is_visible(*pane))
|
||||
.collect();
|
||||
|
||||
let row_area = if self.state.layout.is_visible(FocusedPane::Results) {
|
||||
// With only Info left in the row, the results deserve more of
|
||||
// the height.
|
||||
let row_weight = if row_panes.is_empty() { 1 } else { 2 };
|
||||
let top = match self.state.layout.top_height {
|
||||
Some(rows) => Constraint::Length(shrink(rows, area.height)),
|
||||
None => Constraint::Fill(3),
|
||||
};
|
||||
let [top, bottom] =
|
||||
Layout::vertical([top, Constraint::Fill(row_weight)])
|
||||
.areas(area);
|
||||
// The two touching border rows between the halves; either can
|
||||
// be dragged.
|
||||
self.state.hsplit_divider = Some(Rect::new(
|
||||
area.x,
|
||||
top.y.saturating_add(top.height).saturating_sub(1),
|
||||
area.width,
|
||||
2,
|
||||
));
|
||||
self.render_pane(frame, top, FocusedPane::Results);
|
||||
bottom
|
||||
} else {
|
||||
area
|
||||
};
|
||||
self.state.row_area = Some(row_area);
|
||||
|
||||
let mut constraints: Vec<Constraint> = row_panes
|
||||
.iter()
|
||||
.map(|(pane, weight)| {
|
||||
let dragged = match *pane {
|
||||
FocusedPane::Searches => self.state.layout.searches_width,
|
||||
FocusedPane::Downloads => self.state.layout.downloads_width,
|
||||
FocusedPane::Results => None,
|
||||
};
|
||||
match dragged {
|
||||
Some(cols) => {
|
||||
Constraint::Length(shrink(cols, row_area.width))
|
||||
}
|
||||
None => Constraint::Fill(*weight),
|
||||
}
|
||||
})
|
||||
.collect();
|
||||
constraints.push(Constraint::Fill(6)); // Info
|
||||
let chunks = Layout::horizontal(constraints).split(row_area);
|
||||
for (chunk, (pane, _)) in chunks.iter().zip(&row_panes) {
|
||||
// The seam at this pane's right edge: its border column and the
|
||||
// next pane's, both draggable.
|
||||
self.state.vsplit_dividers.push((
|
||||
*pane,
|
||||
Rect::new(
|
||||
chunk.x.saturating_add(chunk.width).saturating_sub(1),
|
||||
row_area.y,
|
||||
2,
|
||||
row_area.height,
|
||||
),
|
||||
));
|
||||
self.render_pane(frame, *chunk, *pane);
|
||||
}
|
||||
self.state.info_pane_area = Some(chunks[row_panes.len()]);
|
||||
self.render_info_pane(frame, chunks[row_panes.len()]);
|
||||
}
|
||||
|
||||
fn render_pane(
|
||||
&mut self,
|
||||
frame: &mut Frame,
|
||||
area: Rect,
|
||||
pane: FocusedPane,
|
||||
) {
|
||||
let focused = self.state.focused_pane == pane;
|
||||
match pane {
|
||||
FocusedPane::Searches => {
|
||||
self.state.searches_pane_area = Some(area);
|
||||
render_searches_pane(
|
||||
frame,
|
||||
area,
|
||||
&self.state.searches,
|
||||
&mut self.state.searches_table_state,
|
||||
focused,
|
||||
self.state.searches_query_offset,
|
||||
);
|
||||
}
|
||||
FocusedPane::Results => {
|
||||
self.state.results_pane_area = Some(area);
|
||||
self.render_results_pane(frame, area, focused);
|
||||
}
|
||||
FocusedPane::Downloads => {
|
||||
self.state.downloads_pane_area = Some(area);
|
||||
render_downloads_pane(
|
||||
frame,
|
||||
area,
|
||||
&self.state.downloads,
|
||||
&self.state.uploads,
|
||||
&mut self.state.downloads_table_state,
|
||||
focused,
|
||||
self.state.downloads_name_offset,
|
||||
);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
fn render_results_pane(
|
||||
&mut self,
|
||||
frame: &mut Frame,
|
||||
area: Rect,
|
||||
focused: bool,
|
||||
) {
|
||||
// When a filter is active the rendered rows are a subset, so the pane
|
||||
// also needs the mapping back to unfiltered indices to render the
|
||||
// selection checkboxes correctly.
|
||||
let (results_items, results_original_indices) =
|
||||
if self.state.results_filter_query.is_empty() {
|
||||
(&self.state.results_items, None)
|
||||
} else {
|
||||
(
|
||||
&self.state.results_filtered_items,
|
||||
Some(self.state.results_filtered_indices.as_slice()),
|
||||
)
|
||||
};
|
||||
|
||||
let active_search_query = self
|
||||
.state
|
||||
.selected_search_index
|
||||
.and_then(|idx| self.state.searches.get(idx))
|
||||
.map(|search| search.query.as_str());
|
||||
|
||||
render_results_pane(
|
||||
frame,
|
||||
area,
|
||||
ResultsPaneParams {
|
||||
items: results_items,
|
||||
table_state: &mut self.state.results_table_state,
|
||||
selected_indices: &self.state.results_selected_indices,
|
||||
original_indices: results_original_indices,
|
||||
filter_query: &self.state.results_filter_query,
|
||||
is_filtering: self.state.results_is_filtering,
|
||||
focused,
|
||||
active_search_query,
|
||||
name_offset: self.state.results_name_offset,
|
||||
},
|
||||
);
|
||||
}
|
||||
|
||||
/// The Info pane follows the focus: the highlighted result, or the
|
||||
/// highlighted transfer.
|
||||
fn render_info_pane(&self, frame: &mut Frame, area: Rect) {
|
||||
let selected = if self.state.focused_pane == FocusedPane::Results {
|
||||
self.highlighted_result().map(InfoSubject::Result)
|
||||
} else {
|
||||
selected_transfer(
|
||||
self.state.downloads_table_state.selected(),
|
||||
&self.state.downloads,
|
||||
&self.state.uploads,
|
||||
)
|
||||
};
|
||||
render_download_info_pane(
|
||||
frame,
|
||||
area,
|
||||
selected,
|
||||
matches!(
|
||||
self.state.focused_pane,
|
||||
FocusedPane::Results | FocusedPane::Downloads
|
||||
),
|
||||
);
|
||||
}
|
||||
fn render_overlays(&mut self, frame: &mut Frame) {
|
||||
// Messages inbox overlays everything when open.
|
||||
if self.state.show_messages {
|
||||
self.render_messages_popup(frame);
|
||||
}
|
||||
|
||||
// Browse tree overlays everything when open.
|
||||
if self.state.show_browse && !self.state.browse.is_empty() {
|
||||
let area = centered_rect(80, 80, frame.area());
|
||||
self.state.popup_area = Some(area);
|
||||
frame.render_widget(ratatui::widgets::Clear, area);
|
||||
render_browse_pane(
|
||||
frame,
|
||||
area,
|
||||
&self.state.browse,
|
||||
&mut self.state.browse_table_state,
|
||||
self.spinner_state,
|
||||
&self.state.downloads,
|
||||
);
|
||||
}
|
||||
|
||||
// Settings popup overlays everything when open.
|
||||
if self.state.settings.is_some() {
|
||||
self.render_settings_popup(frame);
|
||||
}
|
||||
|
||||
// Chat rooms overlay everything when open.
|
||||
if self.state.show_rooms {
|
||||
let area = centered_rect(85, 80, frame.area());
|
||||
self.state.popup_area = Some(area);
|
||||
frame.render_widget(ratatui::widgets::Clear, area);
|
||||
render_rooms_pane(
|
||||
frame,
|
||||
area,
|
||||
&mut self.state.rooms,
|
||||
&mut self.state.rooms_list_table_state,
|
||||
);
|
||||
}
|
||||
|
||||
// The keys list only opens from the main view, so it is on top of
|
||||
// nothing; drawn last so that stays true if that ever changes.
|
||||
if self.state.show_help {
|
||||
self.render_help_popup(frame);
|
||||
}
|
||||
}
|
||||
|
||||
fn render_settings_popup(&self, frame: &mut Frame) {
|
||||
use crate::models::{SettingsMode, SettingsRow};
|
||||
let Some(settings) = self.state.settings.as_ref() else {
|
||||
return;
|
||||
};
|
||||
let area = centered_rect(70, 60, frame.area());
|
||||
frame.render_widget(ratatui::widgets::Clear, area);
|
||||
|
||||
let selected = settings.selected_row();
|
||||
let mut lines: Vec<Line> = Vec::new();
|
||||
let entry = |on: bool, label: &str, value: String| {
|
||||
Line::from(vec![
|
||||
Span::styled(if on { "> " } else { " " }, accent_style()),
|
||||
Span::styled(label.to_string(), dimmed_style()),
|
||||
Span::styled(value, primary_style()),
|
||||
])
|
||||
};
|
||||
let typing = |label: &str, value: String| {
|
||||
Line::from(vec![
|
||||
Span::styled("> ", accent_style()),
|
||||
Span::styled(label.to_string(), dimmed_style()),
|
||||
Span::styled(value, primary_style()),
|
||||
Span::styled(GLYPH_CURSOR, accent_style()),
|
||||
])
|
||||
};
|
||||
let section = |name: &str| Line::styled(name.to_string(), info_style());
|
||||
|
||||
// One column of labels, padded here rather than by hand in each
|
||||
// string.
|
||||
let field = |label: &str, value: String| {
|
||||
entry(false, &format!(" {label:<14}"), value)
|
||||
};
|
||||
let account = &settings.account;
|
||||
lines.push(section("Account"));
|
||||
lines.push(field("Signed in as", account.username.clone()));
|
||||
lines.push(field("Sharing", account.shares.clone()));
|
||||
lines.push(field(
|
||||
"Reachable on",
|
||||
account.listen_port.map_or_else(
|
||||
|| "not accepting connections".to_string(),
|
||||
|port| format!("port {port}"),
|
||||
),
|
||||
));
|
||||
if let Some(daemon) = &account.daemon {
|
||||
lines.push(field("Daemon", daemon.clone()));
|
||||
}
|
||||
lines.push(Line::from(""));
|
||||
|
||||
lines.push(match settings.mode {
|
||||
SettingsMode::NewPassword => {
|
||||
typing("New password: ", mask(&settings.input))
|
||||
}
|
||||
SettingsMode::RepeatPassword(_) => {
|
||||
typing("Repeat it: ", mask(&settings.input))
|
||||
}
|
||||
_ => entry(
|
||||
selected == SettingsRow::ChangePassword,
|
||||
"Change password…",
|
||||
String::new(),
|
||||
),
|
||||
});
|
||||
if settings.mode == SettingsMode::ConfirmingLogout {
|
||||
lines.push(entry(
|
||||
true,
|
||||
&format!("Log out of {}? ", account.username),
|
||||
"y / n".to_string(),
|
||||
));
|
||||
} else if settings.can_log_out() {
|
||||
lines.push(entry(
|
||||
selected == SettingsRow::Logout,
|
||||
"Log out…",
|
||||
String::new(),
|
||||
));
|
||||
}
|
||||
lines.push(Line::from(""));
|
||||
|
||||
lines.push(section("Folders"));
|
||||
lines.push(if settings.mode == SettingsMode::EditingDownloadDir {
|
||||
typing("Download folder: ", settings.input.clone())
|
||||
} else {
|
||||
entry(
|
||||
selected == SettingsRow::DownloadDir,
|
||||
"Download folder: ",
|
||||
settings.download_dir.clone(),
|
||||
)
|
||||
});
|
||||
lines.push(Line::styled(
|
||||
format!("Shared folders ({}):", settings.share_dirs.len()),
|
||||
dimmed_style(),
|
||||
));
|
||||
for (i, dir) in settings.share_dirs.iter().enumerate() {
|
||||
lines.push(entry(
|
||||
selected == SettingsRow::Share(i),
|
||||
"",
|
||||
dir.clone(),
|
||||
));
|
||||
}
|
||||
if settings.share_dirs.is_empty() {
|
||||
lines.push(Line::styled(
|
||||
" (nothing shared — press 'a' to add a folder)",
|
||||
dimmed_style(),
|
||||
));
|
||||
}
|
||||
if settings.mode == SettingsMode::AddingShare {
|
||||
lines.push(typing(" Add share: ", settings.input.clone()));
|
||||
}
|
||||
if let Some(status) = &settings.status {
|
||||
lines.push(Line::from(""));
|
||||
lines.push(Line::styled(status.clone(), warning_style()));
|
||||
}
|
||||
|
||||
let block = pane_block(true).title(plain_title("Settings", true));
|
||||
frame.render_widget(
|
||||
ratatui::widgets::Paragraph::new(lines)
|
||||
.block(block)
|
||||
.wrap(ratatui::widgets::Wrap { trim: false }),
|
||||
area,
|
||||
);
|
||||
}
|
||||
|
||||
fn render_messages_popup(&mut self, frame: &mut Frame) {
|
||||
// The per-conversation chat box supersedes the old flat message list;
|
||||
// it renders the messages and the compose line itself.
|
||||
let area = centered_rect(70, 60, frame.area());
|
||||
frame.render_widget(ratatui::widgets::Clear, area);
|
||||
self.state.popup_area = Some(area);
|
||||
let own = self.client.username();
|
||||
render_chat_pane(frame, area, &mut self.state, &own);
|
||||
}
|
||||
fn render_command_bar(&self, frame: &mut Frame, area: Rect) {
|
||||
let prefix = match self.state.command_bar_mode {
|
||||
CommandBarMode::Search => "search: ",
|
||||
CommandBarMode::Message => "message (to: recipient text): ",
|
||||
CommandBarMode::Browse => "browse user: ",
|
||||
};
|
||||
let block = pane_block(true);
|
||||
// Derive from the block's inner rect so borders and padding stay in
|
||||
// one place; the cursor follows whatever the pane reserves.
|
||||
let inner = block.inner(area);
|
||||
let prefix_width = prefix.chars().count() as u16;
|
||||
let input_width = inner.width.saturating_sub(prefix_width);
|
||||
let (visible_input, cursor_column) = visible_input_at_cursor(
|
||||
&self.state.command_bar_input,
|
||||
self.state.command_bar_cursor_position,
|
||||
input_width,
|
||||
);
|
||||
let command_line = Line::from(vec![
|
||||
Span::styled(prefix, accent_style()),
|
||||
Span::styled(visible_input, primary_style()),
|
||||
]);
|
||||
|
||||
frame.render_widget(Paragraph::new(command_line).block(block), area);
|
||||
|
||||
if inner.width > 0 && inner.height > 0 {
|
||||
let cursor_x = inner
|
||||
.x
|
||||
.saturating_add(prefix_width)
|
||||
.saturating_add(cursor_column)
|
||||
.min(inner.x.saturating_add(inner.width.saturating_sub(1)));
|
||||
frame.set_cursor_position(Position::new(cursor_x, inner.y));
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/// A dragged pane size kept inside the space the terminal now offers: never
|
||||
/// below [`MIN_PANE`], and never so big that what shares the split with it
|
||||
/// drops below `MIN_PANE` too.
|
||||
pub(super) fn shrink(dragged: u16, total: u16) -> u16 {
|
||||
let max = total.saturating_sub(MIN_PANE).max(MIN_PANE);
|
||||
dragged.max(MIN_PANE).min(max)
|
||||
}
|
||||
|
||||
/// The smallest pane a drag can leave anyone: a border and a row or column
|
||||
/// of content each side.
|
||||
pub(super) const MIN_PANE: u16 = 3;
|
||||
/// A `Rect` centered within `area`, sized to the given percentages.
|
||||
fn centered_rect(percent_x: u16, percent_y: u16, area: Rect) -> Rect {
|
||||
let vertical = Layout::vertical([
|
||||
Constraint::Percentage((100 - percent_y) / 2),
|
||||
Constraint::Percentage(percent_y),
|
||||
Constraint::Percentage((100 - percent_y) / 2),
|
||||
])
|
||||
.split(area);
|
||||
Layout::horizontal([
|
||||
Constraint::Percentage((100 - percent_x) / 2),
|
||||
Constraint::Percentage(percent_x),
|
||||
Constraint::Percentage((100 - percent_x) / 2),
|
||||
])
|
||||
.split(vertical[1])[1]
|
||||
}
|
||||
fn visible_input_at_cursor(
|
||||
input: &str,
|
||||
cursor_position: usize,
|
||||
width: u16,
|
||||
) -> (String, u16) {
|
||||
if width == 0 {
|
||||
return (String::new(), 0);
|
||||
}
|
||||
|
||||
let cursor_position = input.floor_char_boundary(cursor_position);
|
||||
let cursor_character_index = input[..cursor_position].chars().count();
|
||||
let max_cursor_column = usize::from(width.saturating_sub(1));
|
||||
let start_character_index =
|
||||
cursor_character_index.saturating_sub(max_cursor_column);
|
||||
|
||||
let visible_input = input
|
||||
.chars()
|
||||
.skip(start_character_index)
|
||||
.take(usize::from(width))
|
||||
.collect();
|
||||
let cursor_column = cursor_character_index
|
||||
.saturating_sub(start_character_index)
|
||||
.min(max_cursor_column);
|
||||
|
||||
(visible_input, cursor_column as u16)
|
||||
}
|
||||
+15
-512
@@ -1,21 +1,15 @@
|
||||
use super::MainTui;
|
||||
use crate::models::{CommandBarMode, FocusedPane, PaneLayout, RoomsView};
|
||||
use crate::ui::panes::{
|
||||
InfoSubject, ResultsPaneParams, render_browse_pane, render_chat_pane,
|
||||
render_download_info_pane, render_downloads_pane, render_results_pane,
|
||||
render_rooms_pane, render_searches_pane, selected_transfer,
|
||||
};
|
||||
use crate::ui::{
|
||||
GLYPH_CURSOR, accent_style, body_style, dimmed_style, info_style, mask,
|
||||
pack_shortcuts, pane_block, plain_title, primary_style,
|
||||
render_download_stats, warning_style,
|
||||
};
|
||||
use ratatui::{
|
||||
Frame,
|
||||
layout::{Alignment, Constraint, Layout, Position, Rect},
|
||||
style::Modifier,
|
||||
text::{Line, Span},
|
||||
widgets::Paragraph,
|
||||
//! The keys the window advertises: the shortcut bar along the foot, the `?`
|
||||
//! overlay behind it, and the unread badge that rides in the bar.
|
||||
//!
|
||||
//! A child module of `render`, so it still reaches the window's state and
|
||||
//! `render`'s own helpers directly; only what `render` calls back into is
|
||||
//! widened to `pub(super)`.
|
||||
|
||||
use super::{
|
||||
Alignment, CommandBarMode, Constraint, FocusedPane, Frame, Layout, Line,
|
||||
MainTui, Modifier, PaneLayout, Paragraph, Rect, RoomsView, Span,
|
||||
accent_style, body_style, dimmed_style, info_style, pack_shortcuts,
|
||||
pane_block, plain_title, warning_style,
|
||||
};
|
||||
|
||||
/// The keys overlay, grouped by where a key applies. Two columns, because a
|
||||
@@ -182,236 +176,10 @@ fn settings_shortcuts(
|
||||
}
|
||||
|
||||
impl MainTui {
|
||||
/// Draw the whole window.
|
||||
pub fn render(&mut self, frame: &mut Frame) {
|
||||
let shortcuts = self.shortcut_rows(frame.area().width);
|
||||
let mut constraints = vec![
|
||||
Constraint::Length(3), // Status bar
|
||||
Constraint::Fill(1), // Main content
|
||||
];
|
||||
if self.state.command_bar_active {
|
||||
constraints.push(Constraint::Length(3)); // Command bar
|
||||
}
|
||||
constraints.push(Constraint::Length(shortcuts.len() as u16 + 2));
|
||||
let main_chunks = Layout::vertical(constraints).split(frame.area());
|
||||
|
||||
let daemon = self.client.daemon_endpoint();
|
||||
render_download_stats(
|
||||
frame,
|
||||
main_chunks[0],
|
||||
&self.state.downloads,
|
||||
self.state.active_downloads_count,
|
||||
daemon.as_deref(),
|
||||
);
|
||||
|
||||
self.render_content(frame, main_chunks[1]);
|
||||
|
||||
// Render command bar if active (vim-style, above shortcuts)
|
||||
if self.state.command_bar_active {
|
||||
self.render_command_bar(frame, main_chunks[2]);
|
||||
self.render_shortcuts(frame, main_chunks[3], shortcuts);
|
||||
} else {
|
||||
self.render_shortcuts(frame, main_chunks[2], shortcuts);
|
||||
}
|
||||
|
||||
self.render_overlays(frame);
|
||||
}
|
||||
|
||||
/// Results across the top, where a long file name has the whole width;
|
||||
/// Searches, Downloads and Info in a row underneath. A hidden pane drops
|
||||
/// out of its row and the rest widen; a zoomed one has the area alone.
|
||||
fn render_content(&mut self, frame: &mut Frame, area: Rect) {
|
||||
// Only what is drawn can be clicked.
|
||||
self.state.searches_pane_area = None;
|
||||
self.state.results_pane_area = None;
|
||||
self.state.downloads_pane_area = None;
|
||||
self.state.info_pane_area = None;
|
||||
self.state.hsplit_divider = None;
|
||||
self.state.vsplit_dividers.clear();
|
||||
self.state.row_area = None;
|
||||
|
||||
if self.state.layout.zoomed {
|
||||
self.render_pane(frame, area, self.state.focused_pane);
|
||||
return;
|
||||
}
|
||||
self.state.content_area = Some(area);
|
||||
|
||||
// Transfers carry the most columns, so they get the most width.
|
||||
let row_panes: Vec<(FocusedPane, u16)> =
|
||||
[(FocusedPane::Searches, 5), (FocusedPane::Downloads, 10)]
|
||||
.into_iter()
|
||||
.filter(|(pane, _)| self.state.layout.is_visible(*pane))
|
||||
.collect();
|
||||
|
||||
let row_area = if self.state.layout.is_visible(FocusedPane::Results) {
|
||||
// With only Info left in the row, the results deserve more of
|
||||
// the height.
|
||||
let row_weight = if row_panes.is_empty() { 1 } else { 2 };
|
||||
let top = match self.state.layout.top_height {
|
||||
Some(rows) => Constraint::Length(shrink(rows, area.height)),
|
||||
None => Constraint::Fill(3),
|
||||
};
|
||||
let [top, bottom] =
|
||||
Layout::vertical([top, Constraint::Fill(row_weight)])
|
||||
.areas(area);
|
||||
// The two touching border rows between the halves; either can
|
||||
// be dragged.
|
||||
self.state.hsplit_divider = Some(Rect::new(
|
||||
area.x,
|
||||
top.y.saturating_add(top.height).saturating_sub(1),
|
||||
area.width,
|
||||
2,
|
||||
));
|
||||
self.render_pane(frame, top, FocusedPane::Results);
|
||||
bottom
|
||||
} else {
|
||||
area
|
||||
};
|
||||
self.state.row_area = Some(row_area);
|
||||
|
||||
let mut constraints: Vec<Constraint> = row_panes
|
||||
.iter()
|
||||
.map(|(pane, weight)| {
|
||||
let dragged = match *pane {
|
||||
FocusedPane::Searches => self.state.layout.searches_width,
|
||||
FocusedPane::Downloads => self.state.layout.downloads_width,
|
||||
FocusedPane::Results => None,
|
||||
};
|
||||
match dragged {
|
||||
Some(cols) => {
|
||||
Constraint::Length(shrink(cols, row_area.width))
|
||||
}
|
||||
None => Constraint::Fill(*weight),
|
||||
}
|
||||
})
|
||||
.collect();
|
||||
constraints.push(Constraint::Fill(6)); // Info
|
||||
let chunks = Layout::horizontal(constraints).split(row_area);
|
||||
for (chunk, (pane, _)) in chunks.iter().zip(&row_panes) {
|
||||
// The seam at this pane's right edge: its border column and the
|
||||
// next pane's, both draggable.
|
||||
self.state.vsplit_dividers.push((
|
||||
*pane,
|
||||
Rect::new(
|
||||
chunk.x.saturating_add(chunk.width).saturating_sub(1),
|
||||
row_area.y,
|
||||
2,
|
||||
row_area.height,
|
||||
),
|
||||
));
|
||||
self.render_pane(frame, *chunk, *pane);
|
||||
}
|
||||
self.state.info_pane_area = Some(chunks[row_panes.len()]);
|
||||
self.render_info_pane(frame, chunks[row_panes.len()]);
|
||||
}
|
||||
|
||||
fn render_pane(
|
||||
&mut self,
|
||||
frame: &mut Frame,
|
||||
area: Rect,
|
||||
pane: FocusedPane,
|
||||
) {
|
||||
let focused = self.state.focused_pane == pane;
|
||||
match pane {
|
||||
FocusedPane::Searches => {
|
||||
self.state.searches_pane_area = Some(area);
|
||||
render_searches_pane(
|
||||
frame,
|
||||
area,
|
||||
&self.state.searches,
|
||||
&mut self.state.searches_table_state,
|
||||
focused,
|
||||
self.state.searches_query_offset,
|
||||
);
|
||||
}
|
||||
FocusedPane::Results => {
|
||||
self.state.results_pane_area = Some(area);
|
||||
self.render_results_pane(frame, area, focused);
|
||||
}
|
||||
FocusedPane::Downloads => {
|
||||
self.state.downloads_pane_area = Some(area);
|
||||
render_downloads_pane(
|
||||
frame,
|
||||
area,
|
||||
&self.state.downloads,
|
||||
&self.state.uploads,
|
||||
&mut self.state.downloads_table_state,
|
||||
focused,
|
||||
self.state.downloads_name_offset,
|
||||
);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
fn render_results_pane(
|
||||
&mut self,
|
||||
frame: &mut Frame,
|
||||
area: Rect,
|
||||
focused: bool,
|
||||
) {
|
||||
// When a filter is active the rendered rows are a subset, so the pane
|
||||
// also needs the mapping back to unfiltered indices to render the
|
||||
// selection checkboxes correctly.
|
||||
let (results_items, results_original_indices) =
|
||||
if self.state.results_filter_query.is_empty() {
|
||||
(&self.state.results_items, None)
|
||||
} else {
|
||||
(
|
||||
&self.state.results_filtered_items,
|
||||
Some(self.state.results_filtered_indices.as_slice()),
|
||||
)
|
||||
};
|
||||
|
||||
let active_search_query = self
|
||||
.state
|
||||
.selected_search_index
|
||||
.and_then(|idx| self.state.searches.get(idx))
|
||||
.map(|search| search.query.as_str());
|
||||
|
||||
render_results_pane(
|
||||
frame,
|
||||
area,
|
||||
ResultsPaneParams {
|
||||
items: results_items,
|
||||
table_state: &mut self.state.results_table_state,
|
||||
selected_indices: &self.state.results_selected_indices,
|
||||
original_indices: results_original_indices,
|
||||
filter_query: &self.state.results_filter_query,
|
||||
is_filtering: self.state.results_is_filtering,
|
||||
focused,
|
||||
active_search_query,
|
||||
name_offset: self.state.results_name_offset,
|
||||
},
|
||||
);
|
||||
}
|
||||
|
||||
/// The Info pane follows the focus: the highlighted result, or the
|
||||
/// highlighted transfer.
|
||||
fn render_info_pane(&self, frame: &mut Frame, area: Rect) {
|
||||
let selected = if self.state.focused_pane == FocusedPane::Results {
|
||||
self.highlighted_result().map(InfoSubject::Result)
|
||||
} else {
|
||||
selected_transfer(
|
||||
self.state.downloads_table_state.selected(),
|
||||
&self.state.downloads,
|
||||
&self.state.uploads,
|
||||
)
|
||||
};
|
||||
render_download_info_pane(
|
||||
frame,
|
||||
area,
|
||||
selected,
|
||||
matches!(
|
||||
self.state.focused_pane,
|
||||
FocusedPane::Results | FocusedPane::Downloads
|
||||
),
|
||||
);
|
||||
}
|
||||
|
||||
/// The keys list, two columns side by side where the terminal is wide
|
||||
/// enough and one on top of the other where it is not, scrolling when
|
||||
/// even that is taller than the window.
|
||||
fn render_help_popup(&mut self, frame: &mut Frame) {
|
||||
pub(super) fn render_help_popup(&mut self, frame: &mut Frame) {
|
||||
let screen = frame.area();
|
||||
// Borders and padding on either side of the text.
|
||||
let frame_width = 4;
|
||||
@@ -455,182 +223,6 @@ impl MainTui {
|
||||
}
|
||||
}
|
||||
|
||||
fn render_overlays(&mut self, frame: &mut Frame) {
|
||||
// Messages inbox overlays everything when open.
|
||||
if self.state.show_messages {
|
||||
self.render_messages_popup(frame);
|
||||
}
|
||||
|
||||
// Browse tree overlays everything when open.
|
||||
if self.state.show_browse && !self.state.browse.is_empty() {
|
||||
let area = centered_rect(80, 80, frame.area());
|
||||
self.state.popup_area = Some(area);
|
||||
frame.render_widget(ratatui::widgets::Clear, area);
|
||||
render_browse_pane(
|
||||
frame,
|
||||
area,
|
||||
&self.state.browse,
|
||||
&mut self.state.browse_table_state,
|
||||
self.spinner_state,
|
||||
&self.state.downloads,
|
||||
);
|
||||
}
|
||||
|
||||
// Settings popup overlays everything when open.
|
||||
if self.state.settings.is_some() {
|
||||
self.render_settings_popup(frame);
|
||||
}
|
||||
|
||||
// Chat rooms overlay everything when open.
|
||||
if self.state.show_rooms {
|
||||
let area = centered_rect(85, 80, frame.area());
|
||||
self.state.popup_area = Some(area);
|
||||
frame.render_widget(ratatui::widgets::Clear, area);
|
||||
render_rooms_pane(
|
||||
frame,
|
||||
area,
|
||||
&mut self.state.rooms,
|
||||
&mut self.state.rooms_list_table_state,
|
||||
);
|
||||
}
|
||||
|
||||
// The keys list only opens from the main view, so it is on top of
|
||||
// nothing; drawn last so that stays true if that ever changes.
|
||||
if self.state.show_help {
|
||||
self.render_help_popup(frame);
|
||||
}
|
||||
}
|
||||
|
||||
fn render_settings_popup(&self, frame: &mut Frame) {
|
||||
use crate::models::{SettingsMode, SettingsRow};
|
||||
let Some(settings) = self.state.settings.as_ref() else {
|
||||
return;
|
||||
};
|
||||
let area = centered_rect(70, 60, frame.area());
|
||||
frame.render_widget(ratatui::widgets::Clear, area);
|
||||
|
||||
let selected = settings.selected_row();
|
||||
let mut lines: Vec<Line> = Vec::new();
|
||||
let entry = |on: bool, label: &str, value: String| {
|
||||
Line::from(vec![
|
||||
Span::styled(if on { "> " } else { " " }, accent_style()),
|
||||
Span::styled(label.to_string(), dimmed_style()),
|
||||
Span::styled(value, primary_style()),
|
||||
])
|
||||
};
|
||||
let typing = |label: &str, value: String| {
|
||||
Line::from(vec![
|
||||
Span::styled("> ", accent_style()),
|
||||
Span::styled(label.to_string(), dimmed_style()),
|
||||
Span::styled(value, primary_style()),
|
||||
Span::styled(GLYPH_CURSOR, accent_style()),
|
||||
])
|
||||
};
|
||||
let section = |name: &str| Line::styled(name.to_string(), info_style());
|
||||
|
||||
// One column of labels, padded here rather than by hand in each
|
||||
// string.
|
||||
let field = |label: &str, value: String| {
|
||||
entry(false, &format!(" {label:<14}"), value)
|
||||
};
|
||||
let account = &settings.account;
|
||||
lines.push(section("Account"));
|
||||
lines.push(field("Signed in as", account.username.clone()));
|
||||
lines.push(field("Sharing", account.shares.clone()));
|
||||
lines.push(field(
|
||||
"Reachable on",
|
||||
account.listen_port.map_or_else(
|
||||
|| "not accepting connections".to_string(),
|
||||
|port| format!("port {port}"),
|
||||
),
|
||||
));
|
||||
if let Some(daemon) = &account.daemon {
|
||||
lines.push(field("Daemon", daemon.clone()));
|
||||
}
|
||||
lines.push(Line::from(""));
|
||||
|
||||
lines.push(match settings.mode {
|
||||
SettingsMode::NewPassword => {
|
||||
typing("New password: ", mask(&settings.input))
|
||||
}
|
||||
SettingsMode::RepeatPassword(_) => {
|
||||
typing("Repeat it: ", mask(&settings.input))
|
||||
}
|
||||
_ => entry(
|
||||
selected == SettingsRow::ChangePassword,
|
||||
"Change password…",
|
||||
String::new(),
|
||||
),
|
||||
});
|
||||
if settings.mode == SettingsMode::ConfirmingLogout {
|
||||
lines.push(entry(
|
||||
true,
|
||||
&format!("Log out of {}? ", account.username),
|
||||
"y / n".to_string(),
|
||||
));
|
||||
} else if settings.can_log_out() {
|
||||
lines.push(entry(
|
||||
selected == SettingsRow::Logout,
|
||||
"Log out…",
|
||||
String::new(),
|
||||
));
|
||||
}
|
||||
lines.push(Line::from(""));
|
||||
|
||||
lines.push(section("Folders"));
|
||||
lines.push(if settings.mode == SettingsMode::EditingDownloadDir {
|
||||
typing("Download folder: ", settings.input.clone())
|
||||
} else {
|
||||
entry(
|
||||
selected == SettingsRow::DownloadDir,
|
||||
"Download folder: ",
|
||||
settings.download_dir.clone(),
|
||||
)
|
||||
});
|
||||
lines.push(Line::styled(
|
||||
format!("Shared folders ({}):", settings.share_dirs.len()),
|
||||
dimmed_style(),
|
||||
));
|
||||
for (i, dir) in settings.share_dirs.iter().enumerate() {
|
||||
lines.push(entry(
|
||||
selected == SettingsRow::Share(i),
|
||||
"",
|
||||
dir.clone(),
|
||||
));
|
||||
}
|
||||
if settings.share_dirs.is_empty() {
|
||||
lines.push(Line::styled(
|
||||
" (nothing shared — press 'a' to add a folder)",
|
||||
dimmed_style(),
|
||||
));
|
||||
}
|
||||
if settings.mode == SettingsMode::AddingShare {
|
||||
lines.push(typing(" Add share: ", settings.input.clone()));
|
||||
}
|
||||
if let Some(status) = &settings.status {
|
||||
lines.push(Line::from(""));
|
||||
lines.push(Line::styled(status.clone(), warning_style()));
|
||||
}
|
||||
|
||||
let block = pane_block(true).title(plain_title("Settings", true));
|
||||
frame.render_widget(
|
||||
ratatui::widgets::Paragraph::new(lines)
|
||||
.block(block)
|
||||
.wrap(ratatui::widgets::Wrap { trim: false }),
|
||||
area,
|
||||
);
|
||||
}
|
||||
|
||||
fn render_messages_popup(&mut self, frame: &mut Frame) {
|
||||
// The per-conversation chat box supersedes the old flat message list;
|
||||
// it renders the messages and the compose line itself.
|
||||
let area = centered_rect(70, 60, frame.area());
|
||||
frame.render_widget(ratatui::widgets::Clear, area);
|
||||
self.state.popup_area = Some(area);
|
||||
let own = self.client.username();
|
||||
render_chat_pane(frame, area, &mut self.state, &own);
|
||||
}
|
||||
|
||||
/// Context shortcuts for the chat-rooms popup.
|
||||
fn rooms_shortcuts(&self) -> Vec<(&'static str, &'static str)> {
|
||||
if self.state.rooms.composing {
|
||||
@@ -829,7 +421,7 @@ impl MainTui {
|
||||
|
||||
/// The legend packed into rows for a window `width` wide, so a narrow
|
||||
/// terminal grows the bar instead of cutting keys off its right edge.
|
||||
fn shortcut_rows(&self, width: u16) -> Vec<Line<'static>> {
|
||||
pub(super) fn shortcut_rows(&self, width: u16) -> Vec<Line<'static>> {
|
||||
// Borders and padding, and the unread badge's column when it shows.
|
||||
let badge = self.unread_badge().width() as u16;
|
||||
let reserved = 4 + if badge > 0 { badge + 1 } else { 0 };
|
||||
@@ -848,7 +440,7 @@ impl MainTui {
|
||||
)
|
||||
}
|
||||
|
||||
fn render_shortcuts(
|
||||
pub(super) fn render_shortcuts(
|
||||
&self,
|
||||
frame: &mut Frame,
|
||||
area: Rect,
|
||||
@@ -888,57 +480,11 @@ impl MainTui {
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
fn render_command_bar(&self, frame: &mut Frame, area: Rect) {
|
||||
let prefix = match self.state.command_bar_mode {
|
||||
CommandBarMode::Search => "search: ",
|
||||
CommandBarMode::Message => "message (to: recipient text): ",
|
||||
CommandBarMode::Browse => "browse user: ",
|
||||
};
|
||||
let block = pane_block(true);
|
||||
// Derive from the block's inner rect so borders and padding stay in
|
||||
// one place; the cursor follows whatever the pane reserves.
|
||||
let inner = block.inner(area);
|
||||
let prefix_width = prefix.chars().count() as u16;
|
||||
let input_width = inner.width.saturating_sub(prefix_width);
|
||||
let (visible_input, cursor_column) = visible_input_at_cursor(
|
||||
&self.state.command_bar_input,
|
||||
self.state.command_bar_cursor_position,
|
||||
input_width,
|
||||
);
|
||||
let command_line = Line::from(vec![
|
||||
Span::styled(prefix, accent_style()),
|
||||
Span::styled(visible_input, primary_style()),
|
||||
]);
|
||||
|
||||
frame.render_widget(Paragraph::new(command_line).block(block), area);
|
||||
|
||||
if inner.width > 0 && inner.height > 0 {
|
||||
let cursor_x = inner
|
||||
.x
|
||||
.saturating_add(prefix_width)
|
||||
.saturating_add(cursor_column)
|
||||
.min(inner.x.saturating_add(inner.width.saturating_sub(1)));
|
||||
frame.set_cursor_position(Position::new(cursor_x, inner.y));
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/// Columns between the two halves of the keys list.
|
||||
const HELP_GAP: u16 = 2;
|
||||
|
||||
/// A dragged pane size kept inside the space the terminal now offers: never
|
||||
/// below [`MIN_PANE`], and never so big that what shares the split with it
|
||||
/// drops below `MIN_PANE` too.
|
||||
pub(super) fn shrink(dragged: u16, total: u16) -> u16 {
|
||||
let max = total.saturating_sub(MIN_PANE).max(MIN_PANE);
|
||||
dragged.max(MIN_PANE).min(max)
|
||||
}
|
||||
|
||||
/// The smallest pane a drag can leave anyone: a border and a row or column
|
||||
/// of content each side.
|
||||
pub(super) const MIN_PANE: u16 = 3;
|
||||
|
||||
/// The widest key in a column, so the descriptions line up.
|
||||
fn key_column_width(sections: &[(&str, &[(&str, &str)])]) -> usize {
|
||||
sections
|
||||
@@ -990,22 +536,6 @@ fn help_lines(sections: &[(&str, &[(&str, &str)])]) -> Vec<Line<'static>> {
|
||||
lines
|
||||
}
|
||||
|
||||
/// A `Rect` centered within `area`, sized to the given percentages.
|
||||
fn centered_rect(percent_x: u16, percent_y: u16, area: Rect) -> Rect {
|
||||
let vertical = Layout::vertical([
|
||||
Constraint::Percentage((100 - percent_y) / 2),
|
||||
Constraint::Percentage(percent_y),
|
||||
Constraint::Percentage((100 - percent_y) / 2),
|
||||
])
|
||||
.split(area);
|
||||
Layout::horizontal([
|
||||
Constraint::Percentage((100 - percent_x) / 2),
|
||||
Constraint::Percentage(percent_x),
|
||||
Constraint::Percentage((100 - percent_x) / 2),
|
||||
])
|
||||
.split(vertical[1])[1]
|
||||
}
|
||||
|
||||
/// Build the shortcuts-bar unread badge: `✉ N` for unread private messages and
|
||||
/// `💬 N` for unread chat-room messages. Returns an empty line when nothing is
|
||||
/// unread so the caller can skip it.
|
||||
@@ -1038,33 +568,6 @@ fn unread_indicator(
|
||||
Line::from(Span::styled(format!("⟨ {} ⟩", counts.join(" ")), style))
|
||||
}
|
||||
|
||||
fn visible_input_at_cursor(
|
||||
input: &str,
|
||||
cursor_position: usize,
|
||||
width: u16,
|
||||
) -> (String, u16) {
|
||||
if width == 0 {
|
||||
return (String::new(), 0);
|
||||
}
|
||||
|
||||
let cursor_position = input.floor_char_boundary(cursor_position);
|
||||
let cursor_character_index = input[..cursor_position].chars().count();
|
||||
let max_cursor_column = usize::from(width.saturating_sub(1));
|
||||
let start_character_index =
|
||||
cursor_character_index.saturating_sub(max_cursor_column);
|
||||
|
||||
let visible_input = input
|
||||
.chars()
|
||||
.skip(start_character_index)
|
||||
.take(usize::from(width))
|
||||
.collect();
|
||||
let cursor_column = cursor_character_index
|
||||
.saturating_sub(start_character_index)
|
||||
.min(max_cursor_column);
|
||||
|
||||
(visible_input, cursor_column as u16)
|
||||
}
|
||||
|
||||
#[cfg(test)]
|
||||
mod tests {
|
||||
use super::unread_indicator;
|
||||
@@ -0,0 +1,172 @@
|
||||
//! The browse popup, over a peer's shares and over our own.
|
||||
|
||||
use super::*;
|
||||
|
||||
#[test]
|
||||
fn shift_b_shows_what_this_session_shares_and_r_re_indexes_it() {
|
||||
let session = Arc::new(TalkativeSession::default());
|
||||
*session.listing.lock().expect("not poisoned") =
|
||||
vec![soulseek_rs::SharedDirectory {
|
||||
name: "Music\\Album".to_string(),
|
||||
files: vec![soulseek_rs::SharedFileEntry {
|
||||
name: "track.mp3".to_string(),
|
||||
size: 4096,
|
||||
attributes: Vec::new(),
|
||||
}],
|
||||
}];
|
||||
let mut tui = attach(session.clone());
|
||||
|
||||
press(&mut tui, KeyCode::Char('B'));
|
||||
assert!(tui.state.show_browse, "the popup opens");
|
||||
let tab = tui.state.browse.active_tab().expect("tab");
|
||||
assert!(tab.own, "on this session's own index");
|
||||
assert_eq!(tab.username, "tester");
|
||||
assert_eq!(tab.file_count, 1);
|
||||
let screen = screen_of(&mut tui);
|
||||
assert!(screen.contains("My shares"), "{screen}");
|
||||
press(&mut tui, KeyCode::Char('L'));
|
||||
let screen = screen_of(&mut tui);
|
||||
assert!(
|
||||
screen.contains("Album") && screen.contains("track.mp3"),
|
||||
"the virtual path a peer would see, folder by folder: {screen}"
|
||||
);
|
||||
|
||||
// Nothing here is downloadable from ourselves.
|
||||
press(&mut tui, KeyCode::Char('d'));
|
||||
assert!(tui.state.downloads.is_empty());
|
||||
|
||||
// `r` re-scans the disk rather than re-asking a peer, and the tab
|
||||
// picks up what the fresh scan found.
|
||||
session.listing.lock().expect("not poisoned").clear();
|
||||
press(&mut tui, KeyCode::Char('r'));
|
||||
assert!(
|
||||
session.shares_set.lock().expect("not poisoned").is_some(),
|
||||
"the session was asked to re-index"
|
||||
);
|
||||
assert_eq!(
|
||||
tui.state.browse.active_tab().expect("tab").file_count,
|
||||
0,
|
||||
"the view follows the new index"
|
||||
);
|
||||
|
||||
// A second B focuses the tab it already opened.
|
||||
press(&mut tui, KeyCode::Esc);
|
||||
press(&mut tui, KeyCode::Char('B'));
|
||||
assert_eq!(tui.state.browse.tabs.len(), 1);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn o_leaves_the_share_view_for_the_folders_that_feed_it() {
|
||||
let mut tui = attach(Arc::new(TalkativeSession::default()));
|
||||
press(&mut tui, KeyCode::Char('B'));
|
||||
press(&mut tui, KeyCode::Char('o'));
|
||||
assert!(!tui.state.show_browse, "the popup steps aside");
|
||||
assert!(tui.state.settings.is_some(), "for the settings pane");
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn page_keys_walk_the_browse_tree_and_ctrl_d_does_not_download() {
|
||||
let session = Arc::new(TalkativeSession::default());
|
||||
let mut tui = attach(session);
|
||||
browsed(&mut tui, 40);
|
||||
let rows = tui.state.browse.active_tab().expect("tab").rows().len();
|
||||
assert_eq!(rows, 41, "the folder and its files");
|
||||
|
||||
press(&mut tui, KeyCode::End);
|
||||
let selected = |tui: &MainTui| {
|
||||
tui.state.browse.active_tab().expect("tab").selected_row
|
||||
};
|
||||
assert_eq!(selected(&tui), 40);
|
||||
press(&mut tui, KeyCode::Home);
|
||||
assert_eq!(selected(&tui), 0);
|
||||
press(&mut tui, KeyCode::PageDown);
|
||||
let page = selected(&tui);
|
||||
assert!(page > 1 && page < 40, "a page of rows: {page}");
|
||||
ctrl(&mut tui, 'd');
|
||||
assert!(selected(&tui) > page, "ctrl-d pages");
|
||||
assert!(
|
||||
tui.state.downloads.is_empty()
|
||||
&& tui.state.downloads_receiver_channel.is_none(),
|
||||
"and does not download the folder"
|
||||
);
|
||||
press(&mut tui, KeyCode::Char('G'));
|
||||
assert_eq!(selected(&tui), 40);
|
||||
assert!(tui.state.show_browse, "still open");
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn folder_keys_and_the_filter_move_through_a_browsed_tree() {
|
||||
let mut tui = attach(Arc::new(TalkativeSession::default()));
|
||||
tui.state.browse.open("bob");
|
||||
let listing = vec![
|
||||
soulseek_rs::SharedDirectory {
|
||||
name: "music\\alpha".to_string(),
|
||||
files: vec![
|
||||
soulseek_rs::SharedFileEntry {
|
||||
name: "a1.mp3".to_string(),
|
||||
size: 1,
|
||||
attributes: Vec::new(),
|
||||
},
|
||||
soulseek_rs::SharedFileEntry {
|
||||
name: "a2.flac".to_string(),
|
||||
size: 2,
|
||||
attributes: Vec::new(),
|
||||
},
|
||||
],
|
||||
},
|
||||
soulseek_rs::SharedDirectory {
|
||||
name: "music\\beta".to_string(),
|
||||
files: vec![soulseek_rs::SharedFileEntry {
|
||||
name: "b1.mp3".to_string(),
|
||||
size: 3,
|
||||
attributes: Vec::new(),
|
||||
}],
|
||||
},
|
||||
];
|
||||
tui.state
|
||||
.browse
|
||||
.active_tab_mut()
|
||||
.expect("tab")
|
||||
.load(&listing);
|
||||
tui.state.show_browse = true;
|
||||
let _ = screen_of(&mut tui);
|
||||
let selected = |tui: &MainTui| {
|
||||
tui.state.browse.active_tab().expect("tab").selected_row
|
||||
};
|
||||
let rows = |tui: &MainTui| {
|
||||
tui.state.browse.active_tab().expect("tab").rows().len()
|
||||
};
|
||||
|
||||
press(&mut tui, KeyCode::Char('L'));
|
||||
assert_eq!(rows(&tui), 6, "every folder open");
|
||||
press(&mut tui, KeyCode::Char('J'));
|
||||
press(&mut tui, KeyCode::Char('J'));
|
||||
assert_eq!(selected(&tui), 4, "beta, skipping alpha's files");
|
||||
press(&mut tui, KeyCode::Char('K'));
|
||||
assert_eq!(selected(&tui), 1, "back to alpha");
|
||||
press(&mut tui, KeyCode::Char('H'));
|
||||
assert_eq!(rows(&tui), 1, "just music");
|
||||
|
||||
press(&mut tui, KeyCode::Char('/'));
|
||||
for c in "flac".chars() {
|
||||
press(&mut tui, KeyCode::Char(c));
|
||||
}
|
||||
assert_eq!(rows(&tui), 3, "music, alpha, a2.flac");
|
||||
let screen = screen_of(&mut tui);
|
||||
assert!(screen.contains("filter: flac_"), "{screen}");
|
||||
ctrl(&mut tui, 'd');
|
||||
assert_eq!(
|
||||
tui.state.browse.active_tab().expect("tab").filter(),
|
||||
"flac",
|
||||
"a control chord pages, it does not type"
|
||||
);
|
||||
press(&mut tui, KeyCode::Enter);
|
||||
press(&mut tui, KeyCode::Char('j'));
|
||||
press(&mut tui, KeyCode::Char('j'));
|
||||
assert_eq!(selected(&tui), 2, "j moves again once the filter is kept");
|
||||
press(&mut tui, KeyCode::Esc);
|
||||
assert_eq!(rows(&tui), 1, "Esc clears the filter first");
|
||||
assert!(tui.state.show_browse);
|
||||
press(&mut tui, KeyCode::Esc);
|
||||
assert!(!tui.state.show_browse, "then hides the popup");
|
||||
}
|
||||
@@ -0,0 +1,386 @@
|
||||
//! The window itself: which panes are up, how big, and what the chrome
|
||||
//! says while they move.
|
||||
|
||||
use super::*;
|
||||
|
||||
#[test]
|
||||
fn the_results_pane_has_the_whole_width_to_itself() {
|
||||
let mut tui = furnished_tui();
|
||||
let screen = screen_of(&mut tui);
|
||||
|
||||
let results = row_with(&screen, "[2] Results");
|
||||
assert!(results.starts_with('╭'), "{results}");
|
||||
assert!(results.trim_end().ends_with('╮'), "{results}");
|
||||
assert!(!results.contains("[1]"), "nothing beside it: {results}");
|
||||
|
||||
// The other three share the row underneath, in this order.
|
||||
let row = row_with(&screen, "[1] Searches");
|
||||
let searches = row.find("[1]").expect("searches");
|
||||
let downloads = row.find("[3]").expect("downloads");
|
||||
let info = row.find("[Info]").expect("info");
|
||||
assert!(searches < downloads && downloads < info, "{row}");
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn tab_and_shift_tab_walk_the_panes_in_legend_order() {
|
||||
let mut tui = furnished_tui();
|
||||
tui.state.focused_pane = FocusedPane::Searches;
|
||||
press(&mut tui, KeyCode::Tab);
|
||||
assert_eq!(tui.state.focused_pane, FocusedPane::Results);
|
||||
press(&mut tui, KeyCode::Tab);
|
||||
assert_eq!(tui.state.focused_pane, FocusedPane::Downloads);
|
||||
press(&mut tui, KeyCode::Tab);
|
||||
assert_eq!(tui.state.focused_pane, FocusedPane::Searches);
|
||||
press(&mut tui, KeyCode::BackTab);
|
||||
assert_eq!(tui.state.focused_pane, FocusedPane::Downloads);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn w_hides_the_focused_pane_and_its_number_brings_it_back() {
|
||||
let mut tui = furnished_tui();
|
||||
tui.state.focused_pane = FocusedPane::Searches;
|
||||
|
||||
press(&mut tui, KeyCode::Char('w'));
|
||||
|
||||
let screen = screen_of(&mut tui);
|
||||
assert!(!screen.contains("[1] Searches"), "{screen}");
|
||||
assert!(screen.contains("[2] Results"), "{screen}");
|
||||
assert!(screen.contains("[3] Downloads"), "{screen}");
|
||||
assert_eq!(tui.state.focused_pane, FocusedPane::Results);
|
||||
assert_eq!(tui.state.searches_pane_area, None, "nothing to click");
|
||||
// The transfers widen into the space.
|
||||
let row = row_with(&screen, "[3] Downloads");
|
||||
assert!(row.starts_with('╭'), "{row}");
|
||||
|
||||
press(&mut tui, KeyCode::Char('1'));
|
||||
|
||||
let screen = screen_of(&mut tui);
|
||||
assert!(screen.contains("[1] Searches"), "{screen}");
|
||||
assert_eq!(tui.state.focused_pane, FocusedPane::Searches);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn hiding_the_results_gives_the_row_the_whole_height() {
|
||||
let mut tui = furnished_tui();
|
||||
press(&mut tui, KeyCode::Char('w'));
|
||||
let screen = screen_of(&mut tui);
|
||||
assert!(!screen.contains("[2] Results"), "{screen}");
|
||||
// The row now starts right under the status bar.
|
||||
let status = screen
|
||||
.lines()
|
||||
.position(|line| line.contains("Status"))
|
||||
.expect("status bar");
|
||||
let row = screen
|
||||
.lines()
|
||||
.position(|line| line.contains("[1] Searches"))
|
||||
.expect("searches");
|
||||
assert_eq!(row, status + 3, "{screen}");
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn the_last_pane_standing_cannot_be_hidden() {
|
||||
// Results goes, then Downloads; Searches is what is left, and a
|
||||
// third press leaves it there.
|
||||
let mut tui = furnished_tui();
|
||||
press(&mut tui, KeyCode::Char('w'));
|
||||
press(&mut tui, KeyCode::Char('w'));
|
||||
press(&mut tui, KeyCode::Char('w'));
|
||||
let screen = screen_of(&mut tui);
|
||||
assert!(screen.contains("[1] Searches"), "{screen}");
|
||||
assert!(!screen.contains("[3] Downloads"), "{screen}");
|
||||
assert_eq!(tui.state.focused_pane, FocusedPane::Searches);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn z_zooms_the_focused_pane_and_esc_or_z_leaves_it() {
|
||||
let mut tui = furnished_tui();
|
||||
press(&mut tui, KeyCode::Char('z'));
|
||||
|
||||
let screen = screen_of(&mut tui);
|
||||
assert!(screen.contains("[2] Results"), "{screen}");
|
||||
assert!(!screen.contains("[1] Searches"), "{screen}");
|
||||
assert!(!screen.contains("[3] Downloads"), "{screen}");
|
||||
assert!(!screen.contains("[Info]"), "{screen}");
|
||||
assert!(screen.contains("[z → unzoom]"), "{screen}");
|
||||
|
||||
// Tab while zoomed switches which pane fills the window.
|
||||
press(&mut tui, KeyCode::Tab);
|
||||
let screen = screen_of(&mut tui);
|
||||
assert!(screen.contains("[3] Downloads"), "{screen}");
|
||||
assert!(!screen.contains("[2] Results"), "{screen}");
|
||||
|
||||
press(&mut tui, KeyCode::Esc);
|
||||
assert!(!tui.state.layout.zoomed);
|
||||
let screen = screen_of(&mut tui);
|
||||
assert!(screen.contains("[2] Results"), "{screen}");
|
||||
assert!(screen.contains("[Info]"), "{screen}");
|
||||
|
||||
press(&mut tui, KeyCode::Char('z'));
|
||||
press(&mut tui, KeyCode::Char('z'));
|
||||
assert!(!tui.state.layout.zoomed, "z toggles");
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn a_search_brings_a_hidden_results_pane_back() {
|
||||
let mut tui = furnished_tui();
|
||||
press(&mut tui, KeyCode::Char('w'));
|
||||
assert!(!tui.state.layout.is_visible(FocusedPane::Results));
|
||||
|
||||
press(&mut tui, KeyCode::Char('s'));
|
||||
press(&mut tui, KeyCode::Char('x'));
|
||||
press(&mut tui, KeyCode::Enter);
|
||||
|
||||
assert!(tui.state.layout.is_visible(FocusedPane::Results));
|
||||
assert_eq!(tui.state.focused_pane, FocusedPane::Results);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn question_mark_opens_the_keys_list_and_closes_it_again() {
|
||||
let mut tui = furnished_tui();
|
||||
press(&mut tui, KeyCode::Char('?'));
|
||||
|
||||
let screen = screen_of(&mut tui);
|
||||
assert!(screen.contains("Keys"), "{screen}");
|
||||
assert!(screen.contains("Tab / Shift-Tab"), "{screen}");
|
||||
assert!(screen.contains("clear every finished one"), "{screen}");
|
||||
|
||||
// Other keys are swallowed while it is open.
|
||||
press(&mut tui, KeyCode::Char('q'));
|
||||
assert!(tui.state.exit.is_none(), "q closes the list, not the app");
|
||||
assert!(!tui.state.show_help);
|
||||
|
||||
press(&mut tui, KeyCode::Char('?'));
|
||||
press(&mut tui, KeyCode::Char('w'));
|
||||
assert!(tui.state.show_help, "w did not reach the panes");
|
||||
assert!(tui.state.layout.is_visible(FocusedPane::Results));
|
||||
press(&mut tui, KeyCode::Esc);
|
||||
assert!(!tui.state.show_help);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn on_a_small_terminal_the_keys_list_stacks_and_scrolls() {
|
||||
let mut tui = furnished_tui();
|
||||
press(&mut tui, KeyCode::Char('?'));
|
||||
|
||||
let screen = screen_sized(&mut tui, 80, 24);
|
||||
let panes = row_with(&screen, "Panes");
|
||||
assert!(!panes.contains("Searches"), "one column: {panes}");
|
||||
assert!(screen.contains("focus a pane, hidden or not"), "{screen}");
|
||||
assert!(!screen.contains("next room, chat or user"), "{screen}");
|
||||
|
||||
press(&mut tui, KeyCode::End);
|
||||
let screen = screen_sized(&mut tui, 80, 24);
|
||||
assert!(screen.contains("next room, chat or user"), "{screen}");
|
||||
assert!(!screen.contains("next / previous pane"), "{screen}");
|
||||
|
||||
press(&mut tui, KeyCode::Home);
|
||||
let screen = screen_sized(&mut tui, 80, 24);
|
||||
assert!(screen.contains("Tab / Shift-Tab"), "{screen}");
|
||||
|
||||
// A wide window shows both columns at once, nothing to scroll. It
|
||||
// has to be tall enough to hold the taller column outright; in a
|
||||
// shorter one End follows the tail and the headings scroll off.
|
||||
press(&mut tui, KeyCode::End);
|
||||
let screen = screen_sized(&mut tui, 160, 44);
|
||||
let panes = row_with(&screen, "Panes");
|
||||
assert!(panes.contains("Searches"), "two columns: {panes}");
|
||||
assert!(screen.contains("Tab / Shift-Tab"), "{screen}");
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn a_click_where_a_pane_just_hid_does_not_focus_it() {
|
||||
let mut tui = furnished_tui();
|
||||
let _ = screen_of(&mut tui);
|
||||
let searches = tui.state.searches_pane_area.expect("laid out");
|
||||
// Hidden, but not yet redrawn: the old area is still on record.
|
||||
tui.state.focused_pane = FocusedPane::Searches;
|
||||
press(&mut tui, KeyCode::Char('w'));
|
||||
assert_eq!(tui.state.focused_pane, FocusedPane::Results);
|
||||
tui.handle_mouse_event(ratatui::crossterm::event::MouseEvent {
|
||||
kind: ratatui::crossterm::event::MouseEventKind::Down(
|
||||
ratatui::crossterm::event::MouseButton::Left,
|
||||
),
|
||||
column: searches.x + 1,
|
||||
row: searches.y + 1,
|
||||
modifiers: KeyModifiers::NONE,
|
||||
});
|
||||
assert_eq!(tui.state.focused_pane, FocusedPane::Results);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn the_shortcut_bar_wraps_instead_of_cutting_keys_off() {
|
||||
let mut tui = furnished_tui();
|
||||
let screen = screen_of(&mut tui);
|
||||
assert!(screen.contains("[q → quit]"), "{screen}");
|
||||
let bar_rows = screen.lines().filter(|line| line.contains(" → ")).count();
|
||||
assert_eq!(bar_rows, 2, "{screen}");
|
||||
|
||||
let wide = screen_sized(&mut tui, 300, 40);
|
||||
let bar_rows = wide.lines().filter(|line| line.contains(" → ")).count();
|
||||
assert_eq!(bar_rows, 1, "{wide}");
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn the_searches_pane_lists_its_clear_all_and_rerun_keys() {
|
||||
let mut tui = furnished_tui();
|
||||
tui.state.focused_pane = FocusedPane::Searches;
|
||||
let screen = screen_sized(&mut tui, 300, 40);
|
||||
assert!(screen.contains("[C → clear all]"), "{screen}");
|
||||
assert!(screen.contains("[S → search again]"), "{screen}");
|
||||
press(&mut tui, KeyCode::Char('?'));
|
||||
let screen = screen_of(&mut tui);
|
||||
assert!(screen.contains("run the search again"), "{screen}");
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn the_downloads_pane_lists_its_clear_everything_key() {
|
||||
let mut tui = furnished_tui();
|
||||
tui.state.focused_pane = FocusedPane::Downloads;
|
||||
let screen = screen_sized(&mut tui, 300, 40);
|
||||
assert!(screen.contains("[c → clear finished]"), "{screen}");
|
||||
assert!(screen.contains("[C → clear all]"), "{screen}");
|
||||
press(&mut tui, KeyCode::Char('?'));
|
||||
let screen = screen_of(&mut tui);
|
||||
assert!(screen.contains("cancelling the live ones"), "{screen}");
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn shift_w_brings_every_pane_back_and_leaves_zoom() {
|
||||
let mut tui = furnished_tui();
|
||||
tui.state.focused_pane = FocusedPane::Searches;
|
||||
assert!(!screen_sized(&mut tui, 300, 40).contains("[W → "));
|
||||
press(&mut tui, KeyCode::Char('w'));
|
||||
press(&mut tui, KeyCode::Char('z'));
|
||||
assert!(tui.state.layout.zoomed);
|
||||
assert!(!tui.state.layout.is_visible(FocusedPane::Searches));
|
||||
let screen = screen_sized(&mut tui, 300, 40);
|
||||
assert!(screen.contains("[W → reset layout]"), "{screen}");
|
||||
press(&mut tui, KeyCode::Char('W'));
|
||||
assert!(!tui.state.layout.zoomed);
|
||||
assert!(
|
||||
FocusedPane::ALL
|
||||
.iter()
|
||||
.all(|p| tui.state.layout.is_visible(*p))
|
||||
);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn clicking_where_a_hidden_pane_was_focuses_whatever_is_there_now() {
|
||||
let mut tui = furnished_tui();
|
||||
let _ = screen_of(&mut tui);
|
||||
let searches = tui.state.searches_pane_area.expect("laid out");
|
||||
let inside = ratatui::crossterm::event::MouseEvent {
|
||||
kind: ratatui::crossterm::event::MouseEventKind::Down(
|
||||
ratatui::crossterm::event::MouseButton::Left,
|
||||
),
|
||||
column: searches.x + 1,
|
||||
row: searches.y + 1,
|
||||
modifiers: KeyModifiers::NONE,
|
||||
};
|
||||
tui.handle_mouse_event(inside);
|
||||
assert_eq!(tui.state.focused_pane, FocusedPane::Searches);
|
||||
|
||||
press(&mut tui, KeyCode::Char('w'));
|
||||
let _ = screen_of(&mut tui);
|
||||
tui.handle_mouse_event(inside);
|
||||
assert_eq!(tui.state.focused_pane, FocusedPane::Downloads);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn dragging_the_border_under_results_resizes_its_row() {
|
||||
let mut tui = furnished_tui();
|
||||
let _ = screen_of(&mut tui);
|
||||
let results = tui.state.results_pane_area.expect("laid out");
|
||||
let divider = tui.state.hsplit_divider.expect("a divider");
|
||||
let before = results.height;
|
||||
let focused = tui.state.focused_pane;
|
||||
|
||||
// Two drags: the row shrinks by the rows the pointer moved up.
|
||||
mouse_drag_row(
|
||||
&mut tui,
|
||||
(results.x + 1, divider.y),
|
||||
(results.x + 1, divider.y - 2),
|
||||
);
|
||||
assert_eq!(tui.state.layout.top_height, Some(before - 2));
|
||||
assert_eq!(
|
||||
tui.state.focused_pane, focused,
|
||||
"a grab is not a focus click"
|
||||
);
|
||||
|
||||
let _ = screen_of(&mut tui);
|
||||
assert_eq!(
|
||||
tui.state.results_pane_area.expect("laid out").height,
|
||||
before - 2
|
||||
);
|
||||
|
||||
// A drag far past the row stops at the smallest pane, not zero.
|
||||
mouse_drag_row(
|
||||
&mut tui,
|
||||
(results.x + 1, divider.y - 2),
|
||||
(results.x + 1, 0),
|
||||
);
|
||||
assert!(tui.state.layout.top_height.expect("resized") >= 3);
|
||||
|
||||
press(&mut tui, KeyCode::Char('W'));
|
||||
assert_eq!(tui.state.layout.top_height, None, "W resets the layout");
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn dragging_a_row_panes_right_edge_gives_it_width() {
|
||||
use ratatui::crossterm::event::{MouseButton, MouseEventKind};
|
||||
|
||||
let mut tui = furnished_tui();
|
||||
let _ = screen_of(&mut tui);
|
||||
let searches = tui.state.searches_pane_area.expect("laid out");
|
||||
let seam = tui
|
||||
.state
|
||||
.vsplit_dividers
|
||||
.iter()
|
||||
.find(|(pane, _)| *pane == FocusedPane::Searches)
|
||||
.map(|(_, rect)| *rect)
|
||||
.expect("a seam beside Searches");
|
||||
tui.state.focused_pane = FocusedPane::Downloads;
|
||||
|
||||
mouse_drag_row(
|
||||
&mut tui,
|
||||
(seam.x, searches.y + 1),
|
||||
(seam.x + 4, searches.y + 1),
|
||||
);
|
||||
assert_eq!(tui.state.layout.searches_width, Some(searches.width + 4));
|
||||
assert_eq!(tui.state.focused_pane, FocusedPane::Downloads);
|
||||
|
||||
// The widths are applied, and Info narrows to whatever is left.
|
||||
let _ = screen_of(&mut tui);
|
||||
assert_eq!(
|
||||
tui.state.searches_pane_area.expect("laid out").width,
|
||||
searches.width + 4
|
||||
);
|
||||
assert!(tui.state.info_pane_area.expect("laid out").width >= 3);
|
||||
|
||||
// Releasing the button ends the drag: later motions just move the
|
||||
// pointer.
|
||||
mouse(
|
||||
&mut tui,
|
||||
MouseEventKind::Drag(MouseButton::Left),
|
||||
seam.x + 40,
|
||||
searches.y + 1,
|
||||
);
|
||||
assert_eq!(tui.state.layout.searches_width, Some(searches.width + 4));
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn the_info_pane_describes_the_highlighted_result() {
|
||||
let mut tui = results_tui(3);
|
||||
tui.state.results_items[1].filename =
|
||||
"@@x\\Music\\Album\\Second Track.mp3".to_string();
|
||||
tui.state.results_items[1].bitrate = Some(320);
|
||||
tui.state.results_table_state.select(Some(1));
|
||||
|
||||
let screen = screen_of(&mut tui);
|
||||
assert!(screen.contains("@@x/Music/Album"), "{screen}");
|
||||
assert!(screen.contains("Bitrate"), "{screen}");
|
||||
|
||||
tui.state.focused_pane = FocusedPane::Downloads;
|
||||
let screen = screen_of(&mut tui);
|
||||
assert!(!screen.contains("@@x/Music/Album"), "{screen}");
|
||||
}
|
||||
@@ -0,0 +1,560 @@
|
||||
//! The window driven the way a terminal drives it: keys and mouse events in,
|
||||
//! a rendered screen out, over a stand-in session.
|
||||
//!
|
||||
//! This file is the harness the topic modules below share — the session
|
||||
//! double, the window constructors, and the press/screen helpers.
|
||||
|
||||
mod browse;
|
||||
mod layout;
|
||||
mod navigation;
|
||||
mod rooms;
|
||||
mod searches;
|
||||
mod session;
|
||||
mod settings;
|
||||
mod transfers;
|
||||
|
||||
use super::*;
|
||||
|
||||
use crate::daemon::proto::ChatMessageDto;
|
||||
|
||||
use crate::models::{FocusedPane, MessageDirection, RoomsView, SearchStatus};
|
||||
|
||||
use ratatui::crossterm::event::{KeyCode, KeyEvent, KeyModifiers};
|
||||
|
||||
/// A stand-in for a daemon: it already holds a conversation, a transfer
|
||||
/// queue, and a search cache, none of which this window created.
|
||||
#[derive(Default)]
|
||||
struct TalkativeSession {
|
||||
history: Vec<ChatMessageDto>,
|
||||
downloads: Vec<soulseek_rs::types::Download>,
|
||||
searches: std::sync::Mutex<Vec<crate::api::SessionSearch>>,
|
||||
/// What `try_get_search_results` hands back to the window.
|
||||
results: std::sync::Mutex<Vec<soulseek_rs::SearchResult>>,
|
||||
/// Every query a window put on the wire, in order.
|
||||
searched: std::sync::Mutex<Vec<String>>,
|
||||
/// How many times a window asked for the search list.
|
||||
all_searches_calls: std::sync::atomic::AtomicUsize,
|
||||
/// How many times a window pulled a full result set across. Against a
|
||||
/// daemon each pull is the whole set over the socket, so the tests
|
||||
/// count them.
|
||||
result_fetches: std::sync::atomic::AtomicUsize,
|
||||
/// Whether this session is a daemon's. Local sessions do not sync.
|
||||
shared: bool,
|
||||
/// What `set_download_directory` was last asked for, if anything.
|
||||
download_dir_set: std::sync::Mutex<Option<String>>,
|
||||
/// What `set_shared_directories` was last asked for, if anything.
|
||||
shares_set: std::sync::Mutex<Option<Vec<String>>>,
|
||||
/// What `change_password` was last asked for, if anything.
|
||||
password_set: std::sync::Mutex<Option<String>>,
|
||||
/// The share index this session serves to peers.
|
||||
listing: std::sync::Mutex<Vec<soulseek_rs::SharedDirectory>>,
|
||||
download_cancelled: std::sync::Mutex<Vec<(String, String)>>,
|
||||
upload_cancelled: std::sync::Mutex<Vec<(String, String)>>,
|
||||
download_removed: std::sync::Mutex<Vec<(String, String)>>,
|
||||
}
|
||||
|
||||
fn queued(username: &str, filename: &str) -> soulseek_rs::types::Download {
|
||||
at_status(username, filename, soulseek_rs::DownloadStatus::Queued)
|
||||
}
|
||||
|
||||
fn completed(username: &str, filename: &str) -> soulseek_rs::types::Download {
|
||||
at_status(username, filename, soulseek_rs::DownloadStatus::Completed)
|
||||
}
|
||||
|
||||
fn uploading(username: &str, filename: &str) -> soulseek_rs::types::UploadInfo {
|
||||
soulseek_rs::types::UploadInfo {
|
||||
username: username.to_string(),
|
||||
filename: filename.to_string(),
|
||||
size: 10,
|
||||
bytes_sent: 1,
|
||||
speed_bytes_per_sec: 1.0,
|
||||
status: soulseek_rs::types::UploadStatus::InProgress,
|
||||
}
|
||||
}
|
||||
|
||||
fn at_status(
|
||||
username: &str,
|
||||
filename: &str,
|
||||
status: soulseek_rs::DownloadStatus,
|
||||
) -> soulseek_rs::types::Download {
|
||||
let (sender, _) = std::sync::mpsc::channel();
|
||||
soulseek_rs::types::Download {
|
||||
username: username.to_string(),
|
||||
filename: filename.to_string(),
|
||||
token: 1,
|
||||
size: 4096,
|
||||
download_directory: "/tmp".to_string(),
|
||||
status,
|
||||
sender,
|
||||
queue_position: None,
|
||||
metadata: soulseek_rs::types::DownloadMetadata::default(),
|
||||
}
|
||||
}
|
||||
|
||||
fn key(ch: char) -> KeyEvent {
|
||||
KeyEvent::new(KeyCode::Char(ch), KeyModifiers::NONE)
|
||||
}
|
||||
|
||||
impl SessionApi for TalkativeSession {
|
||||
fn message_history(&self) -> Vec<ChatMessageDto> {
|
||||
self.history.clone()
|
||||
}
|
||||
fn daemon_endpoint(&self) -> Option<String> {
|
||||
self.shared.then(|| "test-daemon".to_string())
|
||||
}
|
||||
fn username(&self) -> String {
|
||||
"tester".to_string()
|
||||
}
|
||||
fn listen_port(&self) -> Option<u16> {
|
||||
None
|
||||
}
|
||||
fn session_loss(&self) -> Option<soulseek_rs::SessionLoss> {
|
||||
None
|
||||
}
|
||||
fn search_with_cancel(
|
||||
&self,
|
||||
query: &str,
|
||||
_timeout: Duration,
|
||||
_cancel: Option<Arc<std::sync::atomic::AtomicBool>>,
|
||||
) -> soulseek_rs::Result<Vec<soulseek_rs::SearchResult>> {
|
||||
self.searched
|
||||
.lock()
|
||||
.expect("not poisoned")
|
||||
.push(query.to_string());
|
||||
Ok(Vec::new())
|
||||
}
|
||||
fn get_search_results(&self, _key: &str) -> Vec<soulseek_rs::SearchResult> {
|
||||
Vec::new()
|
||||
}
|
||||
fn all_searches(&self) -> Vec<crate::api::SessionSearch> {
|
||||
self.all_searches_calls
|
||||
.fetch_add(1, std::sync::atomic::Ordering::Relaxed);
|
||||
self.searches.lock().expect("not poisoned").clone()
|
||||
}
|
||||
fn forget_search(&self, query: &str) -> bool {
|
||||
let mut searches = self.searches.lock().expect("not poisoned");
|
||||
let before = searches.len();
|
||||
searches.retain(|search| search.query != query);
|
||||
searches.len() != before
|
||||
}
|
||||
fn get_search_results_count(&self, _key: &str) -> usize {
|
||||
0
|
||||
}
|
||||
fn try_get_search_results(
|
||||
&self,
|
||||
_key: &str,
|
||||
) -> Option<Vec<soulseek_rs::SearchResult>> {
|
||||
self.result_fetches
|
||||
.fetch_add(1, std::sync::atomic::Ordering::Relaxed);
|
||||
Some(self.results.lock().expect("not poisoned").clone())
|
||||
}
|
||||
fn start_wishlist_search(&self, _query: &str) -> soulseek_rs::Result<()> {
|
||||
Ok(())
|
||||
}
|
||||
fn wishlist_interval(&self) -> Duration {
|
||||
Duration::from_mins(12)
|
||||
}
|
||||
fn download(
|
||||
&self,
|
||||
_filename: String,
|
||||
_username: String,
|
||||
_size: u64,
|
||||
_directory: String,
|
||||
) -> soulseek_rs::Result<(
|
||||
soulseek_rs::types::Download,
|
||||
std::sync::mpsc::Receiver<soulseek_rs::DownloadStatus>,
|
||||
)> {
|
||||
Err(soulseek_rs::SoulseekRs::NotConnected)
|
||||
}
|
||||
fn download_with_metadata(
|
||||
&self,
|
||||
_filename: String,
|
||||
_username: String,
|
||||
_size: u64,
|
||||
_directory: String,
|
||||
_metadata: soulseek_rs::types::DownloadMetadata,
|
||||
) -> soulseek_rs::Result<(
|
||||
soulseek_rs::types::Download,
|
||||
std::sync::mpsc::Receiver<soulseek_rs::DownloadStatus>,
|
||||
)> {
|
||||
Err(soulseek_rs::SoulseekRs::NotConnected)
|
||||
}
|
||||
fn get_all_downloads(&self) -> Vec<soulseek_rs::types::Download> {
|
||||
self.downloads.clone()
|
||||
}
|
||||
fn pause_download(&self, _u: &str, _f: &str) -> bool {
|
||||
false
|
||||
}
|
||||
fn resume_download(&self, _u: &str, _f: &str) -> bool {
|
||||
false
|
||||
}
|
||||
fn remove_queued_download(&self, _u: &str, _f: &str) -> bool {
|
||||
false
|
||||
}
|
||||
fn remove_download(&self, u: &str, f: &str) -> bool {
|
||||
self.download_removed
|
||||
.lock()
|
||||
.expect("not poisoned")
|
||||
.push((u.to_string(), f.to_string()));
|
||||
true
|
||||
}
|
||||
fn uploads(&self) -> Vec<soulseek_rs::UploadInfo> {
|
||||
Vec::new()
|
||||
}
|
||||
fn take_upload_events(&self) -> Vec<soulseek_rs::UploadInfo> {
|
||||
Vec::new()
|
||||
}
|
||||
fn cancel_upload(&self, u: &str, f: &str) -> bool {
|
||||
self.upload_cancelled
|
||||
.lock()
|
||||
.expect("not poisoned")
|
||||
.push((u.to_string(), f.to_string()));
|
||||
true
|
||||
}
|
||||
fn cancel_download(&self, u: &str, f: &str) -> bool {
|
||||
self.download_cancelled
|
||||
.lock()
|
||||
.expect("not poisoned")
|
||||
.push((u.to_string(), f.to_string()));
|
||||
true
|
||||
}
|
||||
fn set_upload_slots(&self, _slots: usize) {}
|
||||
fn check_privileges(&self) -> soulseek_rs::Result<()> {
|
||||
Ok(())
|
||||
}
|
||||
fn own_privilege_seconds(&self) -> Option<u32> {
|
||||
None
|
||||
}
|
||||
fn request_room_list(&self) -> soulseek_rs::Result<()> {
|
||||
Ok(())
|
||||
}
|
||||
fn join_room(&self, _room: &str) -> soulseek_rs::Result<()> {
|
||||
Ok(())
|
||||
}
|
||||
fn leave_room(&self, _room: &str) -> soulseek_rs::Result<()> {
|
||||
Ok(())
|
||||
}
|
||||
fn say_in_room(
|
||||
&self,
|
||||
_room: &str,
|
||||
_message: &str,
|
||||
) -> soulseek_rs::Result<()> {
|
||||
Ok(())
|
||||
}
|
||||
fn room_members(&self, _room: &str) -> Vec<String> {
|
||||
Vec::new()
|
||||
}
|
||||
fn room_member_stats(
|
||||
&self,
|
||||
_room: &str,
|
||||
) -> Vec<soulseek_rs::types::RoomUserStats> {
|
||||
Vec::new()
|
||||
}
|
||||
fn take_room_events(&self) -> Vec<soulseek_rs::RoomEvent> {
|
||||
Vec::new()
|
||||
}
|
||||
fn send_private_message(
|
||||
&self,
|
||||
_u: &str,
|
||||
_m: &str,
|
||||
) -> soulseek_rs::Result<()> {
|
||||
Ok(())
|
||||
}
|
||||
fn take_private_messages(&self) -> Vec<soulseek_rs::UserMessage> {
|
||||
Vec::new()
|
||||
}
|
||||
fn browse_user(&self, _username: &str) -> soulseek_rs::Result<()> {
|
||||
Ok(())
|
||||
}
|
||||
fn take_browse_result(
|
||||
&self,
|
||||
_username: &str,
|
||||
) -> Option<Vec<soulseek_rs::SharedDirectory>> {
|
||||
None
|
||||
}
|
||||
fn request_user_info(&self, _username: &str) -> soulseek_rs::Result<()> {
|
||||
Ok(())
|
||||
}
|
||||
fn watch_user(&self, _username: &str) -> soulseek_rs::Result<()> {
|
||||
Ok(())
|
||||
}
|
||||
fn unwatch_user(&self, _username: &str) -> soulseek_rs::Result<()> {
|
||||
Ok(())
|
||||
}
|
||||
fn watched_users(&self) -> Vec<String> {
|
||||
Vec::new()
|
||||
}
|
||||
fn user_info(&self, _username: &str) -> Option<soulseek_rs::UserInfo> {
|
||||
None
|
||||
}
|
||||
fn shared_counts(&self) -> (u32, u32) {
|
||||
(3, 12)
|
||||
}
|
||||
fn change_password(&self, password: &str) -> soulseek_rs::Result<()> {
|
||||
*self.password_set.lock().expect("not poisoned") =
|
||||
Some(password.to_string());
|
||||
Ok(())
|
||||
}
|
||||
fn shared_listing(&self) -> Vec<soulseek_rs::SharedDirectory> {
|
||||
self.listing.lock().expect("not poisoned").clone()
|
||||
}
|
||||
fn shared_directories(&self) -> Vec<String> {
|
||||
Vec::new()
|
||||
}
|
||||
fn set_shared_directories(
|
||||
&self,
|
||||
directories: Vec<String>,
|
||||
) -> soulseek_rs::Result<()> {
|
||||
*self.shares_set.lock().expect("not poisoned") = Some(directories);
|
||||
Ok(())
|
||||
}
|
||||
fn set_download_directory(
|
||||
&self,
|
||||
directory: String,
|
||||
) -> soulseek_rs::Result<()> {
|
||||
*self.download_dir_set.lock().expect("not poisoned") = Some(directory);
|
||||
Ok(())
|
||||
}
|
||||
}
|
||||
|
||||
fn tui(history: Vec<ChatMessageDto>) -> MainTui {
|
||||
with_session(TalkativeSession {
|
||||
history,
|
||||
shared: true,
|
||||
..TalkativeSession::default()
|
||||
})
|
||||
}
|
||||
|
||||
fn shared(searches: Vec<crate::api::SessionSearch>) -> TalkativeSession {
|
||||
TalkativeSession {
|
||||
searches: std::sync::Mutex::new(searches),
|
||||
shared: true,
|
||||
..TalkativeSession::default()
|
||||
}
|
||||
}
|
||||
|
||||
fn search_of(query: &str, files: usize, age: u64) -> crate::api::SessionSearch {
|
||||
crate::api::SessionSearch {
|
||||
query: query.to_string(),
|
||||
files,
|
||||
started_secs_ago: Some(age),
|
||||
}
|
||||
}
|
||||
|
||||
fn with_session(session: TalkativeSession) -> MainTui {
|
||||
attach(Arc::new(session))
|
||||
}
|
||||
|
||||
fn attach(session: Arc<TalkativeSession>) -> MainTui {
|
||||
MainTui::new(
|
||||
session,
|
||||
"/tmp".to_string(),
|
||||
Duration::from_secs(1),
|
||||
None,
|
||||
None,
|
||||
)
|
||||
}
|
||||
|
||||
fn files_from_bob(names: &[&str]) -> soulseek_rs::SearchResult {
|
||||
soulseek_rs::SearchResult {
|
||||
token: 0,
|
||||
files: names
|
||||
.iter()
|
||||
.map(|name| soulseek_rs::types::File {
|
||||
username: "bob".to_string(),
|
||||
name: (*name).to_string(),
|
||||
size: 42,
|
||||
attribs: std::collections::HashMap::new(),
|
||||
})
|
||||
.collect(),
|
||||
slots: 1,
|
||||
speed: 0,
|
||||
username: "bob".to_string(),
|
||||
}
|
||||
}
|
||||
|
||||
/// An attached window that selected a two-file search and has already
|
||||
/// ticked past its one necessary fetch.
|
||||
fn window_that_pulled_two_files() -> (Arc<TalkativeSession>, MainTui) {
|
||||
let session = Arc::new(TalkativeSession {
|
||||
results: std::sync::Mutex::new(vec![files_from_bob(&[
|
||||
"@@x\\a.mp3",
|
||||
"@@x\\b.mp3",
|
||||
])]),
|
||||
..shared(vec![search_of("aphex twin", 2, 9_999)])
|
||||
});
|
||||
let mut tui = attach(session.clone());
|
||||
tui.state.selected_search_index = Some(0);
|
||||
tui.update_search_results();
|
||||
tui.update_search_results();
|
||||
(session, tui)
|
||||
}
|
||||
|
||||
fn results(n: usize) -> Vec<crate::models::FileDisplayData> {
|
||||
(0..n)
|
||||
.map(|i| crate::models::FileDisplayData {
|
||||
filename: format!("@@x\\Music\\{i:02}.mp3"),
|
||||
username: "bob".to_string(),
|
||||
..Default::default()
|
||||
})
|
||||
.collect()
|
||||
}
|
||||
|
||||
fn results_tui(n: usize) -> MainTui {
|
||||
let mut tui = with_session(TalkativeSession::default());
|
||||
tui.state.results_items = results(n);
|
||||
tui.state.focused_pane = FocusedPane::Results;
|
||||
// 88 cells wide gives the name column 11 cells and the folder 7.
|
||||
tui.state.results_pane_area =
|
||||
Some(ratatui::layout::Rect::new(0, 0, 88, 13));
|
||||
tui
|
||||
}
|
||||
|
||||
fn press(tui: &mut MainTui, code: KeyCode) {
|
||||
tui.handle_key_event(KeyEvent::new(code, KeyModifiers::NONE));
|
||||
}
|
||||
|
||||
fn ctrl(tui: &mut MainTui, ch: char) {
|
||||
tui.handle_key_event(KeyEvent::new(
|
||||
KeyCode::Char(ch),
|
||||
KeyModifiers::CONTROL,
|
||||
));
|
||||
}
|
||||
|
||||
fn selected(tui: &MainTui) -> Option<usize> {
|
||||
tui.state.results_table_state.selected()
|
||||
}
|
||||
|
||||
fn screen_sized(tui: &mut MainTui, width: u16, height: u16) -> String {
|
||||
let backend = ratatui::backend::TestBackend::new(width, height);
|
||||
let mut terminal = ratatui::Terminal::new(backend).expect("backend");
|
||||
terminal.draw(|frame| tui.render(frame)).expect("draw");
|
||||
terminal.backend().to_string()
|
||||
}
|
||||
|
||||
fn screen_of(tui: &mut MainTui) -> String {
|
||||
screen_sized(tui, 160, 40)
|
||||
}
|
||||
|
||||
fn mouse(
|
||||
tui: &mut MainTui,
|
||||
kind: ratatui::crossterm::event::MouseEventKind,
|
||||
column: u16,
|
||||
row: u16,
|
||||
) {
|
||||
tui.handle_mouse_event(ratatui::crossterm::event::MouseEvent {
|
||||
kind,
|
||||
column,
|
||||
row,
|
||||
modifiers: KeyModifiers::NONE,
|
||||
});
|
||||
}
|
||||
|
||||
fn mouse_drag_row(tui: &mut MainTui, from: (u16, u16), to: (u16, u16)) {
|
||||
use ratatui::crossterm::event::{MouseButton, MouseEventKind};
|
||||
mouse(tui, MouseEventKind::Down(MouseButton::Left), from.0, from.1);
|
||||
mouse(tui, MouseEventKind::Drag(MouseButton::Left), to.0, to.1);
|
||||
mouse(tui, MouseEventKind::Up(MouseButton::Left), to.0, to.1);
|
||||
}
|
||||
|
||||
/// The screen row carrying a pane's legend, `[2] Results` say, without
|
||||
/// the quotes the test backend wraps each row in.
|
||||
fn row_with<'a>(screen: &'a str, needle: &str) -> &'a str {
|
||||
let line = screen
|
||||
.lines()
|
||||
.find(|line| line.contains(needle))
|
||||
.unwrap_or_else(|| panic!("no row with {needle:?} in\n{screen}"));
|
||||
let start = line.find('"').map_or(0, |i| i + 1);
|
||||
let end = line.rfind('"').unwrap_or(line.len());
|
||||
&line[start..end]
|
||||
}
|
||||
|
||||
/// A window with a search, its results, and a transfer, so every pane
|
||||
/// has something to show.
|
||||
fn furnished_tui() -> MainTui {
|
||||
let mut tui = results_tui(3);
|
||||
tui.state.searches.push(crate::models::SearchEntry {
|
||||
query: "aphex twin".to_string(),
|
||||
status: SearchStatus::Completed,
|
||||
results: results(3),
|
||||
known_files: 3,
|
||||
owned: true,
|
||||
start_time: std::time::Instant::now(),
|
||||
cancel_flag: Arc::new(std::sync::atomic::AtomicBool::new(false)),
|
||||
});
|
||||
tui.state.selected_search_index = Some(0);
|
||||
tui.state.downloads.push(crate::models::DownloadEntry {
|
||||
download: queued("bob", "@@x\\Music\\00.mp3"),
|
||||
receiver: None,
|
||||
});
|
||||
tui
|
||||
}
|
||||
|
||||
fn browsed(tui: &mut MainTui, files: usize) {
|
||||
tui.state.browse.open("bob");
|
||||
let listing = vec![soulseek_rs::SharedDirectory {
|
||||
name: "Music".to_string(),
|
||||
files: (0..files)
|
||||
.map(|i| soulseek_rs::SharedFileEntry {
|
||||
name: format!("{i:02}.mp3"),
|
||||
size: 1,
|
||||
attributes: Vec::new(),
|
||||
})
|
||||
.collect(),
|
||||
}];
|
||||
tui.state
|
||||
.browse
|
||||
.active_tab_mut()
|
||||
.expect("tab")
|
||||
.load(&listing);
|
||||
tui.state.show_browse = true;
|
||||
let _ = screen_of(tui);
|
||||
}
|
||||
|
||||
fn in_a_room(tui: &mut MainTui, messages: usize) {
|
||||
tui.state.rooms.apply_event(
|
||||
soulseek_rs::RoomEvent::Joined {
|
||||
room: "jazz".to_string(),
|
||||
users: (0..30).map(|i| format!("user{i:02}")).collect(),
|
||||
},
|
||||
None,
|
||||
);
|
||||
tui.state.rooms.focus_or_open("jazz");
|
||||
for i in 0..messages {
|
||||
tui.state.rooms.apply_event(
|
||||
soulseek_rs::RoomEvent::Message {
|
||||
room: "jazz".to_string(),
|
||||
username: "alice".to_string(),
|
||||
message: format!("line {i:03}"),
|
||||
},
|
||||
Some("jazz"),
|
||||
);
|
||||
}
|
||||
tui.state.show_rooms = true;
|
||||
let _ = screen_of(tui);
|
||||
}
|
||||
|
||||
/// The queries the window has sent so far, once at least `count` of them
|
||||
/// are out: a search goes to the session from a worker thread, so a test
|
||||
/// has to give it a moment.
|
||||
fn searched(session: &TalkativeSession, count: usize) -> Vec<String> {
|
||||
let deadline = std::time::Instant::now() + Duration::from_secs(5);
|
||||
loop {
|
||||
let seen = session.searched.lock().expect("not poisoned").clone();
|
||||
if seen.len() >= count || std::time::Instant::now() > deadline {
|
||||
return seen;
|
||||
}
|
||||
std::thread::sleep(Duration::from_millis(10));
|
||||
}
|
||||
}
|
||||
|
||||
/// A window over last session's search list: the queries came back from
|
||||
/// disk, with nothing under them.
|
||||
fn restored(session: Arc<TalkativeSession>, queries: &[&str]) -> MainTui {
|
||||
let mut tui = attach(session);
|
||||
let queries: Vec<String> =
|
||||
queries.iter().map(ToString::to_string).collect();
|
||||
restore_searches(&mut tui.state, &queries);
|
||||
tui.state.focused_pane = FocusedPane::Searches;
|
||||
tui
|
||||
}
|
||||
@@ -0,0 +1,236 @@
|
||||
//! Moving through a list: rows, pages, and the sideways scroll that
|
||||
//! walks a name too long for its column.
|
||||
|
||||
use super::*;
|
||||
|
||||
#[test]
|
||||
fn end_and_home_jump_to_the_last_and_first_result() {
|
||||
let mut tui = results_tui(30);
|
||||
press(&mut tui, KeyCode::End);
|
||||
assert_eq!(selected(&tui), Some(29));
|
||||
press(&mut tui, KeyCode::Home);
|
||||
assert_eq!(selected(&tui), Some(0));
|
||||
press(&mut tui, KeyCode::Char('G'));
|
||||
assert_eq!(selected(&tui), Some(29));
|
||||
press(&mut tui, KeyCode::Char('g'));
|
||||
assert_eq!(selected(&tui), Some(0));
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn page_keys_move_a_pane_of_rows_and_stop_at_the_edges() {
|
||||
let mut tui = results_tui(30);
|
||||
press(&mut tui, KeyCode::PageDown);
|
||||
assert_eq!(selected(&tui), Some(10));
|
||||
ctrl(&mut tui, 'f');
|
||||
assert_eq!(selected(&tui), Some(20));
|
||||
press(&mut tui, KeyCode::PageDown);
|
||||
assert_eq!(selected(&tui), Some(29), "clamps instead of wrapping");
|
||||
press(&mut tui, KeyCode::PageUp);
|
||||
assert_eq!(selected(&tui), Some(19));
|
||||
ctrl(&mut tui, 'b');
|
||||
assert_eq!(selected(&tui), Some(9));
|
||||
press(&mut tui, KeyCode::PageUp);
|
||||
assert_eq!(selected(&tui), Some(0));
|
||||
assert!(
|
||||
!tui.state.show_browse && !tui.state.command_bar_active,
|
||||
"ctrl-b pages up instead of opening browse"
|
||||
);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn ctrl_d_and_ctrl_u_move_half_a_pane() {
|
||||
let mut tui = results_tui(30);
|
||||
ctrl(&mut tui, 'd');
|
||||
assert_eq!(selected(&tui), Some(5));
|
||||
ctrl(&mut tui, 'u');
|
||||
assert_eq!(selected(&tui), Some(0));
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn navigation_keys_do_nothing_without_results() {
|
||||
let mut tui = results_tui(0);
|
||||
tui.state.results_table_state.select(None);
|
||||
press(&mut tui, KeyCode::End);
|
||||
press(&mut tui, KeyCode::PageDown);
|
||||
ctrl(&mut tui, 'd');
|
||||
assert_eq!(selected(&tui), None);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn l_and_h_scroll_the_highlighted_name_up_to_its_end() {
|
||||
let mut tui = results_tui(3);
|
||||
tui.state.results_items[1].filename = "x".repeat(40);
|
||||
tui.state.results_table_state.select(Some(1));
|
||||
press(&mut tui, KeyCode::Char('l'));
|
||||
assert_eq!(tui.state.results_name_offset, 8);
|
||||
press(&mut tui, KeyCode::Right);
|
||||
assert_eq!(tui.state.results_name_offset, 16);
|
||||
press(&mut tui, KeyCode::Char('$'));
|
||||
assert_eq!(tui.state.results_name_offset, 30);
|
||||
press(&mut tui, KeyCode::Char('l'));
|
||||
assert_eq!(tui.state.results_name_offset, 30, "stops at the end");
|
||||
press(&mut tui, KeyCode::Char('h'));
|
||||
assert_eq!(tui.state.results_name_offset, 22);
|
||||
press(&mut tui, KeyCode::Left);
|
||||
assert_eq!(tui.state.results_name_offset, 14);
|
||||
press(&mut tui, KeyCode::Char('0'));
|
||||
assert_eq!(tui.state.results_name_offset, 0);
|
||||
press(&mut tui, KeyCode::Char('h'));
|
||||
assert_eq!(tui.state.results_name_offset, 0);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn scrolling_follows_the_highlighted_row_not_the_longest_one() {
|
||||
let mut tui = results_tui(3);
|
||||
tui.state.results_items[0].filename = "short.mp3".to_string();
|
||||
tui.state.results_items[1].filename = "x".repeat(40);
|
||||
tui.state.results_items[2].filename = "short.mp3".to_string();
|
||||
press(&mut tui, KeyCode::Char('$'));
|
||||
assert_eq!(tui.state.results_name_offset, 0, "row 0 fits already");
|
||||
tui.state.results_table_state.select(Some(1));
|
||||
press(&mut tui, KeyCode::Char('$'));
|
||||
assert_eq!(tui.state.results_name_offset, 30);
|
||||
tui.state.results_table_state.select(Some(2));
|
||||
press(&mut tui, KeyCode::Char('h'));
|
||||
assert_eq!(
|
||||
tui.state.results_name_offset, 0,
|
||||
"a step left lands within the row now highlighted"
|
||||
);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn picking_another_search_starts_its_results_unscrolled() {
|
||||
let mut tui = results_tui(3);
|
||||
tui.state.results_items[1].filename = "x".repeat(40);
|
||||
tui.state.results_table_state.select(Some(1));
|
||||
press(&mut tui, KeyCode::Char('$'));
|
||||
assert_eq!(tui.state.results_name_offset, 30);
|
||||
|
||||
tui.state.searches.push(crate::models::SearchEntry {
|
||||
query: "other".to_string(),
|
||||
status: SearchStatus::Active,
|
||||
results: results(2),
|
||||
known_files: 2,
|
||||
owned: true,
|
||||
start_time: std::time::Instant::now(),
|
||||
cancel_flag: Arc::new(std::sync::atomic::AtomicBool::new(false)),
|
||||
});
|
||||
tui.state.searches_table_state.select(Some(0));
|
||||
tui.state.focused_pane = FocusedPane::Searches;
|
||||
press(&mut tui, KeyCode::Enter);
|
||||
assert_eq!(tui.state.results_name_offset, 0);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn ctrl_keys_are_ignored_outside_the_results_pane() {
|
||||
let mut tui = results_tui(3);
|
||||
tui.state.searches.push(crate::models::SearchEntry {
|
||||
query: "keep me".to_string(),
|
||||
status: SearchStatus::Active,
|
||||
results: Vec::new(),
|
||||
known_files: 0,
|
||||
owned: true,
|
||||
start_time: std::time::Instant::now(),
|
||||
cancel_flag: Arc::new(std::sync::atomic::AtomicBool::new(false)),
|
||||
});
|
||||
tui.state.searches_table_state.select(Some(0));
|
||||
tui.state.focused_pane = FocusedPane::Searches;
|
||||
ctrl(&mut tui, 'd');
|
||||
assert_eq!(tui.state.searches.len(), 1, "ctrl-d is not d");
|
||||
ctrl(&mut tui, 'b');
|
||||
assert!(!tui.state.command_bar_active, "ctrl-b is not b");
|
||||
ctrl(&mut tui, 'q');
|
||||
assert!(tui.state.exit.is_none(), "ctrl-q is not q");
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn ctrl_keys_page_while_a_filter_is_being_typed() {
|
||||
let mut tui = results_tui(30);
|
||||
press(&mut tui, KeyCode::Char('/'));
|
||||
press(&mut tui, KeyCode::Char('m'));
|
||||
ctrl(&mut tui, 'd');
|
||||
assert_eq!(selected(&tui), Some(5));
|
||||
assert_eq!(tui.state.results_filter_query, "m", "no d appended");
|
||||
press(&mut tui, KeyCode::End);
|
||||
assert_eq!(selected(&tui), Some(29));
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn space_after_a_filter_that_matches_nothing_does_not_panic() {
|
||||
let mut tui = results_tui(3);
|
||||
press(&mut tui, KeyCode::Char('/'));
|
||||
press(&mut tui, KeyCode::Char('z'));
|
||||
press(&mut tui, KeyCode::Enter);
|
||||
assert!(tui.state.results_filtered_items.is_empty());
|
||||
press(&mut tui, KeyCode::Char(' '));
|
||||
assert!(tui.state.results_selected_indices.is_empty());
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn l_and_h_scroll_a_transfer_name_and_a_query_too() {
|
||||
let mut tui = furnished_tui();
|
||||
tui.state.downloads[0].download.filename = "y".repeat(120);
|
||||
tui.state.searches[0].query = "z".repeat(60);
|
||||
let _ = screen_of(&mut tui);
|
||||
|
||||
tui.state.focused_pane = FocusedPane::Downloads;
|
||||
press(&mut tui, KeyCode::Char('l'));
|
||||
assert_eq!(tui.state.downloads_name_offset, 8);
|
||||
press(&mut tui, KeyCode::Char('$'));
|
||||
let end = tui.state.downloads_name_offset;
|
||||
assert!(end > 8, "the end is past a step: {end}");
|
||||
let screen = screen_of(&mut tui);
|
||||
assert!(row_with(&screen, "…yyyy").contains("…yyyy"), "{screen}");
|
||||
press(&mut tui, KeyCode::Char('0'));
|
||||
assert_eq!(tui.state.downloads_name_offset, 0);
|
||||
|
||||
tui.state.focused_pane = FocusedPane::Searches;
|
||||
press(&mut tui, KeyCode::Right);
|
||||
assert_eq!(tui.state.searches_query_offset, 8);
|
||||
press(&mut tui, KeyCode::End);
|
||||
assert_eq!(
|
||||
tui.state.searches_table_state.selected(),
|
||||
Some(0),
|
||||
"End is still a row key, $ is the name key"
|
||||
);
|
||||
press(&mut tui, KeyCode::Char('$'));
|
||||
assert!(tui.state.searches_query_offset > 8);
|
||||
let screen = screen_of(&mut tui);
|
||||
assert!(screen.contains("…zzzz"), "{screen}");
|
||||
assert!(
|
||||
tui.state.results_name_offset == 0,
|
||||
"each list scrolls on its own"
|
||||
);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn page_keys_work_in_the_transfers_and_searches_lists_too() {
|
||||
let mut tui = furnished_tui();
|
||||
for i in 0..30 {
|
||||
tui.state.downloads.push(crate::models::DownloadEntry {
|
||||
download: queued("bob", &format!("{i}.mp3")),
|
||||
receiver: None,
|
||||
});
|
||||
}
|
||||
tui.state.focused_pane = FocusedPane::Downloads;
|
||||
tui.state.downloads_table_state.select(Some(0));
|
||||
let _ = screen_of(&mut tui); // lays the panes out, which sets the page size
|
||||
|
||||
press(&mut tui, KeyCode::End);
|
||||
assert_eq!(tui.state.downloads_table_state.selected(), Some(30));
|
||||
press(&mut tui, KeyCode::Home);
|
||||
assert_eq!(tui.state.downloads_table_state.selected(), Some(0));
|
||||
press(&mut tui, KeyCode::PageDown);
|
||||
let page = tui.state.downloads_table_state.selected().expect("row");
|
||||
assert!(page > 1 && page < 30, "a pane of rows, not one: {page}");
|
||||
ctrl(&mut tui, 'd');
|
||||
assert_eq!(tui.state.downloads.len(), 31, "ctrl-d pages, d deletes");
|
||||
assert!(tui.state.downloads_table_state.selected() > Some(page));
|
||||
|
||||
tui.state.focused_pane = FocusedPane::Searches;
|
||||
press(&mut tui, KeyCode::Char('G'));
|
||||
assert_eq!(tui.state.searches_table_state.selected(), Some(0));
|
||||
press(&mut tui, KeyCode::Char('g'));
|
||||
assert_eq!(tui.state.searches_table_state.selected(), Some(0));
|
||||
assert_eq!(tui.state.searches.len(), 1, "g and G only move");
|
||||
}
|
||||
@@ -0,0 +1,164 @@
|
||||
//! Rooms and conversations: their logs, their lists, and their filters.
|
||||
|
||||
use super::*;
|
||||
|
||||
#[test]
|
||||
fn slash_and_u_filter_a_rooms_log_and_its_members() {
|
||||
let mut tui = attach(Arc::new(TalkativeSession::default()));
|
||||
in_a_room(&mut tui, 30);
|
||||
press(&mut tui, KeyCode::Char('u'));
|
||||
for c in "user2".chars() {
|
||||
press(&mut tui, KeyCode::Char(c));
|
||||
}
|
||||
press(&mut tui, KeyCode::Enter);
|
||||
press(&mut tui, KeyCode::Char('j'));
|
||||
assert_eq!(
|
||||
tui.state.rooms.selected_user().as_deref(),
|
||||
Some("user21"),
|
||||
"j moves within the matching members"
|
||||
);
|
||||
let screen = screen_of(&mut tui);
|
||||
assert!(screen.contains("Users 10/30"), "{screen}");
|
||||
|
||||
press(&mut tui, KeyCode::Char('/'));
|
||||
for c in "line 01".chars() {
|
||||
press(&mut tui, KeyCode::Char(c));
|
||||
}
|
||||
let screen = screen_of(&mut tui);
|
||||
assert!(screen.contains("line 010"), "{screen}");
|
||||
assert!(!screen.contains("line 029"), "{screen}");
|
||||
assert!(screen.contains("filter: line 01_"), "{screen}");
|
||||
ctrl(&mut tui, 'u');
|
||||
assert_eq!(tui.state.rooms.log_filter, "line 01", "^u scrolls");
|
||||
press(&mut tui, KeyCode::Enter);
|
||||
press(&mut tui, KeyCode::Esc);
|
||||
assert!(tui.state.rooms.log_filter.is_empty());
|
||||
assert!(tui.state.rooms.user_filter.is_empty());
|
||||
assert_eq!(tui.state.rooms.view, RoomsView::Chat, "still in the room");
|
||||
press(&mut tui, KeyCode::Esc);
|
||||
assert_eq!(tui.state.rooms.view, RoomsView::List, "then the list");
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn slash_filters_the_open_conversation() {
|
||||
let mut tui = attach(Arc::new(TalkativeSession::default()));
|
||||
for text in ["hello there", "see you", "hello again"] {
|
||||
tui.state.messages.push(crate::models::ChatMessage {
|
||||
direction: MessageDirection::Incoming,
|
||||
peer: "bob".to_string(),
|
||||
text: text.to_string(),
|
||||
at: chrono::Local::now(),
|
||||
});
|
||||
}
|
||||
tui.state.chat_peer = Some("bob".to_string());
|
||||
tui.state.show_messages = true;
|
||||
press(&mut tui, KeyCode::Char('/'));
|
||||
for c in "hello".chars() {
|
||||
press(&mut tui, KeyCode::Char(c));
|
||||
}
|
||||
let screen = screen_of(&mut tui);
|
||||
assert!(screen.contains("hello again"), "{screen}");
|
||||
assert!(!screen.contains("see you"), "{screen}");
|
||||
press(&mut tui, KeyCode::Enter);
|
||||
press(&mut tui, KeyCode::Esc);
|
||||
assert!(tui.state.chat_filter.is_empty() && tui.state.show_messages);
|
||||
press(&mut tui, KeyCode::Esc);
|
||||
assert!(!tui.state.show_messages);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn page_up_scrolls_a_room_log_back_and_end_returns_to_the_newest() {
|
||||
let mut tui = with_session(TalkativeSession::default());
|
||||
in_a_room(&mut tui, 120);
|
||||
|
||||
let screen = screen_of(&mut tui);
|
||||
assert!(screen.contains("line 119"), "tails by default: {screen}");
|
||||
assert!(!screen.contains("line 000"), "{screen}");
|
||||
|
||||
press(&mut tui, KeyCode::PageUp);
|
||||
let screen = screen_of(&mut tui);
|
||||
assert!(!screen.contains("line 119"), "scrolled back: {screen}");
|
||||
|
||||
press(&mut tui, KeyCode::Home);
|
||||
let screen = screen_of(&mut tui);
|
||||
assert!(screen.contains("line 000"), "the oldest: {screen}");
|
||||
press(&mut tui, KeyCode::PageUp);
|
||||
let screen = screen_of(&mut tui);
|
||||
assert!(screen.contains("line 000"), "clamped at the top: {screen}");
|
||||
|
||||
press(&mut tui, KeyCode::End);
|
||||
let screen = screen_of(&mut tui);
|
||||
assert!(screen.contains("line 119"), "{screen}");
|
||||
|
||||
// The member list keeps its own keys, and ctrl-x is not x.
|
||||
press(&mut tui, KeyCode::Down);
|
||||
assert_eq!(tui.state.rooms.user_selected, 1);
|
||||
ctrl(&mut tui, 'x');
|
||||
assert_eq!(tui.state.rooms.open.len(), 1, "still in the room");
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn page_keys_move_through_the_room_list() {
|
||||
let mut tui = with_session(TalkativeSession::default());
|
||||
tui.state.rooms.apply_event(
|
||||
soulseek_rs::RoomEvent::List(
|
||||
(0..60)
|
||||
.map(|i| soulseek_rs::types::RoomInfo {
|
||||
name: format!("room{i:02}"),
|
||||
user_count: 60 - i,
|
||||
})
|
||||
.collect(),
|
||||
),
|
||||
None,
|
||||
);
|
||||
tui.state.show_rooms = true;
|
||||
let _ = screen_of(&mut tui);
|
||||
|
||||
press(&mut tui, KeyCode::End);
|
||||
assert_eq!(tui.state.rooms.list_selected, 59);
|
||||
press(&mut tui, KeyCode::PageUp);
|
||||
assert!(tui.state.rooms.list_selected < 59);
|
||||
press(&mut tui, KeyCode::Char('g'));
|
||||
assert_eq!(tui.state.rooms.list_selected, 0);
|
||||
ctrl(&mut tui, 'f');
|
||||
assert!(tui.state.rooms.list_selected > 1);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn page_up_scrolls_a_conversation_and_switching_chats_resets_it() {
|
||||
let mut tui = tui((0..80)
|
||||
.map(|i| ChatMessageDto {
|
||||
peer: "bob".into(),
|
||||
outgoing: i % 2 == 0,
|
||||
text: format!("msg {i:03}"),
|
||||
at: i,
|
||||
})
|
||||
.chain(std::iter::once(ChatMessageDto {
|
||||
peer: "carol".into(),
|
||||
outgoing: false,
|
||||
text: "hello".into(),
|
||||
at: 100,
|
||||
}))
|
||||
.collect());
|
||||
tui.state.chat_peer = Some("bob".to_string());
|
||||
tui.state.show_messages = true;
|
||||
let screen = screen_of(&mut tui);
|
||||
assert!(screen.contains("msg 079"), "{screen}");
|
||||
|
||||
press(&mut tui, KeyCode::PageUp);
|
||||
let screen = screen_of(&mut tui);
|
||||
assert!(!screen.contains("msg 079"), "scrolled back: {screen}");
|
||||
press(&mut tui, KeyCode::Char('g'));
|
||||
let screen = screen_of(&mut tui);
|
||||
assert!(screen.contains("msg 000"), "{screen}");
|
||||
|
||||
press(&mut tui, KeyCode::Tab);
|
||||
assert_eq!(tui.state.active_chat_peer(), Some("carol"));
|
||||
assert!(
|
||||
tui.state.chat_view.following(),
|
||||
"a fresh chat starts at its end"
|
||||
);
|
||||
press(&mut tui, KeyCode::BackTab);
|
||||
let screen = screen_of(&mut tui);
|
||||
assert!(screen.contains("msg 079"), "{screen}");
|
||||
}
|
||||
@@ -0,0 +1,89 @@
|
||||
//! Running a search the list already holds.
|
||||
|
||||
use super::*;
|
||||
|
||||
#[test]
|
||||
fn shift_s_runs_the_highlighted_search_again_in_its_place() {
|
||||
// The list survives a restart, but a query on it was only ever a
|
||||
// reminder: seeing what the network has now meant typing it again.
|
||||
let session = Arc::new(TalkativeSession::default());
|
||||
let mut tui =
|
||||
restored(session.clone(), &["boards of canada", "aphex twin"]);
|
||||
tui.state.searches_table_state.select(Some(1));
|
||||
|
||||
press(&mut tui, KeyCode::Char('S'));
|
||||
|
||||
assert_eq!(
|
||||
searched(&session, 1),
|
||||
vec!["aphex twin".to_string()],
|
||||
"the highlighted query went out again, untyped"
|
||||
);
|
||||
let queries: Vec<&str> = tui
|
||||
.state
|
||||
.searches
|
||||
.iter()
|
||||
.map(|s| s.query.as_str())
|
||||
.collect();
|
||||
assert_eq!(
|
||||
queries,
|
||||
["boards of canada", "aphex twin"],
|
||||
"it keeps its row: no duplicate, nothing moved"
|
||||
);
|
||||
assert_eq!(tui.state.searches[1].status, SearchStatus::Active);
|
||||
assert_eq!(tui.state.selected_search_index, Some(1));
|
||||
assert_eq!(
|
||||
tui.state.focused_pane,
|
||||
FocusedPane::Results,
|
||||
"and the window turns to where the results will land"
|
||||
);
|
||||
assert!(tui.state.results_items.is_empty());
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn shift_s_stops_a_run_still_collecting_before_starting_over() {
|
||||
let mut tui = furnished_tui();
|
||||
tui.state.searches[0].status = SearchStatus::Active;
|
||||
tui.state.searches[0].start_time = std::time::Instant::now()
|
||||
.checked_sub(Duration::from_secs(2))
|
||||
.expect("two seconds ago");
|
||||
let previous = tui.state.searches[0].cancel_flag.clone();
|
||||
tui.state.focused_pane = FocusedPane::Searches;
|
||||
tui.state.searches_table_state.select(Some(0));
|
||||
|
||||
press(&mut tui, KeyCode::Char('S'));
|
||||
|
||||
assert!(
|
||||
previous.load(std::sync::atomic::Ordering::Relaxed),
|
||||
"the worker that was collecting is told to stop"
|
||||
);
|
||||
let fresh = &tui.state.searches[0];
|
||||
assert!(!fresh.cancel_flag.load(std::sync::atomic::Ordering::Relaxed));
|
||||
assert!(fresh.results.is_empty(), "stale rows do not linger");
|
||||
assert_eq!(tui.state.searches.len(), 1);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn shift_s_is_only_a_key_over_the_searches_list() {
|
||||
let session = Arc::new(TalkativeSession::default());
|
||||
let mut tui = restored(session.clone(), &["aphex twin"]);
|
||||
|
||||
// Over Results the same key means nothing, so a stray shift does not
|
||||
// throw a finished search away.
|
||||
tui.state.focused_pane = FocusedPane::Results;
|
||||
press(&mut tui, KeyCode::Char('S'));
|
||||
assert_eq!(tui.state.searches[0].status, SearchStatus::Completed);
|
||||
std::thread::sleep(Duration::from_millis(50));
|
||||
assert!(searched(&session, 0).is_empty(), "nothing went out");
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn a_held_shift_s_is_one_search_not_one_per_repeat() {
|
||||
let session = Arc::new(TalkativeSession::default());
|
||||
let mut tui = restored(session.clone(), &["aphex twin"]);
|
||||
press(&mut tui, KeyCode::Char('S'));
|
||||
press(&mut tui, KeyCode::Char('1'));
|
||||
press(&mut tui, KeyCode::Char('S'));
|
||||
assert_eq!(searched(&session, 1).len(), 1);
|
||||
std::thread::sleep(Duration::from_millis(50));
|
||||
assert_eq!(searched(&session, 1).len(), 1, "the repeat is ignored");
|
||||
}
|
||||
@@ -0,0 +1,289 @@
|
||||
//! A window over a session it did not start: what a daemon's state
|
||||
//! looks like arriving in a window, and what the window pushes back.
|
||||
|
||||
use super::*;
|
||||
|
||||
#[test]
|
||||
fn an_attached_session_opens_with_the_conversation_already_in_it() {
|
||||
// A TUI attached to a daemon has no state file of its own; the
|
||||
// conversation has to come from the session, or it starts blank while
|
||||
// the daemon has been collecting messages for hours.
|
||||
let tui = tui(vec![
|
||||
ChatMessageDto {
|
||||
peer: "bob".into(),
|
||||
outgoing: false,
|
||||
text: "hi".into(),
|
||||
at: 1,
|
||||
},
|
||||
ChatMessageDto {
|
||||
peer: "bob".into(),
|
||||
outgoing: true,
|
||||
text: "hello".into(),
|
||||
at: 2,
|
||||
},
|
||||
]);
|
||||
|
||||
assert_eq!(tui.state.messages.len(), 2);
|
||||
assert_eq!(tui.state.messages[0].peer, "bob");
|
||||
assert_eq!(tui.state.messages[0].direction, MessageDirection::Incoming);
|
||||
assert_eq!(
|
||||
tui.state.messages[1].direction,
|
||||
MessageDirection::Outgoing,
|
||||
"both halves of the conversation, not just what arrived"
|
||||
);
|
||||
assert_eq!(tui.state.chat_peers(), ["bob"]);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn a_window_shows_transfers_it_did_not_start() {
|
||||
// Two windows on one daemon are two views of one queue. A transfer
|
||||
// queued in the other one has to appear here, or closing a window
|
||||
// would look like losing its downloads.
|
||||
let mut tui = with_session(TalkativeSession {
|
||||
downloads: vec![queued("bob", "@@x\\theirs.mp3")],
|
||||
shared: true,
|
||||
..TalkativeSession::default()
|
||||
});
|
||||
assert!(
|
||||
tui.state.downloads.is_empty(),
|
||||
"nothing until the first poll"
|
||||
);
|
||||
|
||||
tui.update_downloads();
|
||||
|
||||
assert_eq!(tui.state.downloads.len(), 1);
|
||||
assert_eq!(tui.state.downloads[0].download.filename, "@@x\\theirs.mp3");
|
||||
assert!(
|
||||
tui.state.downloads[0].receiver.is_none(),
|
||||
"someone else's transfer has no channel of ours"
|
||||
);
|
||||
|
||||
// Polling again must not double it up.
|
||||
tui.update_downloads();
|
||||
assert_eq!(tui.state.downloads.len(), 1);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn a_transfer_the_session_forgets_leaves_every_window() {
|
||||
let mut tui = with_session(TalkativeSession {
|
||||
downloads: vec![queued("bob", "gone.mp3")],
|
||||
shared: true,
|
||||
..TalkativeSession::default()
|
||||
});
|
||||
tui.update_downloads();
|
||||
assert_eq!(tui.state.downloads.len(), 1);
|
||||
|
||||
// The session no longer has it — cancelled from the other window.
|
||||
tui.client = Arc::new(TalkativeSession {
|
||||
shared: true,
|
||||
..TalkativeSession::default()
|
||||
});
|
||||
tui.update_downloads();
|
||||
assert!(
|
||||
tui.state.downloads.is_empty(),
|
||||
"a queue is shared in both directions"
|
||||
);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn a_window_shows_searches_run_in_another() {
|
||||
let mut tui =
|
||||
with_session(shared(vec![search_of("their query", 7, 9_999)]));
|
||||
tui.update_search_results();
|
||||
|
||||
assert_eq!(tui.state.searches.len(), 1);
|
||||
assert_eq!(tui.state.searches[0].query, "their query");
|
||||
|
||||
// And it is not added a second time on the next frame.
|
||||
tui.update_search_results();
|
||||
assert_eq!(tui.state.searches.len(), 1);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn a_search_another_window_is_still_running_shows_as_active() {
|
||||
// It had said "Done" the moment it appeared, because an imported
|
||||
// search carried no notion of still collecting — so the other window
|
||||
// looked finished while results were still arriving.
|
||||
let mut tui = with_session(shared(vec![search_of("still going", 3, 0)]));
|
||||
tui.update_search_results();
|
||||
|
||||
assert_eq!(tui.state.searches[0].status, SearchStatus::Active);
|
||||
assert_eq!(
|
||||
tui.state.searches[0].known_files, 3,
|
||||
"and its count comes across before the results do"
|
||||
);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn a_search_that_has_run_its_window_shows_as_done() {
|
||||
let mut tui = with_session(shared(vec![search_of("finished", 12, 9_999)]));
|
||||
tui.update_search_results();
|
||||
assert_eq!(tui.state.searches[0].status, SearchStatus::Completed);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn removing_a_search_removes_it_from_the_session() {
|
||||
// Removing it only from this window would last until the next sync,
|
||||
// which would put it straight back — and in a shared session it would
|
||||
// come back for every other window too.
|
||||
let mut tui = with_session(shared(vec![search_of("unwanted", 1, 9_999)]));
|
||||
tui.update_search_results();
|
||||
assert_eq!(tui.state.searches.len(), 1);
|
||||
|
||||
tui.remove_search_at_index(0);
|
||||
tui.update_search_results();
|
||||
|
||||
assert!(tui.state.searches.is_empty(), "and it stays gone");
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn clearing_every_search_clears_them_in_the_session_too() {
|
||||
let mut tui = with_session(shared(vec![
|
||||
search_of("one", 1, 9_999),
|
||||
search_of("two", 2, 9_999),
|
||||
]));
|
||||
tui.update_search_results();
|
||||
assert_eq!(tui.state.searches.len(), 2);
|
||||
|
||||
tui.clear_all_searches();
|
||||
tui.update_search_results();
|
||||
|
||||
assert!(
|
||||
tui.state.searches.is_empty(),
|
||||
"clearing has to reach the session, or every row comes back"
|
||||
);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn a_search_dismissed_in_another_window_leaves_this_one() {
|
||||
let session = shared(vec![search_of("theirs", 4, 9_999)]);
|
||||
let mut tui = with_session(session);
|
||||
tui.update_search_results();
|
||||
assert_eq!(tui.state.searches.len(), 1);
|
||||
|
||||
// The other window dismissed it.
|
||||
tui.client.forget_search("theirs");
|
||||
tui.update_search_results();
|
||||
|
||||
assert!(tui.state.searches.is_empty());
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn a_tick_asks_the_session_for_its_searches_once() {
|
||||
// Against a daemon every call is a round trip, and the daemon answers
|
||||
// it by walking its whole search cache — twice per frame was half the
|
||||
// cost of attaching at all.
|
||||
let session = Arc::new(shared(vec![search_of("q", 0, 9_999)]));
|
||||
let mut tui = attach(session.clone());
|
||||
|
||||
tui.update_search_results();
|
||||
|
||||
assert_eq!(
|
||||
session
|
||||
.all_searches_calls
|
||||
.load(std::sync::atomic::Ordering::Relaxed),
|
||||
1,
|
||||
"one sync means one listing, not one per use of it"
|
||||
);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn a_selected_search_with_nothing_new_is_not_pulled_across_again() {
|
||||
// The result set only accumulates, so an unchanged count means a
|
||||
// fetch would hand back what this window already holds — against a
|
||||
// daemon that is the entire result set over the socket, every frame,
|
||||
// forever.
|
||||
let (session, tui) = window_that_pulled_two_files();
|
||||
|
||||
assert_eq!(tui.state.searches[0].results.len(), 2);
|
||||
assert_eq!(
|
||||
session
|
||||
.result_fetches
|
||||
.load(std::sync::atomic::Ordering::Relaxed),
|
||||
1,
|
||||
"the set crosses once; after that the unchanged count spares it"
|
||||
);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn fresh_results_still_reach_a_window_that_skipped_a_fetch() {
|
||||
let (session, mut tui) = window_that_pulled_two_files();
|
||||
|
||||
// A late responder lands in the session.
|
||||
*session.searches.lock().expect("not poisoned") =
|
||||
vec![search_of("aphex twin", 3, 9_999)];
|
||||
*session.results.lock().expect("not poisoned") =
|
||||
vec![files_from_bob(&["@@x\\a.mp3", "@@x\\b.mp3", "@@x\\c.mp3"])];
|
||||
tui.update_search_results();
|
||||
|
||||
assert_eq!(
|
||||
tui.state.searches[0].results.len(),
|
||||
3,
|
||||
"a changed count must bring the new results across"
|
||||
);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn a_local_window_fetches_results_without_counting_on_the_session() {
|
||||
// Locally nothing maintains known_files, so the count gate must stay
|
||||
// out of the way: a search whose count still reads zero has to get
|
||||
// its results anyway.
|
||||
let session = Arc::new(TalkativeSession {
|
||||
results: std::sync::Mutex::new(vec![files_from_bob(&[
|
||||
"@@x\\a.mp3",
|
||||
"@@x\\b.mp3",
|
||||
])]),
|
||||
shared: false,
|
||||
..TalkativeSession::default()
|
||||
});
|
||||
let mut tui = attach(session);
|
||||
tui.state.searches.push(crate::models::SearchEntry {
|
||||
query: "mine".to_string(),
|
||||
status: SearchStatus::Active,
|
||||
results: Vec::new(),
|
||||
known_files: 0,
|
||||
owned: true,
|
||||
start_time: std::time::Instant::now(),
|
||||
cancel_flag: Arc::new(std::sync::atomic::AtomicBool::new(false)),
|
||||
});
|
||||
|
||||
tui.update_search_results();
|
||||
|
||||
assert_eq!(
|
||||
tui.state.searches[0].results.len(),
|
||||
2,
|
||||
"a zero count matching zero held rows must not read as \
|
||||
nothing-to-fetch on a local session"
|
||||
);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn a_window_with_its_own_session_is_left_alone() {
|
||||
// Nothing to share, so nothing is synced — and in particular the
|
||||
// completed transfers restored from disk, which the session has never
|
||||
// heard of, are not mistaken for cancelled and deleted.
|
||||
let mut tui = with_session(TalkativeSession {
|
||||
downloads: Vec::new(),
|
||||
shared: false,
|
||||
..TalkativeSession::default()
|
||||
});
|
||||
tui.state.downloads.push(crate::models::DownloadEntry {
|
||||
download: queued("bob", "from-disk.mp3"),
|
||||
receiver: None,
|
||||
});
|
||||
|
||||
tui.update_downloads();
|
||||
|
||||
assert_eq!(
|
||||
tui.state.downloads.len(),
|
||||
1,
|
||||
"a local window's history must survive the tick"
|
||||
);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn a_local_session_starts_from_its_own_snapshot_instead() {
|
||||
// Locally the session knows no history and the state file is the whole
|
||||
// record, so nothing is invented.
|
||||
assert!(tui(Vec::new()).state.messages.is_empty());
|
||||
}
|
||||
@@ -0,0 +1,201 @@
|
||||
//! The settings popup: the account it names, the folders it applies,
|
||||
//! and the password and logout it can reach.
|
||||
|
||||
use super::*;
|
||||
|
||||
/// Attached, both folders in the settings form name paths on the
|
||||
/// *daemon's* machine: they go over the socket exactly as typed, and
|
||||
/// nothing is created or validated against this machine's filesystem.
|
||||
#[test]
|
||||
fn applying_settings_attached_pushes_both_folders_to_the_daemon() {
|
||||
let session = Arc::new(TalkativeSession {
|
||||
shared: true,
|
||||
..TalkativeSession::default()
|
||||
});
|
||||
let scratch = tempfile::tempdir().expect("a temp dir");
|
||||
let config_path = scratch.path().join("config.toml");
|
||||
let mut tui = MainTui::new(
|
||||
session.clone(),
|
||||
"/daemon/old".to_string(),
|
||||
Duration::from_secs(1),
|
||||
None,
|
||||
Some(config_path.clone()),
|
||||
);
|
||||
|
||||
let daemon_only = scratch.path().join("only-on-the-daemon");
|
||||
let daemon_dir = daemon_only.to_str().expect("utf-8").to_string();
|
||||
tui.open_settings();
|
||||
{
|
||||
let settings = tui.state.settings.as_mut().expect("open");
|
||||
settings.download_dir.clone_from(&daemon_dir);
|
||||
settings.share_dirs = vec!["/not-here-either".to_string()];
|
||||
}
|
||||
tui.apply_settings();
|
||||
|
||||
assert_eq!(
|
||||
*session.download_dir_set.lock().expect("not poisoned"),
|
||||
Some(daemon_dir.clone()),
|
||||
"the folder is pushed to the daemon"
|
||||
);
|
||||
assert_eq!(
|
||||
*session.shares_set.lock().expect("not poisoned"),
|
||||
Some(vec!["/not-here-either".to_string()]),
|
||||
"shares go over as typed — the daemon's filesystem judges them"
|
||||
);
|
||||
assert!(
|
||||
!daemon_only.exists(),
|
||||
"no directory is created on this machine for a daemon's path"
|
||||
);
|
||||
assert_eq!(tui.download_dir, daemon_dir);
|
||||
|
||||
let saved = crate::persist::config::FileConfig::load(&config_path)
|
||||
.expect("config readable");
|
||||
assert_eq!(
|
||||
saved.download_dir.as_deref(),
|
||||
Some(daemon_dir.as_str()),
|
||||
"the change still lands in config.toml for the next restart"
|
||||
);
|
||||
}
|
||||
|
||||
/// Locally the same form works on this machine: the folder is created
|
||||
/// here and share paths that do not exist here are dropped before the
|
||||
/// session hears about them.
|
||||
#[test]
|
||||
fn applying_settings_locally_stays_on_this_machine() {
|
||||
let session = Arc::new(TalkativeSession {
|
||||
shared: false,
|
||||
..TalkativeSession::default()
|
||||
});
|
||||
let scratch = tempfile::tempdir().expect("a temp dir");
|
||||
let config_path = scratch.path().join("config.toml");
|
||||
let share = scratch.path().join("music");
|
||||
std::fs::create_dir_all(&share).expect("share dir");
|
||||
let mut tui = MainTui::new(
|
||||
session.clone(),
|
||||
"/tmp".to_string(),
|
||||
Duration::from_secs(1),
|
||||
None,
|
||||
Some(config_path),
|
||||
);
|
||||
|
||||
let downloads = scratch.path().join("downloads");
|
||||
let downloads_dir = downloads.to_str().expect("utf-8").to_string();
|
||||
tui.open_settings();
|
||||
{
|
||||
let settings = tui.state.settings.as_mut().expect("open");
|
||||
settings.download_dir.clone_from(&downloads_dir);
|
||||
settings.share_dirs = vec![
|
||||
share.to_str().expect("utf-8").to_string(),
|
||||
"/definitely-not-a-real-share".to_string(),
|
||||
];
|
||||
}
|
||||
tui.apply_settings();
|
||||
|
||||
// The seam is told in both modes; a local session accepts and takes
|
||||
// the directory per download instead of storing it.
|
||||
assert_eq!(
|
||||
*session.download_dir_set.lock().expect("not poisoned"),
|
||||
Some(downloads_dir.clone())
|
||||
);
|
||||
assert_eq!(
|
||||
*session.shares_set.lock().expect("not poisoned"),
|
||||
Some(vec![share.to_str().expect("utf-8").to_string()]),
|
||||
"paths missing on this machine are dropped before applying"
|
||||
);
|
||||
assert!(downloads.is_dir(), "the folder is created here");
|
||||
assert_eq!(tui.download_dir, downloads_dir);
|
||||
}
|
||||
|
||||
/// The account block answers "who is this session, and what is it
|
||||
/// offering" without a trip to another screen.
|
||||
#[test]
|
||||
fn the_settings_popup_names_the_account_and_its_shares() {
|
||||
let mut tui = with_session(TalkativeSession::default());
|
||||
press(&mut tui, KeyCode::Char('o'));
|
||||
|
||||
let screen = screen_sized(&mut tui, 100, 30);
|
||||
assert!(screen.contains("tester"), "{screen}");
|
||||
assert!(screen.contains("12 files in 3 folders"), "{screen}");
|
||||
}
|
||||
|
||||
/// Typed twice the same way, the new password reaches the session — and
|
||||
/// attached to a daemon it is the daemon that stores it.
|
||||
#[test]
|
||||
fn a_password_typed_twice_reaches_the_session() {
|
||||
let session = Arc::new(TalkativeSession {
|
||||
shared: true,
|
||||
..TalkativeSession::default()
|
||||
});
|
||||
let mut tui = attach(session.clone());
|
||||
press(&mut tui, KeyCode::Char('o'));
|
||||
press(&mut tui, KeyCode::Enter); // the change-password row is first
|
||||
for _ in 0..2 {
|
||||
for c in "hunter2".chars() {
|
||||
press(&mut tui, KeyCode::Char(c));
|
||||
}
|
||||
press(&mut tui, KeyCode::Enter);
|
||||
}
|
||||
|
||||
assert_eq!(
|
||||
*session.password_set.lock().expect("not poisoned"),
|
||||
Some("hunter2".to_string())
|
||||
);
|
||||
let settings = tui.state.settings.as_ref().expect("still open");
|
||||
assert_eq!(settings.status.as_deref(), Some("Password changed"));
|
||||
}
|
||||
|
||||
/// A mistyped repeat is caught here rather than on the server, where the
|
||||
/// account would be left with a password nobody knows.
|
||||
#[test]
|
||||
fn a_password_typed_two_different_ways_is_not_sent() {
|
||||
let session = Arc::new(TalkativeSession {
|
||||
shared: true,
|
||||
..TalkativeSession::default()
|
||||
});
|
||||
let mut tui = attach(session.clone());
|
||||
press(&mut tui, KeyCode::Char('o'));
|
||||
press(&mut tui, KeyCode::Enter);
|
||||
for typed in ["hunter2", "hunter3"] {
|
||||
for c in typed.chars() {
|
||||
press(&mut tui, KeyCode::Char(c));
|
||||
}
|
||||
press(&mut tui, KeyCode::Enter);
|
||||
}
|
||||
|
||||
assert_eq!(*session.password_set.lock().expect("not poisoned"), None);
|
||||
}
|
||||
|
||||
/// Logging out ends the window, but as a log-out: the caller brings the
|
||||
/// login screen back rather than returning to the shell.
|
||||
#[test]
|
||||
fn logging_out_asks_first_and_then_closes_the_window() {
|
||||
let mut tui = with_session(TalkativeSession::default());
|
||||
press(&mut tui, KeyCode::Char('o'));
|
||||
press(&mut tui, KeyCode::Down); // change password -> log out
|
||||
press(&mut tui, KeyCode::Enter);
|
||||
assert!(tui.state.exit.is_none(), "the confirm comes first");
|
||||
|
||||
press(&mut tui, KeyCode::Char('y'));
|
||||
assert_eq!(tui.state.exit, Some(TuiExit::Logout));
|
||||
}
|
||||
|
||||
/// Attached, the login is the daemon's: there is no logout row to land
|
||||
/// on, so the row below the password is the download folder.
|
||||
#[test]
|
||||
fn an_attached_window_offers_no_logout() {
|
||||
let session = Arc::new(TalkativeSession {
|
||||
shared: true,
|
||||
..TalkativeSession::default()
|
||||
});
|
||||
let mut tui = attach(session);
|
||||
press(&mut tui, KeyCode::Char('o'));
|
||||
press(&mut tui, KeyCode::Down);
|
||||
press(&mut tui, KeyCode::Enter);
|
||||
|
||||
let settings = tui.state.settings.as_ref().expect("still open");
|
||||
assert_eq!(
|
||||
settings.mode,
|
||||
crate::models::SettingsMode::EditingDownloadDir
|
||||
);
|
||||
assert!(tui.state.exit.is_none());
|
||||
}
|
||||
@@ -0,0 +1,239 @@
|
||||
//! What the transfer lists do when a key lands on a row.
|
||||
|
||||
use super::*;
|
||||
|
||||
#[test]
|
||||
fn x_cancels_the_highlighted_download() {
|
||||
let session = Arc::new(TalkativeSession::default());
|
||||
let mut tui = attach(session.clone());
|
||||
tui.state.downloads.push(crate::models::DownloadEntry {
|
||||
download: at_status(
|
||||
"bob",
|
||||
"song.mp3",
|
||||
soulseek_rs::DownloadStatus::InProgress {
|
||||
bytes_downloaded: 1,
|
||||
total_bytes: 4096,
|
||||
speed_bytes_per_sec: 1.0,
|
||||
},
|
||||
),
|
||||
receiver: None,
|
||||
});
|
||||
tui.state.downloads_table_state.select(Some(0));
|
||||
tui.state.focused_pane = FocusedPane::Downloads;
|
||||
|
||||
tui.handle_key_event(key('x'));
|
||||
|
||||
assert_eq!(
|
||||
*session.download_cancelled.lock().expect("not poisoned"),
|
||||
vec![("bob".to_string(), "song.mp3".to_string())]
|
||||
);
|
||||
assert!(
|
||||
session
|
||||
.upload_cancelled
|
||||
.lock()
|
||||
.expect("not poisoned")
|
||||
.is_empty(),
|
||||
"the download row cancels no upload"
|
||||
);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn shift_c_clears_the_whole_transfer_list() {
|
||||
let session = Arc::new(TalkativeSession::default());
|
||||
let mut tui = attach(session.clone());
|
||||
tui.state.downloads.push(crate::models::DownloadEntry {
|
||||
download: queued("bob", "waiting.mp3"),
|
||||
receiver: None,
|
||||
});
|
||||
tui.state.downloads.push(crate::models::DownloadEntry {
|
||||
download: at_status(
|
||||
"carol",
|
||||
"live.mp3",
|
||||
soulseek_rs::DownloadStatus::InProgress {
|
||||
bytes_downloaded: 1,
|
||||
total_bytes: 4096,
|
||||
speed_bytes_per_sec: 1.0,
|
||||
},
|
||||
),
|
||||
receiver: None,
|
||||
});
|
||||
tui.state.downloads.push(crate::models::DownloadEntry {
|
||||
download: completed("dave", "done.mp3"),
|
||||
receiver: None,
|
||||
});
|
||||
tui.state.uploads.push(uploading("alice", "served.mp3"));
|
||||
tui.state.downloads_table_state.select(Some(0));
|
||||
tui.state.focused_pane = FocusedPane::Downloads;
|
||||
|
||||
tui.handle_key_event(key('C'));
|
||||
|
||||
assert!(tui.state.downloads.is_empty(), "every row goes");
|
||||
assert_eq!(
|
||||
*session.download_cancelled.lock().expect("not poisoned"),
|
||||
vec![
|
||||
("bob".to_string(), "waiting.mp3".to_string()),
|
||||
("carol".to_string(), "live.mp3".to_string()),
|
||||
],
|
||||
"live downloads are cancelled; the finished one is not"
|
||||
);
|
||||
assert_eq!(
|
||||
*session.download_removed.lock().expect("not poisoned"),
|
||||
vec![
|
||||
("bob".to_string(), "waiting.mp3".to_string()),
|
||||
("carol".to_string(), "live.mp3".to_string()),
|
||||
("dave".to_string(), "done.mp3".to_string()),
|
||||
],
|
||||
"the session forgets every download, not just this window's rows"
|
||||
);
|
||||
assert_eq!(
|
||||
*session.upload_cancelled.lock().expect("not poisoned"),
|
||||
vec![("alice".to_string(), "served.mp3".to_string())],
|
||||
"a streaming upload is cancelled too"
|
||||
);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn d_clears_a_cancelled_row() {
|
||||
let mut tui = with_session(TalkativeSession::default());
|
||||
tui.state.downloads.push(crate::models::DownloadEntry {
|
||||
download: at_status(
|
||||
"bob",
|
||||
"gone.mp3",
|
||||
soulseek_rs::DownloadStatus::Cancelled,
|
||||
),
|
||||
receiver: None,
|
||||
});
|
||||
tui.state.downloads_table_state.select(Some(0));
|
||||
tui.state.focused_pane = FocusedPane::Downloads;
|
||||
|
||||
tui.handle_key_event(key('d'));
|
||||
|
||||
assert!(tui.state.downloads.is_empty(), "the row goes");
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn x_on_a_finished_download_asks_nothing() {
|
||||
let session = Arc::new(TalkativeSession::default());
|
||||
let mut tui = attach(session.clone());
|
||||
tui.state.downloads.push(crate::models::DownloadEntry {
|
||||
download: completed("bob", "done.mp3"),
|
||||
receiver: None,
|
||||
});
|
||||
tui.state.downloads_table_state.select(Some(0));
|
||||
tui.state.focused_pane = FocusedPane::Downloads;
|
||||
|
||||
tui.handle_key_event(key('x'));
|
||||
|
||||
assert!(
|
||||
session
|
||||
.download_cancelled
|
||||
.lock()
|
||||
.expect("not poisoned")
|
||||
.is_empty(),
|
||||
"a finished download is not cancelled"
|
||||
);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn x_on_an_upload_row_still_cancels_the_upload() {
|
||||
let session = Arc::new(TalkativeSession::default());
|
||||
let mut tui = attach(session.clone());
|
||||
tui.state.downloads.push(crate::models::DownloadEntry {
|
||||
download: queued("bob", "song.mp3"),
|
||||
receiver: None,
|
||||
});
|
||||
tui.state.uploads.push(uploading("alice", "served.mp3"));
|
||||
tui.state.downloads_table_state.select(Some(1));
|
||||
tui.state.focused_pane = FocusedPane::Downloads;
|
||||
|
||||
tui.handle_key_event(key('x'));
|
||||
|
||||
assert_eq!(
|
||||
*session.upload_cancelled.lock().expect("not poisoned"),
|
||||
vec![("alice".to_string(), "served.mp3".to_string())]
|
||||
);
|
||||
assert!(
|
||||
session
|
||||
.download_cancelled
|
||||
.lock()
|
||||
.expect("not poisoned")
|
||||
.is_empty(),
|
||||
"the upload row cancels no download"
|
||||
);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn b_browses_the_user_of_the_highlighted_download() {
|
||||
let mut tui = with_session(TalkativeSession::default());
|
||||
tui.state.downloads.push(crate::models::DownloadEntry {
|
||||
download: queued("bob", "song.mp3"),
|
||||
receiver: None,
|
||||
});
|
||||
tui.state.downloads_table_state.select(Some(0));
|
||||
tui.state.focused_pane = FocusedPane::Downloads;
|
||||
|
||||
tui.handle_key_event(key('b'));
|
||||
|
||||
assert!(tui.state.show_browse, "the browse popup opens");
|
||||
assert_eq!(
|
||||
tui.state.browse.active_tab().map(|b| b.username.as_str()),
|
||||
Some("bob"),
|
||||
"the download's user is the one browsed"
|
||||
);
|
||||
assert!(
|
||||
!tui.state.command_bar_active,
|
||||
"b on a transfer goes straight to the user, not the prompt"
|
||||
);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn b_on_an_upload_row_browses_that_user() {
|
||||
let mut tui = with_session(TalkativeSession::default());
|
||||
tui.state.uploads.push(uploading("alice", "served.mp3"));
|
||||
tui.state.downloads_table_state.select(Some(0));
|
||||
tui.state.focused_pane = FocusedPane::Downloads;
|
||||
|
||||
tui.handle_key_event(key('b'));
|
||||
|
||||
assert_eq!(
|
||||
tui.state.browse.active_tab().map(|b| b.username.as_str()),
|
||||
Some("alice")
|
||||
);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn d_clears_a_finished_row_but_not_a_running_one() {
|
||||
// Finished transfers are what a list fills up with after a restart, so
|
||||
// `d` has to be able to dismiss one — restored or not. A running
|
||||
// transfer is not ours to discard, and stays put.
|
||||
let mut tui = with_session(TalkativeSession::default());
|
||||
tui.state.downloads.push(crate::models::DownloadEntry {
|
||||
download: completed("bob", "done.mp3"),
|
||||
receiver: None,
|
||||
});
|
||||
tui.state.downloads_table_state.select(Some(0));
|
||||
tui.state.focused_pane = FocusedPane::Downloads;
|
||||
|
||||
tui.handle_key_event(key('d'));
|
||||
|
||||
assert!(tui.state.downloads.is_empty(), "the row goes too");
|
||||
assert_eq!(tui.state.downloads_table_state.selected(), None);
|
||||
|
||||
tui.state.downloads.push(crate::models::DownloadEntry {
|
||||
download: at_status(
|
||||
"bob",
|
||||
"still.mp3",
|
||||
soulseek_rs::DownloadStatus::InProgress {
|
||||
bytes_downloaded: 1,
|
||||
total_bytes: 2,
|
||||
speed_bytes_per_sec: 1.0,
|
||||
},
|
||||
),
|
||||
receiver: None,
|
||||
});
|
||||
tui.state.downloads_table_state.select(Some(0));
|
||||
|
||||
tui.handle_key_event(key('d'));
|
||||
|
||||
assert_eq!(tui.state.downloads.len(), 1, "it is not disposable");
|
||||
}
|
||||
Reference in New Issue
Block a user