admin/ostiary
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 18 Wiki Activity

Various changes

Browse Source
This commit is contained in:
Uber Veng
2026-05-21 21:12:31 +07:00
parent 533df4a476
commit 56f08e36e6
10 changed files with 1010 additions and 618 deletions
Download Patch File Download Diff File Expand all files Collapse all files

363
src/ui.rs
View File

@@ -1,15 +1,19 @@
use crate::ansi;
use crate::executor;
use crate::app::{App, MessageLevel, Popup};
use ratatui::{
layout::{Alignment, Constraint, Direction, Layout, Rect},
style::{Color, Modifier, Style},
text::{Line, Span},
widgets::{Block, Borders, Clear, List, ListItem, Paragraph, Wrap},
widgets::{
Block, Borders, Clear, List, ListItem, ListState, Paragraph,
Scrollbar, ScrollbarOrientation, ScrollbarState, Wrap,
},
Frame,
};
pub fn render(f: &mut Frame, app: &mut App) {
let area = f.area(); // вместо f.size()
let area = f.area();
let chunks = Layout::default()
.direction(Direction::Vertical)
.margin(1)
@@ -20,7 +24,7 @@ pub fn render(f: &mut Frame, app: &mut App) {
render_description(f, app, chunks[1]);
if let Some(popup) = &mut app.popup {
render_popup(f, popup); // убрали параметр app
render_popup(f, popup);
}
}
@@ -51,7 +55,7 @@ fn render_menu(f: &mut Frame, app: &App, area: Rect) {
fn render_description(f: &mut Frame, app: &App, area: Rect) {
let text = if let Some(error) = &app.error {
format!("⚠️ Ошибка: {}", error)
format!("⚠️ Ошибка: {}", error)
} else if let Some(item) = app.selected_item() {
item.description.as_deref().unwrap_or("Нет описания").to_string()
} else {
@@ -65,24 +69,37 @@ fn render_description(f: &mut Frame, app: &App, area: Rect) {
fn render_popup(f: &mut Frame, popup: &mut Popup) {
let area = f.area();
let popup_area = centered_rect(60, 80, area);
let popup_area = centered_rect(80, 90, area);
f.render_widget(Clear, popup_area);
match popup {
Popup::Confirming { action: _, item_title, confirm_message } => {
let block = Block::default().borders(Borders::ALL).title("Подтверждение");
Popup::Confirming {
action: _,
item_title,
confirm_message,
} => {
let block = Block::default()
.borders(Borders::ALL)
.title("Подтверждение")
.border_style(Style::default().fg(Color::Yellow));
let text = if let Some(msg) = confirm_message {
vec![
Line::from(msg.as_str()),
Line::from(Span::raw(msg.as_str())),
Line::from(""),
Line::from("Нажмите Y для подтверждения, N для отмены"),
Line::from(Span::styled(
" [Y] Подтвердить [N / Esc] Отмена",
Style::default().fg(Color::Yellow),
)),
]
} else {
vec![
Line::from(format!("Запустить '{}'?", item_title)),
Line::from(Span::raw(format!("Запустить '{}'?", item_title))),
Line::from(""),
Line::from("Нажмите Y для подтверждения, N для отмены"),
Line::from(Span::styled(
" [Y] Подтвердить [N / Esc] Отмена",
Style::default().fg(Color::Yellow),
)),
]
};
let paragraph = Paragraph::new(text)
@@ -91,88 +108,116 @@ fn render_popup(f: &mut Frame, popup: &mut Popup) {
.wrap(Wrap { trim: true });
f.render_widget(paragraph, popup_area);
}
Popup::ExecutingStructured {
reply_tx: _,
kill_tx: _,
log_buffer,
current_command,
input_buffer,
menu_selected_index,
log_scroll_pos,
log_follow_bottom,
finished,
} => {
let cmd_height: u16 = match current_command {
Some(executor::StructuredCommand::Menu { options, .. }) => {
(options.len() as u16 + 2).min(14)
}
Some(_) => 5,
None => 0,
};
let chunks = Layout::default()
.direction(Direction::Vertical)
.margin(1)
.constraints([Constraint::Min(1), Constraint::Length(3)].as_ref())
.constraints([Constraint::Min(3), Constraint::Length(cmd_height)].as_ref())
.split(popup_area);
let log: Vec<ListItem> = log_buffer
.iter()
.rev()
.take(10)
.map(|line| ListItem::new(line.as_str()))
.collect();
let log_list = List::new(log)
.block(Block::default().borders(Borders::ALL).title("Вывод"));
f.render_widget(log_list, chunks[0]);
// ── Scrollable log ──────────────────────────────────────────────
let visible = chunks[0].height.saturating_sub(2) as usize;
let total = log_buffer.len();
if let Some(cmd) = current_command {
match cmd {
executor::StructuredCommand::Input { prompt, default: _, secret } => {
let input_style = if *secret {
Style::default().bg(Color::DarkGray)
} else {
Style::default()
};
let input = Paragraph::new(input_buffer.as_str())
.style(input_style)
.block(Block::default().borders(Borders::ALL).title(prompt.as_str()));
f.render_widget(input, chunks[1]);
let x = chunks[1].x + input_buffer.len() as u16 + 1;
let y = chunks[1].y + 1;
f.set_cursor_position((x, y));
}
executor::StructuredCommand::Menu { prompt, options } => {
let menu_text = options.iter().enumerate()
.map(|(i, opt)| format!("{}. {}", i+1, opt.label))
.collect::<Vec<_>>()
.join("\n");
let text = format!("{}\n\n{}", prompt, menu_text);
let paragraph = Paragraph::new(text)
.block(Block::default().borders(Borders::ALL).title("Меню"))
.wrap(Wrap { trim: true });
f.render_widget(paragraph, chunks[1]);
}
executor::StructuredCommand::Confirm { prompt } => {
let text = format!("{} (y/n)", prompt);
let paragraph = Paragraph::new(text)
.block(Block::default().borders(Borders::ALL).title("Подтверждение"))
.wrap(Wrap { trim: true });
f.render_widget(paragraph, chunks[1]);
}
executor::StructuredCommand::Message { level, text } => {
let color = match level {
executor::MessageLevel::Info => Color::Green,
executor::MessageLevel::Warn => Color::Yellow,
executor::MessageLevel::Error => Color::Red,
};
let paragraph = Paragraph::new(text.as_str())
.style(Style::default().fg(color))
.block(Block::default().borders(Borders::ALL).title("Сообщение"))
.wrap(Wrap { trim: true });
f.render_widget(paragraph, chunks[1]);
}
executor::StructuredCommand::Progress { percent, message } => {
let text = format!("{}% {}", percent, message.as_deref().unwrap_or(""));
let paragraph = Paragraph::new(text)
.block(Block::default().borders(Borders::ALL).title("Прогресс"))
.wrap(Wrap { trim: true });
f.render_widget(paragraph, chunks[1]);
}
}
// Clamp pos so we never show empty lines past the end.
let max_pos = total.saturating_sub(visible);
if *log_follow_bottom {
*log_scroll_pos = max_pos;
} else {
let empty = Paragraph::new("Ожидание команды...")
.block(Block::default().borders(Borders::ALL));
f.render_widget(empty, chunks[1]);
*log_scroll_pos = (*log_scroll_pos).min(max_pos);
}
let pos = *log_scroll_pos;
let start = pos;
let end = (start + visible).min(total);
let log_items: Vec<ListItem> = log_buffer[start..end]
.iter()
.map(|line| {
let spans: Vec<Span> = ansi::parse_line(line)
.into_iter()
.map(|(style, text)| Span::styled(text, style))
.collect();
ListItem::new(Line::from(spans))
})
.collect();
let at_bottom = pos >= max_pos;
let at_top = pos == 0;
let (title, border_color): (String, Color) = match finished {
Some(0) => (
" ✓ Завершено — Esc закрыть │ PgUp/↑↓ скролл ".to_string(),
Color::Green,
),
Some(code) => (
format!(" ✗ Ошибка (код {}) — Esc закрыть │ PgUp/↑↓ скролл ", code),
Color::Red,
),
None if at_top && at_bottom => (
" Выполняется… ".to_string(),
Color::DarkGray,
),
None if at_bottom => (
" Выполняется… │ PgUp/↑ прокрутить вверх ".to_string(),
Color::DarkGray,
),
None => (
format!(" Выполняется… │ {}/{} │ PgDn/↓ вниз ", pos + 1, total),
Color::Yellow,
),
};
let log_block = Block::default()
.borders(Borders::ALL)
.title(title.as_str())
.border_style(Style::default().fg(border_color));
f.render_widget(List::new(log_items).block(log_block), chunks[0]);
// ── Scrollbar ───────────────────────────────────────────────────
if total > visible {
let scrollbar = Scrollbar::default()
.orientation(ScrollbarOrientation::VerticalRight)
.begin_symbol(Some("▲"))
.end_symbol(Some("▼"))
.thumb_symbol("█");
let mut sb_state = ScrollbarState::new(max_pos).position(pos);
let sb_area = Rect {
x: chunks[0].x + chunks[0].width.saturating_sub(1),
y: chunks[0].y + 1,
width: 1,
height: chunks[0].height.saturating_sub(2),
};
f.render_stateful_widget(scrollbar, sb_area, &mut sb_state);
}
// ── Interactive command area ─────────────────────────────────────
if cmd_height > 0 {
if let Some(cmd) = current_command {
render_command(f, cmd, input_buffer, *menu_selected_index, chunks[1]);
}
}
}
Popup::Message { text, level } => {
let color = match level {
MessageLevel::Info => Color::Green,
@@ -189,18 +234,168 @@ fn render_popup(f: &mut Frame, popup: &mut Popup) {
.wrap(Wrap { trim: true });
f.render_widget(paragraph, popup_area);
}
_ => {}
}
}
fn render_command(
f: &mut Frame,
cmd: &executor::StructuredCommand,
input_buffer: &str,
menu_selected_index: usize,
area: Rect,
) {
match cmd {
executor::StructuredCommand::Input { prompt, secret, .. } => {
let display = if *secret {
"•".repeat(input_buffer.chars().count())
} else {
input_buffer.to_string()
};
let paragraph = Paragraph::new(display.as_str()).block(
Block::default()
.borders(Borders::ALL)
.title(format!(" {} ", prompt))
.border_style(Style::default().fg(Color::Cyan)),
);
f.render_widget(paragraph, area);
let cursor_x = (area.x + 1 + input_buffer.chars().count() as u16)
.min(area.x + area.width.saturating_sub(2));
f.set_cursor_position((cursor_x, area.y + 1));
}
executor::StructuredCommand::Menu { prompt, options } => {
let items: Vec<ListItem> = options
.iter()
.enumerate()
.map(|(i, opt)| {
if i == menu_selected_index {
ListItem::new(Line::from(vec![
Span::styled(" ▶ ", Style::default().fg(Color::Cyan)),
Span::styled(
opt.label.as_str(),
Style::default()
.bg(Color::Blue)
.add_modifier(Modifier::BOLD),
),
]))
} else {
ListItem::new(Line::from(vec![
Span::raw(" "),
Span::raw(opt.label.as_str()),
]))
}
})
.collect();
let mut state = ListState::default();
state.select(Some(menu_selected_index));
let list = List::new(items).block(
Block::default()
.borders(Borders::ALL)
.title(format!(" {} ", prompt))
.title_bottom(
Line::from(Span::styled(
" ↑↓ навигация Enter выбор ",
Style::default().fg(Color::DarkGray),
))
.alignment(Alignment::Right),
)
.border_style(Style::default().fg(Color::Cyan)),
);
f.render_stateful_widget(list, area, &mut state);
}
executor::StructuredCommand::Confirm { prompt } => {
let text = vec![
Line::from(Span::raw(prompt.as_str())),
Line::from(""),
Line::from(Span::styled(
" [Y] Да [N / Esc] Нет",
Style::default().fg(Color::Yellow),
)),
];
let paragraph = Paragraph::new(text)
.block(
Block::default()
.borders(Borders::ALL)
.title(" Подтверждение ")
.border_style(Style::default().fg(Color::Yellow)),
)
.wrap(Wrap { trim: true });
f.render_widget(paragraph, area);
}
executor::StructuredCommand::Message { level, text } => {
let color = match level {
executor::MessageLevel::Info => Color::Green,
executor::MessageLevel::Warn => Color::Yellow,
executor::MessageLevel::Error => Color::Red,
};
let lines = vec![
Line::from(Span::styled(text.as_str(), Style::default().fg(color))),
Line::from(""),
Line::from(Span::styled(
" Нажмите Enter для продолжения",
Style::default().fg(Color::DarkGray),
)),
];
let paragraph = Paragraph::new(lines)
.block(
Block::default()
.borders(Borders::ALL)
.title(" Сообщение ")
.border_style(Style::default().fg(color)),
)
.wrap(Wrap { trim: true });
f.render_widget(paragraph, area);
}
executor::StructuredCommand::Progress { percent, message } => {
let bar_width = area.width.saturating_sub(4) as usize;
let filled = (*percent as usize * bar_width) / 100;
let bar = format!(
"[{}{}] {}%",
"█".repeat(filled),
"░".repeat(bar_width.saturating_sub(filled)),
percent
);
let msg = message.as_deref().unwrap_or("");
let paragraph = Paragraph::new(vec![Line::from(bar), Line::from(msg)]).block(
Block::default()
.borders(Borders::ALL)
.title(" Прогресс ")
.border_style(Style::default().fg(Color::Cyan)),
);
f.render_widget(paragraph, area);
}
// Exec is handled by the main loop before rendering; this arm is
// never reached in practice but satisfies the exhaustiveness check.
executor::StructuredCommand::Exec { shell } => {
let paragraph = Paragraph::new(format!("Запуск: {}", shell))
.block(
Block::default()
.borders(Borders::ALL)
.title(" Внешнее приложение ")
.border_style(Style::default().fg(Color::Magenta)),
)
.wrap(Wrap { trim: true });
f.render_widget(paragraph, area);
}
}
}
fn centered_rect(percent_x: u16, percent_y: u16, r: Rect) -> Rect {
let popup_layout = Layout::default()
.direction(Direction::Vertical)
.constraints(
[
Constraint::Percentage((100 - percent_y) / 2),
Constraint::Percentage(percent_y),
Constraint::Percentage((100 - percent_y) / 2),
Constraint::Percentage((100 - percent_y) / 2),
Constraint::Percentage(percent_y),
Constraint::Percentage((100 - percent_y) / 2),
]
.as_ref(),
)
@@ -209,9 +404,9 @@ fn centered_rect(percent_x: u16, percent_y: u16, r: Rect) -> Rect {
.direction(Direction::Horizontal)
.constraints(
[
Constraint::Percentage((100 - percent_x) / 2),
Constraint::Percentage(percent_x),
Constraint::Percentage((100 - percent_x) / 2),
Constraint::Percentage((100 - percent_x) / 2),
Constraint::Percentage(percent_x),
Constraint::Percentage((100 - percent_x) / 2),
]
.as_ref(),
)