scoobs
/
cryptools-mirror
mirror of https://github.com/scoobybejesus/cryptools.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Refactor some ui while upgrading tui partway.

This commit is contained in:
scoobybejesus 2023-10-23 00:53:59 -04:00
parent d9a296a34e
commit 23ae25a1d5
5 changed files with 106 additions and 86 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
Cargo.lock generated
View File

@ -313,12 +313,6 @@ version = "0.15.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "77c90badedccf4105eca100756a0b1289e191f6fcbdadd3cee1d2f614f97da8f"
[[package]]
name = "either"
version = "1.9.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a26ae43d7bcc3b814de94796a5e736d4029efb0ee900c12e2d54c993ad1a1e07"
[[package]]
name = "endian-type"
version = "0.1.2"
@ -441,15 +435,6 @@ dependencies = [
"cc",
]
[[package]]
name = "itertools"
version = "0.8.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f56a2d0bc861f9165be4eb3442afd3c236d8a98afd426f65d92324ae1091a484"
dependencies = [
"either",
]
[[package]]
name = "itoa"
version = "1.0.9"
@ -990,15 +975,12 @@ dependencies = [
[[package]]
name = "tui"
version = "0.8.0"
version = "0.14.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "6b871b61f4c4b81e630215cd12e0ec29953d4545898e21a9e023b7520a74a9f9"
checksum = "9ced152a8e9295a5b168adc254074525c17ac4a83c90b2716274cc38118bddc9"
dependencies = [
"bitflags 1.3.2",
"cassowary",
"either",
"itertools",
"log",
"termion 1.5.5",
"unicode-segmentation",
"unicode-width",

2
Cargo.toml
View File

@ -26,7 +26,7 @@ rust_decimal_macros = "1.32.0"
chrono = { version = "0.4.31", features = ["serde"] }
structopt = "0.2.10"
rustyline = "12.0.0"
tui = { version = "0.8", optional = true, features = ['termion'] }
tui = { version = "0.14", optional = true, features = ['termion'] }
termion = { version = "2.0.1", optional = true }
dotenv = "0.15.0"

54
src/mytui/app.rs
View File

@ -7,6 +7,7 @@ use std::collections::HashMap;
use crptls::transaction::{Transaction, ActionRecord};
use crptls::account::{Account, RawAccount};
use crptls::core_functions::ImportProcessParameters;
use tui::widgets::ListState;
use crate::export::{export_csv, export_je, export_txt};
@ -24,36 +25,51 @@ pub (crate) const REPORTS: [&'static str; 11] = [
"11. TXT: Bookkeeping journal entries",
];
pub struct ListState<I> {
pub struct StatefulList<I> {
pub items: Vec<I>,
pub selected: usize,
pub state: ListState,
}
impl<I> ListState<I> {
impl<T> StatefulList<T> {
fn new(items: Vec<I>) -> ListState<I> {
ListState { items, selected: 0 }
fn new(items: Vec<T>) -> StatefulList<T> {
StatefulList { items, state: ListState::default() }
}
fn select_previous(&mut self) {
if self.selected > 0 {
self.selected -= 1;
let i = match self.state.selected() {
Some(i) => {
if i == 0 {
self.items.len() - 1
} else {
i - 1
}
}
None => 0,
};
self.state.select(Some(i));
}
fn select_next(&mut self) {
let i = match self.state.selected() {
Some(i) => {
if i >= self.items.len() - 1 {
0
} else {
i + 1
}
}
None => 0,
};
self.state.select(Some(i));
}
if self.selected < self.items.len() - 1 {
self.selected += 1
}
}
}
pub struct PrintWindow<'a> {
pub title: &'a str,
pub should_quit: bool,
pub tasks: ListState<&'a str>,
pub tasks: StatefulList<&'a str>,
pub to_print_by_idx: Vec<usize>,
pub to_print_by_title: Vec<&'a str>,
}
@ -61,10 +77,13 @@ pub struct PrintWindow<'a> {
impl<'a> PrintWindow<'a> {
pub fn new(title: &'a str) -> PrintWindow<'a> {
let mut tasks = StatefulList::new(REPORTS.to_vec());
tasks.state.select(Some(0));
PrintWindow {
title,
should_quit: false,
tasks: ListState::new(REPORTS.to_vec()),
tasks,
to_print_by_idx: Vec::with_capacity(REPORTS.len()),
to_print_by_title: Vec::with_capacity(REPORTS.len()),
}
@ -78,7 +97,7 @@ impl<'a> PrintWindow<'a> {
self.tasks.select_next();
}
pub fn on_key(&mut self, c: char) {
pub fn on_key(&mut self, c: char) -> Result<(), Box<dyn Error>> {
match c {
@ -90,7 +109,7 @@ impl<'a> PrintWindow<'a> {
self.should_quit = true;
}
'x' => {
let selected = self.tasks.selected;
let selected = self.tasks.state.selected().unwrap();
if self.to_print_by_idx.contains(&selected) {} else {
self.to_print_by_idx.push(selected);
self.to_print_by_title.push(self.tasks.items[selected])
@ -99,7 +118,7 @@ impl<'a> PrintWindow<'a> {
self.tasks.select_next();
}
'd' => {
let selected_idx = self.tasks.selected;
let selected_idx = self.tasks.state.selected().unwrap();
self.to_print_by_idx.retain(|&x| x != selected_idx );
let selected_str = self.tasks.items[selected_idx];
self.to_print_by_title.retain(|&x| x != selected_str );
@ -107,6 +126,7 @@ impl<'a> PrintWindow<'a> {
}
_ => {}
}
Ok(())
}
fn change_vecs_to_chrono_order(vec: &mut Vec<usize>, strvec: &mut Vec<&str>) {

4
src/mytui/print_menu_tui.rs
View File

@ -46,14 +46,14 @@ pub (crate) fn print_menu_tui(
loop {
ui::draw(&mut terminal, &app)?;
ui::draw(&mut terminal, &mut app)?;
if let Event::Input(key) = events.next()? {
match key {
Key::Char(c) => {
app.on_key(c);
app.on_key(c)?;
}
Key::Up => {
app.on_up();

94
src/mytui/ui.rs
View File

@ -5,30 +5,49 @@ use std::io;
use ::tui::Terminal;
use ::tui::style::{Color, Modifier, Style};
use ::tui::widgets::{Widget, Block, Borders, SelectableList, Text, Paragraph, List};
// use tui::widgets::ListState;
use ::tui::text::{Text, Span, Spans};
use tui::widgets::{Wrap, ListItem};
use ::tui::widgets::{
// Widget,
Block, Borders,
// SelectableList,
// Text,
Paragraph, List};
use ::tui::layout::{Layout, Constraint, Direction};
use ::tui::backend::Backend;
use crate::mytui::app::{PrintWindow, REPORTS};
pub fn draw<B: Backend>(terminal: &mut Terminal<B>, app: &PrintWindow) -> Result<(), io::Error> {
pub fn draw<B: Backend>(terminal: &mut Terminal<B>, app: &mut PrintWindow) -> Result<(), io::Error> {
terminal.draw(|mut f| {
terminal.draw(|f| {
let instructions = [
Text::raw("\nPress '"),
Text::styled("x", Style::default().fg(Color::Cyan).modifier(Modifier::BOLD)),
Text::raw("' to add the selected report to the list of reports to print/export.\n"),
Text::raw("\nPress '"),
Text::styled("d", Style::default().fg(Color::Yellow).modifier(Modifier::BOLD)),
Text::raw("' to delete the selected report from the list of reports to print/export.\n"),
Text::raw("\nPress '"),
Text::styled("p", Style::default().fg(Color::Green).modifier(Modifier::BOLD)),
Text::raw("' to print/export the selected reports.\n"),
Text::raw("\nPress '"),
Text::styled("q", Style::default().fg(Color::Red).modifier(Modifier::BOLD)),
Text::raw("' to quit without printing.\n\n"),
let instructions = vec![
Spans::from(vec![Span::raw("")]),
Spans::from(vec![
Span::raw("Press '"),
Span::styled("x", Style::default().fg(Color::Cyan).add_modifier(Modifier::BOLD)),
Span::raw("' to add the selected report to the list of reports to print/export."),
]),
Spans::from(vec![
Span::raw("Press '"),
Span::styled("d", Style::default().fg(Color::Yellow).add_modifier(Modifier::BOLD)),
Span::raw("' to delete the selected report from the list of reports to print/export."),
]),
Spans::from(vec![
Span::raw("Press '"),
Span::styled("p", Style::default().fg(Color::Green).add_modifier(Modifier::BOLD)),
Span::raw("' to print/export the selected reports."),
]),
Spans::from(vec![
Span::raw("Press '"),
Span::styled("q", Style::default().fg(Color::Red).add_modifier(Modifier::BOLD)),
Span::raw("' to quit without printing."),
]),
Spans::from(vec![Span::raw("")]),
Spans::from(vec![Span::raw("")]),
];
let rpts_to_prnt = app.to_print_by_title.iter().map(|&rpt_to_prnt| {
Text::styled(
@ -40,53 +59,52 @@ pub fn draw<B: Backend>(terminal: &mut Terminal<B>, app: &PrintWindow) -> Result
let top_level_chunks = Layout::default()
.constraints([
Constraint::Length(1),
Constraint::Length(2 + (instructions.len() as u16 / 3 * 2)), // 2 for title "Instructions", plus 3 TEXT array elements/instruction
Constraint::Length(instructions.len() as u16), // 2 for title "Instructions", plus 3 TEXT array elements/instruction
Constraint::Length(REPORTS.len() as u16 + 2),
Constraint::Length(rpts_to_prnt.len() as u16 + 2),
Constraint::Length(1),
].as_ref())
.split(f.size());
Paragraph::new(instructions.iter())
.block(
Block::default()
let pg1 = Paragraph::new(instructions)
.block(Block::default()
.borders(Borders::NONE)
.title("Instructions")
.title_style(Style::default().fg(Color::Blue).modifier(Modifier::BOLD).modifier(Modifier::UNDERLINED)),
.title_style(Style::default().fg(Color::LightMagenta).add_modifier(Modifier::BOLD).add_modifier(Modifier::UNDERLINED)),
)
.wrap(true)
.render(&mut f, top_level_chunks[1]);
.wrap(Wrap {trim: true});
f.render_widget(pg1, top_level_chunks[1]);
let level_2_chunks = Layout::default()
.constraints([Constraint::Percentage(10), Constraint::Percentage(80),Constraint::Percentage(10),].as_ref())
.direction(Direction::Horizontal)
.split(top_level_chunks[2]);
SelectableList::default()
.block(
Block::default()
let items: Vec<_> = app.tasks.items.iter().map(|i| ListItem::new(*i)).collect();
// app.tasks.state.select(Some(0));
let items = List::new(items)
.block(Block::default()
.borders(Borders::ALL)
.title("Reports available for exporting")
.title_style(Style::default().fg(Color::White).modifier(Modifier::BOLD).modifier(Modifier::UNDERLINED))
.title_style(Style::default().fg(Color::White).add_modifier(Modifier::BOLD).add_modifier(Modifier::UNDERLINED))
)
.items(&app.tasks.items)
.select(Some(app.tasks.selected))
.highlight_style(Style::default().fg(Color::Yellow).modifier(Modifier::BOLD))
.highlight_symbol(">")
.render(&mut f, level_2_chunks[1]);
.highlight_style(Style::default().fg(Color::Yellow).add_modifier(Modifier::BOLD))
.highlight_symbol(">");
f.render_stateful_widget(items, level_2_chunks[1], &mut app.tasks.state);
let level_2_chunks = Layout::default()
.constraints([Constraint::Percentage(10), Constraint::Percentage(80),Constraint::Percentage(10),].as_ref())
.direction(Direction::Horizontal)
.split(top_level_chunks[3]);
List::new(rpts_to_prnt)
.block(
Block::default()
let rpts_to_prnt: Vec<_> = app.to_print_by_title.iter().map(|i| ListItem::new(*i)).collect();
let to_print = List::new(rpts_to_prnt)
.block(Block::default()
.borders(Borders::ALL)
.title("Reports to be exported")
.title_style(Style::default().fg(Color::LightYellow).modifier(Modifier::BOLD).modifier(Modifier::UNDERLINED))
)
.render(&mut f, level_2_chunks[1]);
.title_style(Style::default().fg(Color::LightYellow).add_modifier(Modifier::BOLD).add_modifier(Modifier::UNDERLINED))
);
f.render_widget(to_print, level_2_chunks[1])
})
}