chore: UI tweaks
This commit is contained in:
Michel de Graaf
@@ -0,0 +1,499 @@
|
||||
use crate::models::FileDownloadState;
|
||||
use crate::ui::{
|
||||
border_style, border_type, error_style, format_bytes_progress,
|
||||
format_progress_bar, format_shortcuts_styled, format_speed, header_style,
|
||||
highlight_style, inactive_style, primary_style, warning_style,
|
||||
COLOR_PRIMARY, HIGHLIGHT_SYMBOL,
|
||||
};
|
||||
use color_eyre::Result;
|
||||
use ratatui::{
|
||||
crossterm::event::{self, poll, Event, KeyCode, KeyEvent, KeyEventKind},
|
||||
layout::{Alignment, Constraint, Layout},
|
||||
style::{Modifier, Style},
|
||||
text::{Line, Span},
|
||||
widgets::{
|
||||
Block, Borders, Cell, HighlightSpacing, Paragraph, Row, StatefulWidget,
|
||||
Table, TableState,
|
||||
},
|
||||
DefaultTerminal, Frame,
|
||||
};
|
||||
use soulseek_rs::{Client, DownloadStatus};
|
||||
use std::{
|
||||
sync::{mpsc, mpsc::Receiver, Arc},
|
||||
thread,
|
||||
time::Duration,
|
||||
};
|
||||
|
||||
pub struct MultiDownloadProgress {
|
||||
downloads: Vec<FileDownloadState>,
|
||||
receivers: Vec<Option<Receiver<DownloadStatus>>>,
|
||||
receiver_channel: Receiver<(usize, Receiver<DownloadStatus>)>,
|
||||
list_state: TableState,
|
||||
max_concurrent: usize,
|
||||
active_count: usize,
|
||||
should_exit: bool,
|
||||
queuing_status: String,
|
||||
}
|
||||
|
||||
impl MultiDownloadProgress {
|
||||
pub fn new(
|
||||
downloads: Vec<FileDownloadState>,
|
||||
receiver_channel: Receiver<(usize, Receiver<DownloadStatus>)>,
|
||||
max_concurrent: usize,
|
||||
) -> Self {
|
||||
let mut list_state = TableState::default();
|
||||
list_state.select(Some(0));
|
||||
|
||||
// Initialize all receivers as None - they'll be populated asynchronously
|
||||
let receivers = (0..downloads.len()).map(|_| None).collect();
|
||||
|
||||
Self {
|
||||
downloads,
|
||||
receivers,
|
||||
receiver_channel,
|
||||
list_state,
|
||||
max_concurrent,
|
||||
active_count: 0,
|
||||
should_exit: false,
|
||||
queuing_status: String::from("Queuing downloads..."),
|
||||
}
|
||||
}
|
||||
|
||||
pub fn run(&mut self, mut terminal: DefaultTerminal) -> Result<()> {
|
||||
// Start initial batch of downloads
|
||||
self.start_next_batch();
|
||||
|
||||
loop {
|
||||
terminal.draw(|frame| self.render(frame))?;
|
||||
|
||||
// Check for incoming download receivers from background thread
|
||||
while let Ok((index, receiver)) = self.receiver_channel.try_recv() {
|
||||
self.receivers[index] = Some(receiver);
|
||||
// Update status message
|
||||
let queued =
|
||||
self.receivers.iter().filter(|r| r.is_none()).count();
|
||||
if queued == 0 {
|
||||
self.queuing_status = String::from("All downloads queued");
|
||||
} else {
|
||||
self.queuing_status =
|
||||
format!("Queuing... {} remaining", queued);
|
||||
}
|
||||
}
|
||||
|
||||
// Poll all receivers for status updates
|
||||
for i in 0..self.receivers.len() {
|
||||
if let Some(receiver) = &self.receivers[i] {
|
||||
if let Ok(status) = receiver.try_recv() {
|
||||
let was_active = !self.downloads[i].is_finished();
|
||||
self.downloads[i].update_status(status);
|
||||
let is_finished = self.downloads[i].is_finished();
|
||||
|
||||
// If download just finished, decrement active count and start next
|
||||
if was_active && is_finished {
|
||||
self.active_count =
|
||||
self.active_count.saturating_sub(1);
|
||||
self.start_next_batch();
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// Handle keyboard input
|
||||
if poll(Duration::from_millis(100))? {
|
||||
if let Event::Key(key) = event::read()? {
|
||||
self.handle_key(key);
|
||||
}
|
||||
}
|
||||
|
||||
// Exit when user cancels or all downloads finished
|
||||
if self.should_exit || self.all_finished() {
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
Ok(())
|
||||
}
|
||||
|
||||
fn start_next_batch(&mut self) {
|
||||
// Start queued downloads up to max_concurrent limit
|
||||
for i in 0..self.downloads.len() {
|
||||
if self.active_count >= self.max_concurrent {
|
||||
break;
|
||||
}
|
||||
|
||||
// Only start if download is queued AND receiver is available
|
||||
if matches!(self.downloads[i].status, DownloadStatus::Queued)
|
||||
&& self.receivers[i].is_some()
|
||||
{
|
||||
self.active_count += 1;
|
||||
// Download will start automatically since receiver exists
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
fn all_finished(&self) -> bool {
|
||||
self.downloads.iter().all(|d| d.is_finished())
|
||||
}
|
||||
|
||||
fn handle_key(&mut self, key: KeyEvent) {
|
||||
if key.kind != KeyEventKind::Press {
|
||||
return;
|
||||
}
|
||||
|
||||
match key.code {
|
||||
KeyCode::Up | KeyCode::Char('k') => self.select_previous(),
|
||||
KeyCode::Down | KeyCode::Char('j') => self.select_next(),
|
||||
KeyCode::Home | KeyCode::Char('g') => self.select_first(),
|
||||
KeyCode::End | KeyCode::Char('G') => self.select_last(),
|
||||
KeyCode::Esc | KeyCode::Char('q') => {
|
||||
self.should_exit = true;
|
||||
}
|
||||
_ => {}
|
||||
}
|
||||
}
|
||||
|
||||
fn select_previous(&mut self) {
|
||||
let i = match self.list_state.selected() {
|
||||
Some(i) if i > 0 => i - 1,
|
||||
_ => self.downloads.len().saturating_sub(1),
|
||||
};
|
||||
self.list_state.select(Some(i));
|
||||
}
|
||||
|
||||
fn select_next(&mut self) {
|
||||
let i = match self.list_state.selected() {
|
||||
Some(i) if i < self.downloads.len().saturating_sub(1) => i + 1,
|
||||
_ => 0,
|
||||
};
|
||||
self.list_state.select(Some(i));
|
||||
}
|
||||
|
||||
fn select_first(&mut self) {
|
||||
self.list_state.select(Some(0));
|
||||
}
|
||||
|
||||
fn select_last(&mut self) {
|
||||
if !self.downloads.is_empty() {
|
||||
self.list_state.select(Some(self.downloads.len() - 1));
|
||||
}
|
||||
}
|
||||
|
||||
fn render(&mut self, frame: &mut Frame) {
|
||||
let area = frame.area();
|
||||
|
||||
let chunks = Layout::vertical([
|
||||
Constraint::Length(3),
|
||||
Constraint::Min(0),
|
||||
Constraint::Length(3),
|
||||
])
|
||||
.split(area);
|
||||
|
||||
// Top: Overall stats
|
||||
self.render_stats(frame, chunks[0]);
|
||||
|
||||
// Middle: List of downloads
|
||||
self.render_downloads_list(frame, chunks[1]);
|
||||
|
||||
// Bottom: Controls
|
||||
self.render_controls(frame, chunks[2]);
|
||||
}
|
||||
|
||||
fn render_stats(&self, frame: &mut Frame, area: ratatui::layout::Rect) {
|
||||
let completed = self
|
||||
.downloads
|
||||
.iter()
|
||||
.filter(|d| matches!(d.status, DownloadStatus::Completed))
|
||||
.count();
|
||||
let failed = self
|
||||
.downloads
|
||||
.iter()
|
||||
.filter(|d| {
|
||||
matches!(
|
||||
d.status,
|
||||
DownloadStatus::Failed | DownloadStatus::TimedOut
|
||||
)
|
||||
})
|
||||
.count();
|
||||
let queued = self
|
||||
.downloads
|
||||
.iter()
|
||||
.filter(|d| matches!(d.status, DownloadStatus::Queued))
|
||||
.count();
|
||||
|
||||
let total_downloaded: u64 =
|
||||
self.downloads.iter().map(|d| d.bytes_downloaded).sum();
|
||||
let total_size: u64 =
|
||||
self.downloads.iter().map(|d| d.total_bytes).sum();
|
||||
let overall_progress = if total_size > 0 {
|
||||
(total_downloaded as f64 / total_size as f64 * 100.0) as u8
|
||||
} else {
|
||||
0
|
||||
};
|
||||
let progress_ratio = if total_size > 0 {
|
||||
total_downloaded as f64 / total_size as f64
|
||||
} else {
|
||||
0.0
|
||||
};
|
||||
let total_speed: f64 = self
|
||||
.downloads
|
||||
.iter()
|
||||
.filter(|d| matches!(d.status, DownloadStatus::InProgress { .. }))
|
||||
.map(|d| d.speed_bytes_per_sec)
|
||||
.sum();
|
||||
let speed_mb = (total_speed / 1_048_576.0 * 100.0).round() / 100.0;
|
||||
|
||||
let block = Block::default()
|
||||
.borders(Borders::ALL)
|
||||
.border_type(border_type(false))
|
||||
.title("Status");
|
||||
|
||||
let inner_area = block.inner(area);
|
||||
frame.render_widget(block, area);
|
||||
|
||||
// Split into two equal 50% containers
|
||||
let chunks = Layout::horizontal([
|
||||
Constraint::Percentage(50),
|
||||
Constraint::Percentage(50),
|
||||
])
|
||||
.split(inner_area);
|
||||
|
||||
// Left container: Statistics with styled values
|
||||
let stats_line = Line::from(vec![
|
||||
Span::raw("Downloads: "),
|
||||
Span::styled(
|
||||
self.active_count.to_string(),
|
||||
Style::default()
|
||||
.fg(COLOR_PRIMARY)
|
||||
.add_modifier(Modifier::BOLD),
|
||||
),
|
||||
Span::raw(" active, "),
|
||||
Span::styled(
|
||||
completed.to_string(),
|
||||
Style::default()
|
||||
.fg(COLOR_PRIMARY)
|
||||
.add_modifier(Modifier::BOLD),
|
||||
),
|
||||
Span::raw(" completed, "),
|
||||
Span::styled(
|
||||
failed.to_string(),
|
||||
Style::default()
|
||||
.fg(COLOR_PRIMARY)
|
||||
.add_modifier(Modifier::BOLD),
|
||||
),
|
||||
Span::raw(" failed, "),
|
||||
Span::styled(
|
||||
queued.to_string(),
|
||||
Style::default()
|
||||
.fg(COLOR_PRIMARY)
|
||||
.add_modifier(Modifier::BOLD),
|
||||
),
|
||||
Span::raw(" queued"),
|
||||
]);
|
||||
|
||||
let stats_paragraph = Paragraph::new(stats_line);
|
||||
frame.render_widget(stats_paragraph, chunks[0]);
|
||||
|
||||
let right_width = chunks[1].width as usize;
|
||||
let bar_width = right_width.saturating_sub(42).max(10);
|
||||
let progress_bar =
|
||||
format_progress_bar(progress_ratio, bar_width, overall_progress);
|
||||
let data_str = format_bytes_progress(total_downloaded, total_size);
|
||||
|
||||
let mut spans: Vec<Span> = Vec::new();
|
||||
|
||||
spans.extend(data_str.spans);
|
||||
spans.push(Span::raw(" • "));
|
||||
spans.push(Span::styled(
|
||||
format!("{}", speed_mb),
|
||||
Style::default()
|
||||
.fg(COLOR_PRIMARY)
|
||||
.add_modifier(Modifier::BOLD),
|
||||
));
|
||||
spans.push(Span::raw(" MB/s"));
|
||||
spans.push(Span::raw(" • "));
|
||||
spans.extend(progress_bar.spans);
|
||||
|
||||
let progress_line = Line::from(spans);
|
||||
let progress_paragraph =
|
||||
Paragraph::new(progress_line).alignment(Alignment::Right);
|
||||
frame.render_widget(progress_paragraph, chunks[1]);
|
||||
}
|
||||
|
||||
fn render_downloads_list(
|
||||
&mut self,
|
||||
frame: &mut Frame,
|
||||
area: ratatui::layout::Rect,
|
||||
) {
|
||||
let header = Row::new(vec![
|
||||
Cell::from("St"),
|
||||
Cell::from("Filename"),
|
||||
Cell::from("Username"),
|
||||
Cell::from("Size"),
|
||||
Cell::from("Progress"),
|
||||
Cell::from("Speed"),
|
||||
])
|
||||
.style(header_style())
|
||||
.height(1);
|
||||
|
||||
let rows: Vec<Row> = self
|
||||
.downloads
|
||||
.iter()
|
||||
.map(|download| {
|
||||
let status_icon = match download.status {
|
||||
DownloadStatus::Queued => "⋯",
|
||||
DownloadStatus::InProgress { .. } => "⧗",
|
||||
DownloadStatus::Completed => "✓",
|
||||
DownloadStatus::Failed => "✗",
|
||||
DownloadStatus::TimedOut => "⏱",
|
||||
};
|
||||
|
||||
let progress = if download.total_bytes > 0 {
|
||||
download.bytes_downloaded as f64
|
||||
/ download.total_bytes as f64
|
||||
} else {
|
||||
0.0
|
||||
};
|
||||
|
||||
let percent = (progress * 100.0) as u8;
|
||||
let bar_width = 20;
|
||||
let progress_bar =
|
||||
format_progress_bar(progress, bar_width, percent);
|
||||
|
||||
let size_str = format_bytes_progress(
|
||||
download.bytes_downloaded,
|
||||
download.total_bytes,
|
||||
);
|
||||
|
||||
let speed_str = match download.status {
|
||||
DownloadStatus::InProgress { .. } => {
|
||||
format_speed(download.speed_bytes_per_sec)
|
||||
}
|
||||
_ => "-".to_string(),
|
||||
};
|
||||
|
||||
let cells = vec![
|
||||
Cell::from(status_icon),
|
||||
Cell::from(download.filename.clone()),
|
||||
Cell::from(download.username.clone()),
|
||||
Cell::from(size_str),
|
||||
Cell::from(progress_bar),
|
||||
Cell::from(speed_str),
|
||||
];
|
||||
|
||||
let style = match download.status {
|
||||
DownloadStatus::Queued => inactive_style(),
|
||||
DownloadStatus::InProgress { .. } => warning_style(),
|
||||
DownloadStatus::Completed => primary_style(),
|
||||
DownloadStatus::Failed | DownloadStatus::TimedOut => {
|
||||
error_style()
|
||||
}
|
||||
};
|
||||
|
||||
Row::new(cells).style(style).height(1)
|
||||
})
|
||||
.collect();
|
||||
|
||||
let widths = [
|
||||
Constraint::Length(3),
|
||||
Constraint::Min(30),
|
||||
Constraint::Length(15),
|
||||
Constraint::Length(20),
|
||||
Constraint::Length(28),
|
||||
Constraint::Length(12),
|
||||
];
|
||||
|
||||
let table = Table::new(rows, widths)
|
||||
.header(header)
|
||||
.block(
|
||||
Block::default()
|
||||
.borders(Borders::ALL)
|
||||
.border_style(border_style(true))
|
||||
.border_type(border_type(true))
|
||||
.title("Downloads"),
|
||||
)
|
||||
.column_spacing(1)
|
||||
.row_highlight_style(highlight_style())
|
||||
.highlight_symbol(HIGHLIGHT_SYMBOL)
|
||||
.highlight_spacing(HighlightSpacing::Always);
|
||||
|
||||
StatefulWidget::render(
|
||||
table,
|
||||
area,
|
||||
frame.buffer_mut(),
|
||||
&mut self.list_state,
|
||||
);
|
||||
}
|
||||
|
||||
fn render_controls(&self, frame: &mut Frame, area: ratatui::layout::Rect) {
|
||||
let controls_line = format_shortcuts_styled(&[
|
||||
("↑↓/jk", "scroll"),
|
||||
("Home/End", "jump"),
|
||||
("Esc/q", "cancel all"),
|
||||
]);
|
||||
|
||||
let controls_widget = Paragraph::new(controls_line).block(
|
||||
Block::default()
|
||||
.borders(Borders::ALL)
|
||||
.border_type(border_type(false))
|
||||
.title("Controls"),
|
||||
);
|
||||
|
||||
frame.render_widget(controls_widget, area);
|
||||
}
|
||||
}
|
||||
|
||||
pub fn show_multi_download_progress(
|
||||
terminal: DefaultTerminal,
|
||||
client: Arc<Client>,
|
||||
selected_files: Vec<(String, String, u64)>,
|
||||
download_dir: String,
|
||||
max_concurrent: usize,
|
||||
) -> Result<()> {
|
||||
soulseek_rs::utils::logger::enable_buffering();
|
||||
|
||||
// Create download states immediately (all with Queued status)
|
||||
let downloads: Vec<FileDownloadState> = selected_files
|
||||
.iter()
|
||||
.map(|(filename, username, size)| {
|
||||
FileDownloadState::new(filename.clone(), username.clone(), *size)
|
||||
})
|
||||
.collect();
|
||||
|
||||
// Create channel for sending receivers from background thread
|
||||
let (tx, rx) = mpsc::channel();
|
||||
|
||||
// Spawn background thread to initialize downloads
|
||||
let init_client = client.clone();
|
||||
let init_files = selected_files.clone();
|
||||
let init_dir = download_dir.clone();
|
||||
thread::spawn(move || {
|
||||
for (index, (filename, username, size)) in
|
||||
init_files.into_iter().enumerate()
|
||||
{
|
||||
// Initiate download
|
||||
match init_client.download(
|
||||
filename,
|
||||
username,
|
||||
size,
|
||||
init_dir.clone(),
|
||||
) {
|
||||
Ok(receiver) => {
|
||||
// Send receiver back to main thread
|
||||
let _ = tx.send((index, receiver));
|
||||
}
|
||||
Err(e) => {
|
||||
eprintln!("Failed to start download {}: {}", index, e);
|
||||
}
|
||||
}
|
||||
}
|
||||
});
|
||||
|
||||
let mut progress =
|
||||
MultiDownloadProgress::new(downloads, rx, max_concurrent);
|
||||
let result = progress.run(terminal);
|
||||
ratatui::restore();
|
||||
|
||||
soulseek_rs::utils::logger::flush_buffered_logs();
|
||||
|
||||
result
|
||||
}
|
||||
Reference in New Issue
Block a user