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-17 15:36:45 +02:00
parent 4c742ea210
commit 52ca495a6e
5 changed files with 191 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

115
src/ui.rs
View File

@@ -8,27 +8,24 @@ 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), // статус + время + mode + vol
Constraint::Length(3),
])
.split(f.area());
// Горизонтально: левая колонка (исполнители + эквалайзер) и правая (треки)
let top = Layout::default()
.direction(Direction::Horizontal)
.constraints([Constraint::Percentage(30), Constraint::Percentage(70)])
.split(chunks[0]);
// Левая колонка делится вертикально: список сверху, эквалайзер снизу
let left_col = Layout::default()
.direction(Direction::Vertical)
.constraints([
Constraint::Min(1),
Constraint::Length(8), // эквалайзер
Constraint::Length(8),
])
.split(top[0]);
@@ -40,6 +37,9 @@ pub fn draw(f: &mut Frame, app: &mut App) {
if app.show_help {
draw_help(f, f.area());
}
if app.show_dirs {
draw_dirs(f, app, f.area());
}
}
fn draw_left_panel(f: &mut Frame, app: &mut App, area: Rect) {
@@ -65,11 +65,13 @@ fn draw_left_panel(f: &mut Frame, app: &mut App, area: Rect) {
};
app.library.left_state.select(sel);
let title = match app.library.sort_mode {
let title_text = match app.library.sort_mode {
SortMode::ByArtist => " Исполнители ",
SortMode::ByAlbum => " Альбомы ",
SortMode::ByFilename => " Источник ",
};
let album_color = Color::Rgb(100, 149, 237);
let title = Span::styled(title_text, Style::default().fg(album_color));
let list = List::new(items)
.block(Block::default().borders(Borders::ALL).title(title))
@@ -175,7 +177,7 @@ fn draw_right_panel(f: &mut Frame, app: &mut App, area: Rect) {
.map(|a| a.name.as_str())
.unwrap_or("—");
let title = match app.library.sort_mode {
let title_text = match app.library.sort_mode {
SortMode::ByArtist => {
if app.library.filter.is_empty() {
format!(" Альбомы и треки - {} ", selected_name)
@@ -204,6 +206,8 @@ fn draw_right_panel(f: &mut Frame, app: &mut App, area: Rect) {
}
}
};
let album_color = Color::Rgb(100, 149, 237);
let title = Span::styled(title_text, Style::default().fg(album_color));
let highlight = if app.active_panel == Panel::Right {
Style::default().add_modifier(Modifier::REVERSED)
@@ -227,14 +231,11 @@ fn draw_right_panel(f: &mut Frame, app: &mut App, area: Rect) {
}
fn draw_equalizer(f: &mut Frame, app: &App, area: Rect) {
// Внутренняя ширина панели (минус 2 символа рамки)
let inner_width = area.width.saturating_sub(2) as usize;
let inner_width = area.width.saturating_sub(1) as usize;
if inner_width == 0 {
return;
}
// Каждый столбик занимает 2 ячейки: 1 символ + 1 gap.
// Значит число столбиков = ширина / 2.
let num_bars = (inner_width / 2).max(4);
let bars_data = app.player.spectrum.bars();
@@ -298,7 +299,12 @@ fn draw_status(f: &mut Frame, app: &App, area: Rect) {
};
let status = Paragraph::new(status_text)
.block(Block::default().borders(Borders::ALL).title(status_title));
.block(
Block::default()
.borders(Borders::ALL)
.title(status_title)
.title_style(Style::default().fg(Color::Rgb(100, 149, 237)))
);
f.render_widget(status, inner[0]);
let (pos, total) = app.progress();
@@ -311,7 +317,12 @@ fn draw_status(f: &mut Frame, app: &App, area: Rect) {
);
let time = Paragraph::new(time_text)
.alignment(Alignment::Center)
.block(Block::default().borders(Borders::ALL).title(" Время "));
.block(
Block::default()
.borders(Borders::ALL)
.title(" Время ")
.title_style(Style::default().fg(Color::Rgb(100, 149, 237)))
);
f.render_widget(time, inner[1]);
let mode_str = match (app.repeat, app.shuffle) {
@@ -324,19 +335,90 @@ fn draw_status(f: &mut Frame, app: &App, area: Rect) {
};
let mode = Paragraph::new(mode_str)
.alignment(Alignment::Center)
.block(Block::default().borders(Borders::ALL).title(" Mode "));
.block(
Block::default()
.borders(Borders::ALL)
.title(" Pежим ")
.title_style(Style::default().fg(Color::Rgb(100, 149, 237)))
);
f.render_widget(mode, inner[2]);
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(" "));
.block(
Block::default()
.borders(Borders::ALL)
.title(" Звук ")
.title_style(Style::default().fg(Color::Rgb(100, 149, 237)))
);
f.render_widget(vol, inner[3]);
}
fn draw_dirs(f: &mut Frame, app: &App, screen: Rect) {
let width = 70u16.min(screen.width.saturating_sub(4));
let total_lines = app.extra_dirs().len() + 8;
let desired_height = (total_lines + 2) as u16; // +2 на рамки
// Ограничиваем высотой экрана
let max_h = screen.height.saturating_sub(2);
let height = desired_height.min(max_h).max(5); // минимум 5 строк
let x = (screen.width.saturating_sub(width)) / 2;
let y = (screen.height.saturating_sub(height)) / 2;
let area = Rect::new(x, y, width, height);
f.render_widget(Clear, area);
let title_color = Style::default().fg(Color::Rgb(100, 149, 237));
let header = Style::default()
.fg(Color::Yellow)
.add_modifier(Modifier::BOLD);
let dim = Style::default().fg(Color::DarkGray);
let mut lines = vec![
Line::from(Span::styled(
" Директории библиотеки ",
title_color.add_modifier(Modifier::BOLD),
)),
Line::from(""),
Line::from(Span::styled(" Базовые", header)),
Line::from(vec![
Span::styled(" [0] ", dim),
Span::raw(app.base_dir()),
]),
];
if !app.extra_dirs().is_empty() {
lines.push(Line::from(""));
lines.push(Line::from(Span::styled(" Дополнительные (:add)", header)));
for (i, dir) in app.extra_dirs().iter().enumerate() {
lines.push(Line::from(vec![
Span::styled(format!(" [{}] ", i + 1), dim),
Span::raw(dir.clone()),
]));
}
}
lines.push(Line::from(""));
lines.push(Line::from(Span::styled(
" :rmdir <N> — удалить, :clear — очистить всё, Esc — закрыть",
dim,
)));
let para = Paragraph::new(lines).block(
Block::default()
.borders(Borders::ALL)
.border_style(title_color)
.title(" Библиотека "),
);
f.render_widget(para, area);
}
fn draw_help(f: &mut Frame, screen: Rect) {
let width = 62u16.min(screen.width.saturating_sub(4));
let height = 40u16.min(screen.height.saturating_sub(4));
let height = 44u16.min(screen.height.saturating_sub(4));
let x = (screen.width.saturating_sub(width)) / 2;
let y = (screen.height.saturating_sub(height)) / 2;
@@ -380,6 +462,7 @@ fn draw_help(f: &mut Frame, screen: Rect) {
Line::from(" :add <путь> добавить директорию"),
Line::from(" :reload пересканировать всё"),
Line::from(" :save сохранить библиотеку"),
Line::from(" :dirs управление директориями"),
Line::from(" :help эта справка"),
Line::from(" :q выход"),
Line::from(""),