organized

This commit is contained in:
2025-11-10 15:34:25 -07:00
parent 8f5cc7f949
commit 6ed6cbfd62
6 changed files with 441 additions and 407 deletions

287
src/app/app.rs Normal file
View File

@@ -0,0 +1,287 @@
use std::{io, path::PathBuf};
use ratatui::{DefaultTerminal, Frame, crossterm::event, layout::{self, Constraint, Layout, Rect}, prelude, style::{Color, Modifier, Style}, widgets::{Paragraph, Widget}};
use crate::app::{calc::{Grid, LEN}, mode::Mode};
pub struct App {
exit: bool,
pub grid: Grid,
pub mode: Mode,
file: Option<PathBuf>,
}
impl Widget for &App {
fn render(self, area: prelude::Rect, buf: &mut prelude::Buffer) {
let len = LEN as u16;
let cell_height = 1;
let cell_length = 5;
let x_max = if area.width / cell_length > len {
len - 1
} else {
area.width / cell_length
};
let y_max = if area.height / cell_height > len {
len - 1
} else {
area.height / cell_height
};
for x in 0..x_max {
for y in 0..y_max {
let mut display = String::new();
let mut style = Style::new().fg(Color::White);
const ORANGE1: Color = Color::Rgb(200, 160, 0);
const ORANGE2: Color = Color::Rgb(180, 130, 0);
match (x == 0, y == 0) {
(true, true) => {
let (x,y) = self.grid.selected_cell;
let c = Grid::num_to_char(x);
display = format!("{y}{c}", );
style = Style::new().fg(Color::Green).bg(Color::Black);
},
(true, false) => {
// row names
display = y.to_string();
let bg = if y%2==0 {
ORANGE1
} else {
ORANGE2
};
style = Style::new().fg(Color::White).bg(bg);
},
(false, true) => {
// column names
display = Grid::num_to_char(x as usize -1);
let bg = if x%2==0 {
ORANGE1
} else {
ORANGE2
};
style = Style::new().fg(Color::White).bg(bg)
},
(false, false) => {
// minus 1 because of header cells
let x_idx = x as usize -1;
let y_idx = y as usize -1;
if let Some(cell) = self.grid.get_cell_raw(x_idx, y_idx) {
display = cell.as_raw_string();
if cell.can_be_number() {
if let Some(val) = self.grid.evaluate(&cell.as_raw_string()) {
display = val.to_string();
style = Style::new().underline_color(Color::DarkGray).add_modifier(Modifier::UNDERLINED);
} else {
// broken formulas
if cell.is_equation() {
style = Style::new().underline_color(Color::Red).add_modifier(Modifier::UNDERLINED)
}
}
}
}
if (x_idx, y_idx) == self.grid.selected_cell {
style = Style::new()
.fg(Color::Black)
.bg(Color::White);
// modify the style of the cell you are editing
if let Mode::Insert(_) = self.mode {
style = style.add_modifier(Modifier::ITALIC).add_modifier(Modifier::BOLD);
}
}
}
}
let area = Rect::new(
area.x + (x * cell_length),
area.y + (y * cell_height),
cell_length,
cell_height,
);
Paragraph::new(display).style(style).render(area, buf);
}
}
}
}
impl App {
pub fn new() -> Self {
Self {
exit: false,
grid: Grid::new(),
mode: Mode::Normal,
file: None,
}
}
pub fn run(&mut self, mut term: DefaultTerminal) -> Result<(), std::io::Error> {
while !self.exit {
term.draw(|frame| self.draw(frame))?;
self.handle_events()?;
}
Ok(())
}
fn draw(&self, frame: &mut Frame) {
let layout = Layout::default()
.direction(layout::Direction::Vertical)
.constraints([Constraint::Length(1), Constraint::Min(1), Constraint::Length(1)])
.split(frame.area());
let bottom_split = Layout::default()
.direction(layout::Direction::Horizontal)
.constraints([Constraint::Percentage(50), Constraint::Percentage(50)])
.split(layout[2]);
match &self.mode {
Mode::Insert(editor) => {
frame.render_widget(editor, layout[0]);
}
Mode::Command(editor) => {
frame.render_widget(editor, bottom_split[0]);
}
Mode::Chord(chord) => frame.render_widget(chord, bottom_split[0]),
Mode::Normal => frame.render_widget(
Paragraph::new({
let (x, y) = self.grid.selected_cell;
let cell = self.grid.get_cell_raw(x, y).as_ref().map(|f| f.as_raw_string()).unwrap_or_default();
cell
}),
layout[0],
),
Mode::Visual(start_pos) => {}
}
frame.render_widget(self, layout[1]);
frame.render_widget(&self.mode, bottom_split[1]);
}
fn handle_events(&mut self) -> io::Result<()> {
match &mut self.mode {
Mode::Chord(chord) => match event::read()? {
event::Event::Key(key) => match key.code {
event::KeyCode::Esc => self.mode = Mode::Normal,
event::KeyCode::Char(c) => {
chord.add_char(c);
match chord.as_string()[0..chord.as_string().len() - 1].parse::<usize>() {
Ok(num) => match c {
'G' => {
let sel = self.grid.selected_cell;
self.grid.selected_cell = (sel.0, num);
self.mode = Mode::Normal;
}
_ => {
if c.is_alphabetic() {
self.mode = Mode::Normal;
for _ in 0..num {
Mode::process_key(self, c);
}
}
}
},
Err(_) => match chord.as_string().as_str() {
"d " | "dw" => {
let loc = self.grid.selected_cell;
self.grid.set_cell_raw(loc, String::new());
self.mode = Mode::Normal;
}
_ => {}
},
}
}
event::KeyCode::Backspace => {
chord.backspace();
}
_ => {}
},
_ => {}
},
Mode::Insert(editor) => match event::read()? {
event::Event::Key(key) => match key.code {
event::KeyCode::Esc => {
// just cancel the operation
self.mode = Mode::Normal;
}
event::KeyCode::Enter => {
let v = editor.buf.trim().to_string();
if let Ok(v) = v.parse::<f64>() {
self.grid.set_cell_raw(editor.location, v);
} else {
self.grid.set_cell_raw(editor.location, v);
}
self.mode = Mode::Normal;
}
event::KeyCode::Backspace => {
editor.buf.pop();
}
event::KeyCode::Char(c) => {
editor.buf += &c.to_string();
}
_ => {}
},
_ => {}
},
Mode::Normal => match event::read()? {
event::Event::Key(key_event) => match key_event.code {
event::KeyCode::F(_) => todo!(),
event::KeyCode::Char(c) => {
Mode::process_key(self, c);
}
_ => todo!(),
},
_ => todo!(),
},
Mode::Visual(start_pos) => {
if let event::Event::Key(key) = event::read()? {
match key.code {
event::KeyCode::Char(c) => {
Mode::process_key(self, c);
todo!();
}
event::KeyCode::Esc => self.mode = Mode::Normal,
_ => {}
}
}
}
Mode::Command(editor) => match event::read()? {
event::Event::Key(key) => match key.code {
event::KeyCode::Esc => {
// just cancel the operation
self.mode = Mode::Normal;
}
event::KeyCode::Enter => {
// [':', 'q']
match editor.as_string().as_bytes()[1] as char {
'w' => {}
'q' => self.exit = true,
_ => {}
}
self.mode = Mode::Normal;
}
event::KeyCode::Backspace => {
editor.backspace();
}
event::KeyCode::Char(c) => {
editor.add_char(c);
}
_ => {}
},
_ => {}
},
}
Ok(())
}
}

