From c52b7c16f21328598a11012170cc7be67a5fb608 Mon Sep 17 00:00:00 2001 From: James Norcutt Date: Sat, 21 Mar 2026 14:15:17 +0000 Subject: [PATCH] another commit --- Cargo.lock | 98 ++++++++++++++++++++++++++++++++++++++++++++++++++++- Cargo.toml | 3 +- src/app.rs | 77 ++++++++++++++++++++++++++++++++++------- src/main.rs | 36 +++++++++++++++----- 4 files changed, 192 insertions(+), 22 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 4281d20..c7c5971 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -17,6 +17,56 @@ version = "0.2.21" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "683d7910e743518b0e34f1186f92494becacb047c7b6bf616c96772180fef923" +[[package]] +name = "anstream" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "824a212faf96e9acacdbd09febd34438f8f711fb84e09a8916013cd7815ca28d" +dependencies = [ + "anstyle", + "anstyle-parse", + "anstyle-query", + "anstyle-wincon", + "colorchoice", + "is_terminal_polyfill", + "utf8parse", +] + +[[package]] +name = "anstyle" +version = "1.0.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "940b3a0ca603d1eade50a4846a2afffd5ef57a9feac2c0e2ec2e14f9ead76000" + +[[package]] +name = "anstyle-parse" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "52ce7f38b242319f7cabaa6813055467063ecdc9d355bbb4ce0c68908cd8130e" +dependencies = [ + "utf8parse", +] + +[[package]] +name = "anstyle-query" +version = "1.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "40c48f72fd53cd289104fc64099abca73db4166ad86ea0b4341abe65af83dadc" +dependencies = [ + "windows-sys", +] + +[[package]] +name = "anstyle-wincon" +version = "3.0.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "291e6a250ff86cd4a820112fb8898808a366d8f9f58ce16d1f538353ad55747d" +dependencies = [ + "anstyle", + "once_cell_polyfill", + "windows-sys", +] + [[package]] name = "anyhow" version = "1.0.102" @@ -113,6 +163,39 @@ version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "613afe47fcd5fac7ccf1db93babcb082c5994d996f20b8b159f2ad1658eb5724" +[[package]] +name = "clap" +version = "4.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b193af5b67834b676abd72466a96c1024e6a6ad978a1f484bd90b85c94041351" +dependencies = [ + "clap_builder", +] + +[[package]] +name = "clap_builder" +version = "4.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "714a53001bf66416adb0e2ef5ac857140e7dc3a0c48fb28b2f10762fc4b5069f" +dependencies = [ + "anstream", + "anstyle", + "clap_lex", + "strsim", +] + +[[package]] +name = "clap_lex" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c8d4a3bb8b1e0c1050499d1815f5ab16d04f0959b233085fb31653fbfc9d98f9" + +[[package]] +name = "colorchoice" +version = "1.0.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1d07550c9036bf2ae0c684c4297d503f838287c83c53686d05370d0e139ae570" + [[package]] name = "compact_str" version = "0.9.0" @@ -477,6 +560,12 @@ dependencies = [ "syn 2.0.117", ] +[[package]] +name = "is_terminal_polyfill" +version = "1.70.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a6cb138bb79a146c1bd460005623e142ef0181e3d0219cb493e02f7d08a35695" + [[package]] name = "itertools" version = "0.14.0" @@ -517,9 +606,10 @@ dependencies = [ name = "klipper-tui" version = "0.1.0" dependencies = [ + "clap", "crossterm", "ratatui", - "ratatui-crossterm", + "serde_json", ] [[package]] @@ -704,6 +794,12 @@ version = "1.21.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9f7c3e4beb33f85d45ae3e3a1792185706c8e16d043238c593331cc7cd313b50" +[[package]] +name = "once_cell_polyfill" +version = "1.70.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "384b8ab6d37215f3c5301a95a4accb5d64aa607f1fcb26a11b5303878451b4fe" + [[package]] name = "ordered-float" version = "4.6.0" diff --git a/Cargo.toml b/Cargo.toml index 7c86719..26fdbb4 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -6,4 +6,5 @@ edition = "2024" [dependencies] ratatui = "0.30.0" crossterm = "0.29.0" -ratatui-crossterm = "0.1.0" +clap = "4.6.0" +serde_json = "1.0.149" diff --git a/src/app.rs b/src/app.rs index 59be771..9b4eec6 100644 --- a/src/app.rs +++ b/src/app.rs @@ -1,19 +1,72 @@ -pub enum CurrentScreen { - Main, - Editing, - Exiting, +use std::collections::HashMap; + +pub struct TabsState<'a> { + pub titles: Vec<&'a str>, + pub index: usize, } -pub enum CurrentlyEditing { - Key, - Value, +impl<'a> TabsState<'a> { + pub const fn new(titles: Vec<&'a str>) -> Self { + Self { titles, index: 0 } + } + pub fn next(&mut self) { + self.index = (self.index + 1) % self.titles.len(); + } + + pub fn previous(&mut self) { + if self.index > 0 { + self.index -= 1; + } else { + self.index = self.titles.len() - 1; + } + } } pub struct App { - pub key_input: String, // the currently being edited json key. - pub value_input: String, // the currently being edited json value. - pub pairs: HashMap, // The representation of our key and value pairs with serde Serialize support - pub current_screen: CurrentScreen, // the current screen the user is looking at, and will later determine what is rendered. - pub currently_editing: Option, // the optional state containing which of the key or value pair the user is editing. It is an option, because when the user is not directly editing a key-value pair, this will be set to `None`. + pub title: &'a str, + pub should_quit: bool, + pub tabs: TabsState<'a>, + pub servers: Vec>, + pub enhanced_graphics: bool, } +impl App { + pub fn new(title: &'a str, servers: Vec>, enhanced_graphics: bool) -> Self { + App { + title, + should_quit: false, + tabs: TabsState::new(vec!["Dashboard","Machine info","Config"]), + servers, + enhanced_graphics, + } + } + + pub fn on_up(&mut self) { + + } + + pub fn on_down(&mut self) { + + } + + pub fn on_right(&mut self) { + + } + + pub fn on_left(&mut self) { + + } + + pub fn on_key(&mut self, c: char) { + match c { + 'q' => { + self.should_quit = true; + } + _ => {} + } + } + + pub fn on_tick(&mut self) { + + } +} diff --git a/src/main.rs b/src/main.rs index 2b44b5c..c3c26f1 100644 --- a/src/main.rs +++ b/src/main.rs @@ -1,10 +1,30 @@ -use ratatui::backend::CrosstermBackend; -use ratatui::Terminal; -use std::io::{stdout, Write}; +use std::io; +use std::error::Error; +use std::time::Duration; +use clap::Parser; +mod app; +mod ui; +mod crossterm; +use crate::{ + app::App, + ui::ui, -fn main() { - let backend = CrosstermBackend::new(stdout()); - let mut terminal = Terminal::new(backend).unwrap(); - //todo: setup moonraker interface - //todo: setup custom klipper ui +}; + +#[derive(Debug, Parser)] +struct Cli { + /// time in ms between two ticks. + #[arg(short, long, default_value_t = 200)] + tick_rate: u64, + + /// whether unicode symbols are used to improve the overall look of the app + #[arg(short, long, default_value_t = true)] + unicode: bool, +} + +fn main() -> Result<(), Box> { + let cli = Cli::Parse(); + let tick_rate = Duration::from_millis(cli.tick_rate); + crate::crossterm::run(tick_rate, cli.unicode)?; + Ok(()) }