AlexL/rumus
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

обновление

Browse Source
This commit is contained in:
AlexL
2026-10-13 21:15:09 +02:00
parent 08a8a7cce5
commit f554de7908
8 changed files with 938 additions and 233 deletions
Download Patch File Download Diff File Expand all files Collapse all files

299
src/ui.rs
View File

@@ -1,69 +1,164 @@
use ratatui::prelude::*;
use ratatui::widgets::{Block, Borders, Gauge, List, ListItem, Paragraph};
use ratatui::widgets::{
Bar, BarChart, BarGroup, Block, Borders, Gauge, List, ListItem, ListState, Paragraph,
};
use crate::app::{App, Panel};
use crate::library::{LeftRow, SortMode};
use crate::app::{App, InputMode, Panel};
use crate::library::{RightRow, SortMode};
use crate::state::RepeatMode;
pub fn draw(f: &mut Frame, app: &mut App) {
let chunks = Layout::default()
.direction(Direction::Vertical)
.constraints([
Constraint::Min(1),
Constraint::Length(3),
Constraint::Length(3),
Constraint::Length(3),
Constraint::Length(6), // эквалайзер
Constraint::Length(3), // прогресс
Constraint::Length(3), // статус + vol
])
.split(f.area());
// Горизонтальное разделение верхней области: 40% слева, 60% справа
let top = Layout::default()
.direction(Direction::Horizontal)
.constraints([Constraint::Percentage(40), Constraint::Percentage(60)])
.constraints([Constraint::Percentage(30), Constraint::Percentage(70)])
.split(chunks[0]);
draw_left_panel(f, app, top[0]);
draw_right_panel(f, app, top[1]);
draw_progress(f, app, chunks[1]);
draw_volume(f, app, chunks[2]);
draw_equalizer(f, app, chunks[1]);
draw_progress(f, app, chunks[2]);
draw_status(f, app, chunks[3]);
}
fn draw_left_panel(f: &mut Frame, app: &App, area: Rect) {
let items: Vec<ListItem> = app
.library
.left_rows
.artists
.iter()
.map(|row| match row {
LeftRow::Artist { name } => ListItem::new(Line::from(vec![
Span::styled("▶ ", Style::default().fg(Color::Yellow)),
Span::styled(
name.clone(),
Style::default()
.fg(Color::Yellow)
.add_modifier(Modifier::BOLD),
),
])),
LeftRow::Album { name } => ListItem::new(Line::from(vec![
Span::raw(" "),
Span::styled(name.clone(), Style::default().fg(Color::Cyan)),
])),
})
.map(|a| ListItem::new(a.name.clone()))
.collect();
let title = match app.library.sort_mode {
SortMode::ByArtist => " Артисты / Альбомы ",
SortMode::ByFilename => " Источник ",
};
let highlight = if app.active_panel == Panel::Left {
Style::default().add_modifier(Modifier::REVERSED)
} else {
Style::default().add_modifier(Modifier::DIM)
};
let mut list_state = ratatui::widgets::ListState::default();
if !app.library.left_rows.is_empty() {
list_state.select(Some(app.library.left_selected));
let mut list_state = ListState::default();
if !app.library.artists.is_empty() {
list_state.select(Some(app.library.artist_selected));
}
let list = List::new(items)
.block(Block::default().borders(Borders::ALL).title(" Исполнители "))
.highlight_style(highlight)
.highlight_symbol("> ");
f.render_stateful_widget(list, area, &mut list_state);
}
fn fmt_dur(d: std::time::Duration) -> String {
if d.is_zero() {
"--:--".into()
} else {
format!("{}:{:02}", d.as_secs() / 60, d.as_secs() % 60)
}
}
fn draw_right_panel(f: &mut Frame, app: &App, area: Rect) {
let rows = app.library.current_right_rows();
let items: Vec<ListItem> = rows
.iter()
.enumerate()
.map(|(idx, row)| match row {
RightRow::AlbumHeader { name } => {
let mut album_total = std::time::Duration::ZERO;
let mut i = idx + 1;
while i < rows.len() {
if let RightRow::Track { index_in_library } = rows[i] {
if let Some(t) = app.library.track(index_in_library) {
album_total += t.duration;
}
i += 1;
} else {
break;
}
}
let total_str = fmt_dur(album_total);
let inner_width = area.width.saturating_sub(6) as usize;
let pad = inner_width
.saturating_sub(name.len() + total_str.len() + 3)
.max(1);
let line = format!("{} {} {}", name, "─".repeat(pad), total_str);
let album_color = Color::Rgb(100, 149, 237);
ListItem::new(Line::from(vec![
Span::styled("▶ ", Style::default().fg(album_color)),
Span::styled(
line,
Style::default()
.fg(album_color)
.add_modifier(Modifier::BOLD),
),
]))
}
RightRow::Track { index_in_library } => {
let is_playing = Some(*index_in_library) == app.playing_index;
let marker = if is_playing { "♪ " } else { " " };
let (title, num, dur) = match app.library.track(*index_in_library) {
Some(t) => (
t.title.clone(),
t.track_number
.map(|n| format!("{:02}. ", n))
.unwrap_or_default(),
fmt_dur(t.duration),
),
None => ("<unknown>".into(), String::new(), "--:--".into()),
};
let style = if is_playing {
Style::default().fg(Color::Green)
} else {
Style::default()
};
ListItem::new(Line::from(vec![
Span::raw(" "),
Span::raw(marker),
Span::styled(format!("{}{}", num, title), style),
Span::raw(" "),
Span::styled(dur, Style::default().fg(Color::DarkGray)),
]))
}
})
.collect();
let title = match app.library.sort_mode {
SortMode::ByArtist => {
let artist_name = app
.library
.artists
.get(app.library.artist_selected)
.map(|a| a.name.as_str())
.unwrap_or("—");
format!(" Альбомы и треки — {} ", artist_name)
}
SortMode::ByFilename => " Альбомы и треки ".into(),
};
let highlight = if app.active_panel == Panel::Right {
Style::default().add_modifier(Modifier::REVERSED)
} else {
Style::default().add_modifier(Modifier::DIM)
};
let mut list_state = ListState::default();
if !rows.is_empty() {
list_state.select(Some(app.library.right_selected));
}
let list = List::new(items)
@@ -74,55 +169,55 @@ fn draw_left_panel(f: &mut Frame, app: &App, area: Rect) {
f.render_stateful_widget(list, area, &mut list_state);
}
fn draw_right_panel(f: &mut Frame, app: &App, area: Rect) {
let indices = app.library.current_right_indices();
/// Цветной эквалайзер: 32 столбика с градиентом от синего к красному
fn draw_equalizer(f: &mut Frame, app: &App, area: Rect) {
let bars_data = app.player.spectrum.bars();
let num_bars = 32;
let items: Vec<ListItem> = indices
let mut display: Vec<f32> = Vec::with_capacity(num_bars);
for i in 0..num_bars {
let a = bars_data[i * 2];
let b = bars_data[i * 2 + 1];
display.push((a + b) / 2.0);
}
let bars: Vec<Bar> = display
.iter()
.map(|&idx| {
let is_playing = Some(idx) == app.playing_index;
let marker = if is_playing { "♪ " } else { " " };
let (title, num) = match app.library.track(idx) {
Some(t) => (
t.title.clone(),
t.track_number
.map(|n| format!("{:02}. ", n))
.unwrap_or_default(),
),
None => ("<unknown>".into(), String::new()),
};
let style = if is_playing {
Style::default().fg(Color::Green)
.enumerate()
.map(|(i, &v)| {
let ratio = i as f64 / (num_bars - 1).max(1) as f64;
let color = if ratio < 0.2 {
Color::Rgb(0, 100, 255)
} else if ratio < 0.4 {
Color::Rgb(0, 200, 255)
} else if ratio < 0.6 {
Color::Rgb(0, 255, 100)
} else if ratio < 0.8 {
Color::Rgb(255, 200, 0)
} else {
Style::default()
Color::Rgb(255, 50, 50)
};
ListItem::new(Line::from(vec![
Span::raw(marker),
Span::styled(format!("{}{}", num, title), style),
]))
Bar::default()
.value((v * 100.0) as u64)
.style(Style::default().fg(color))
})
.collect();
let highlight = if app.active_panel == Panel::Right {
Style::default().add_modifier(Modifier::REVERSED)
} else {
Style::default().add_modifier(Modifier::DIM)
};
let chart = BarChart::default()
.data(BarGroup::default().bars(&bars))
.bar_width(1)
.bar_gap(1)
.max(100)
.bar_set(ratatui::symbols::bar::NINE_LEVELS)
.block(
Block::default()
.borders(Borders::ALL)
.title(" Эквалайзер ")
.title_style(Style::default().fg(Color::Rgb(100, 149, 237))),
);
let mut list_state = ratatui::widgets::ListState::default();
if !indices.is_empty() {
list_state.select(Some(app.library.right_selected));
}
let list = List::new(items)
.block(Block::default().borders(Borders::ALL).title(" Треки "))
.highlight_style(highlight)
.highlight_symbol("> ");
f.render_stateful_widget(list, area, &mut list_state);
f.render_widget(chart, area);
}
fn draw_progress(f: &mut Frame, app: &App, area: Rect) {
@@ -148,32 +243,42 @@ fn draw_progress(f: &mut Frame, app: &App, area: Rect) {
f.render_widget(gauge, area);
}
fn draw_volume(f: &mut Frame, app: &App, area: Rect) {
let vol = app.player.volume();
let ratio = (vol as f64 / 2.0).clamp(0.0, 1.0);
let color = if vol > 1.0 {
Color::Yellow
} else if vol > 0.5 {
Color::Cyan
fn draw_status(f: &mut Frame, app: &App, area: Rect) {
let inner = Layout::default()
.direction(Direction::Horizontal)
.constraints([
Constraint::Min(1),
Constraint::Length(16),
Constraint::Length(12),
])
.split(area);
let (status_text, status_title) = if app.input_mode == InputMode::Search {
(format!("> {}", app.search_buffer), " Поиск ")
} else {
Color::Blue
(app.status.clone(), " Статус ")
};
let gauge = Gauge::default()
.block(
Block::default()
.borders(Borders::ALL)
.title(" Громкость (+/-) "),
)
.gauge_style(Style::default().fg(color))
.ratio(ratio)
.label(format!("{}%", (vol * 100.0) as u32));
let status = Paragraph::new(status_text)
.block(Block::default().borders(Borders::ALL).title(status_title));
f.render_widget(status, inner[0]);
f.render_widget(gauge, area);
}
let mode_str = match (app.repeat, app.shuffle) {
(RepeatMode::Off, false) => "".to_string(),
(RepeatMode::Off, true) => "SHUF".to_string(),
(RepeatMode::All, false) => "RPT ALL".to_string(),
(RepeatMode::One, false) => "RPT ONE".to_string(),
(RepeatMode::All, true) => "RPT+SHUF".to_string(),
(RepeatMode::One, true) => "ONE+SHUF".to_string(),
};
let mode = Paragraph::new(mode_str)
.alignment(Alignment::Center)
.block(Block::default().borders(Borders::ALL).title(" Mode "));
f.render_widget(mode, inner[1]);
fn draw_status(f: &mut Frame, app: &App, area: Rect) {
let status = Paragraph::new(app.status.as_str())
.block(Block::default().borders(Borders::ALL).title(" Статус "));
f.render_widget(status, area);
let vol_text = format!("vol: {}%", (app.player.volume() * 100.0) as u32);
let vol = Paragraph::new(vol_text)
.alignment(Alignment::Center)
.block(Block::default().borders(Borders::ALL).title(" Звук "));
f.render_widget(vol, inner[2]);
}