248
src/app/calc.rs Normal file
View File

@@ -0,0 +1,248 @@
use std::fmt::Display;
use evalexpr::*;
use crate::ctx;
// if this is very large at all it will overflow the stack
pub const LEN: usize = 100;
pub struct Grid {
// a b c ...
// 0
// 1
// 2
// ...
cells: [[Option<Box<dyn Cell>>; LEN]; LEN],
/// (X, Y)
pub selected_cell: (usize, usize),
}
impl std::fmt::Debug for Grid {
fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
f.debug_struct("Grid")
.field("cells", &"Too many to print")
.finish()
}
}
impl Grid {
pub fn new() -> Self {
// TODO this needs to be moved to the heap
let b: [[Option<Box<dyn Cell>>; LEN]; LEN] =
core::array::from_fn(|_| core::array::from_fn(|_| None));
Self {
cells: b,
selected_cell: (0, 0),
}
}
pub fn evaluate(&self, mut eq: &str) -> Option<f64> {
if eq.starts_with('=') {
eq = &eq[1..];
} else {
// Should be evaluating an equation
return None
}
let ctx = ctx::CallbackContext::new(&self);
// let mut ctx = HashMapContext::<DefaultNumericTypes>::new();
match eval_with_context(eq, &ctx) {
Ok(e) => {
let val = e.as_float().expect("Should be float");
return Some(val);
}
Err(e) => match e {
EvalexprError::VariableIdentifierNotFound(_e) => {
// panic!("Will not be able to parse this equation, cell {e} not found")
return None
}
_ => panic!("{}", e),
},
}
}
fn parse_to_idx(i: &str) -> (usize, usize) {
let chars = i
.chars()
.take_while(|c| c.is_alphabetic())
.collect::<Vec<char>>();
let nums = i
.chars()
.skip(chars.len())
.take_while(|c| c.is_numeric())
.collect::<String>();
// get the x index from the chars
let x_idx = chars
.iter()
.enumerate()
.map(Self::char_to_idx)
.fold(0, |a, b| a + b);
// get the y index from the numbers
let y_idx = nums
.parse::<usize>()
.expect("Got non-number character after sorting for just numeric characters");
(x_idx, y_idx)
}
pub fn set_cell<T: Into<Box<dyn Cell>>>(&mut self, cell_id: &str, val: T) {
let loc = Self::parse_to_idx(cell_id);
self.set_cell_raw(loc, val);
}
pub fn set_cell_raw<T: Into<Box<dyn Cell>>>(&mut self, (x,y): (usize, usize), val: T) {
// TODO check oob
self.cells[x][y] = Some(val.into());
}
/// Get cells via text like:
/// A6,
/// F0,
/// etc
pub fn get_cell(&self, cell_id: &str) -> &Option<Box<dyn Cell>> {
let (x, y) = Self::parse_to_idx(cell_id);
self.get_cell_raw(x, y)
}
pub fn get_cell_raw(&self, x: usize, y: usize) -> &Option<Box<dyn Cell>> {
// TODO check oob
&self.cells[x][y]
}
// this function has unit tests
fn char_to_idx((idx, c): (usize, &char)) -> usize {
(c.to_ascii_lowercase() as usize - 97) + 26 * idx
}
pub fn num_to_char(idx: usize) -> String {
/*
A = 0
AA = 26
AAA = Not going to worry about it yet
*/
let mut word: [char; 2] = [' '; 2];
if idx >= 26 {
word[0]= ((idx/26) + 65 -1) as u8 as char;
}
word[1]= ((idx%26) + 65) as u8 as char;
word.iter().collect()
}
}
impl Default for Grid {
fn default() -> Self {
Self::new()
}
}
pub trait Cell {
/// Important! This is IS NOT the return value of an equation.
/// This is the raw equation it's self.
fn as_raw_string(&self) -> String;
fn can_be_number(&self) -> bool;
fn as_num(&self) -> f64;
fn is_equation(&self) -> bool {
self.as_raw_string().starts_with('=')
}
}
impl Display for dyn Cell {
fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
let disp = if self.can_be_number() {
self.as_num().to_string()
} else {
self.as_raw_string()
};
write!(f, "{disp}")
}
}
impl Cell for f64 {
fn as_raw_string(&self) -> String {
ToString::to_string(self)
}
fn can_be_number(&self) -> bool {
true
}
fn as_num(&self) -> f64 {
*self
}
}
impl Into<Box<dyn Cell>> for f64 {
fn into(self) -> Box<dyn Cell> {
Box::new(self)
}
}
impl Into<Box<dyn Cell>> for String {
fn into(self) -> Box<dyn Cell> {
Box::new(self)
}
}
impl Cell for String {
fn as_raw_string(&self) -> String {
ToString::to_string(self)
}
fn can_be_number(&self) -> bool {
// checking if the string is an equation
self.starts_with('=')
}
fn as_num(&self) -> f64 {
unimplemented!("&str cannot be used in a numeric context")
}
}
#[test]
fn test_cells() {
let mut grid = Grid::new();
assert!(&grid.cells[0][0].is_none());
grid.set_cell("A0", "Hello".to_string());
assert!(grid.get_cell("A0").is_some());
assert_eq!(
grid.get_cell("A0").as_ref().unwrap().as_raw_string(),
String::from("Hello")
);
}
#[test]
fn c_to_i() {
assert_eq!(Grid::char_to_idx((0, &'a')), 0);
assert_eq!(Grid::char_to_idx((0, &'A')), 0);
assert_eq!(Grid::char_to_idx((0, &'z')), 25);
assert_eq!(Grid::char_to_idx((0, &'Z')), 25);
assert_eq!(Grid::char_to_idx((1, &'a')), 26);
assert_eq!(Grid::parse_to_idx("A0"), (0, 0));
assert_eq!(Grid::parse_to_idx("AA0"), (26, 0));
assert_eq!(Grid::parse_to_idx("A1"), (0, 1));
assert_eq!(Grid::parse_to_idx("A10"), (0, 10));
assert_eq!(Grid::parse_to_idx("Aa10"), (26, 10));
}
#[test]
fn i_to_c() {
assert_eq!(Grid::num_to_char(0).trim(), "A");
assert_eq!(Grid::num_to_char(25).trim(), "Z");
assert_eq!(Grid::num_to_char(26), "AA");
assert_eq!(Grid::num_to_char(51), "AZ");
assert_eq!(Grid::num_to_char(701), "ZZ");
}

3
src/app/mod.rs Normal file
View File

@@ -0,0 +1,3 @@
pub mod app;
pub mod calc;
pub mod mode;

139
src/app/mode.rs Normal file
View File

@@ -0,0 +1,139 @@
use std::fmt::Display;
use ratatui::{
layout::Rect,
prelude,
widgets::{Paragraph, Widget},
};
use crate::app::app::App;
pub enum Mode {
Insert(Editor),
Chord(Chord),
Normal,
Command(Chord),
Visual((usize, usize)),
}
impl Widget for &Mode {
fn render(self, area: Rect, buf: &mut prelude::Buffer) {
Paragraph::new(self.to_string()).render(area, buf);
}
}
impl Display for Mode {
fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
match self {
Mode::Normal => write!(f, "-- NORMAL --"),
Mode::Insert(_) => write!(f, "-- INSERT --"),
Mode::Chord(_) => write!(f, "-- CHORD --"),
Mode::Command(_) => write!(f, "-- COMMAND --"),
Mode::Visual(_) => write!(f, "-- VISUAL --"),
}
}
}
impl Mode {
pub fn process_key(app: &mut App, key: char) {
match key {
// <
'h' => {
app.grid.selected_cell.0 = app.grid.selected_cell.0.saturating_sub(1);
return;
}
// v
'j' => {
app.grid.selected_cell.1 = app.grid.selected_cell.1.saturating_add(1);
return;
}
// ^
'k' => {
app.grid.selected_cell.1 = app.grid.selected_cell.1.saturating_sub(1);
return;
}
// >
'l' => {
app.grid.selected_cell.0 = app.grid.selected_cell.0.saturating_add(1);
return;
}
_ => {}
}
if let Mode::Normal = app.mode {
match key {
// edit cell
'i' | 'a' => {
let (x, y) = app.grid.selected_cell;
let val = app.grid.get_cell_raw(x, y).as_ref().map(|f| f.as_raw_string()).unwrap_or(String::new());
app.mode = Mode::Insert(Editor::new(val, (x, y)));
}
'I' => { /* insert col before */ }
'A' => { /* insert col after */ }
'o' => { /* insert row below */ }
'O' => { /* insert row above */ }
'v' => app.mode = Mode::Visual(app.grid.selected_cell),
':' => app.mode = Mode::Command(Chord::new(':')),
// loose chars will put you into chord mode
c => app.mode = Mode::Chord(Chord::new(c)),
}
}
}
}
pub struct Editor {
pub buf: String,
cursor: usize,
pub location: (usize, usize),
}
impl Editor {
fn new(value: String, loc: (usize, usize)) -> Self {
Self {
buf: value.to_string(),
cursor: value.len(),
location: loc,
}
}
}
impl Widget for &Editor {
fn render(self, area: prelude::Rect, buf: &mut prelude::Buffer) {
// TODO add visual cursor
Paragraph::new(self.buf.clone()).render(area, buf);
}
}
pub struct Chord {
buf: Vec<char>,
}
impl Chord {
pub fn new(inital: char) -> Self {
let mut buf = Vec::new();
buf.push(inital);
Self {
buf,
}
}
pub fn backspace(&mut self) {
self.buf.pop();
}
pub fn add_char(&mut self, c: char) {
self.buf.push(c)
}
pub fn as_string(&self) -> String {
self.buf.iter().collect()
}
}
impl Widget for &Chord {
fn render(self, area: prelude::Rect, buf: &mut prelude::Buffer) {
Paragraph::new(self.buf.iter().collect::<String>()).render(area, buf);
}
}