From 41a9a2a3bf22f018c962ecc50d7e1959a3db6ba5 Mon Sep 17 00:00:00 2001 From: Shaun Reed Date: Sun, 13 Apr 2025 10:20:43 -0400 Subject: [PATCH] Use structopt. --- Cargo.lock | 182 +++++++++++++++++++++++++++++++++++++++++++++++++--- Cargo.toml | 1 + src/main.rs | 72 ++++++++------------- 3 files changed, 201 insertions(+), 54 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 5c181d1..7783bc7 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -8,12 +8,32 @@ version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "512761e0bb2578dd7380c6baaa0f4ce03e84f95e960231d1dec8bf4d7d6e2627" +[[package]] +name = "ansi_term" +version = "0.12.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d52a9bb7ec0cf484c551830a7ce27bd20d67eac647e1befb56b0be4ee39a55d2" +dependencies = [ + "winapi", +] + [[package]] name = "anstyle" version = "1.0.10" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "55cc3b69f167a1ef2e161439aa98aed94e6028e5f9a59be9a6ffb47aef1651f9" +[[package]] +name = "atty" +version = "0.2.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8" +dependencies = [ + "hermit-abi", + "libc", + "winapi", +] + [[package]] name = "base64" version = "0.22.1" @@ -67,6 +87,21 @@ dependencies = [ "thiserror 1.0.69", ] +[[package]] +name = "clap" +version = "2.34.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a0610544180c38b88101fecf2dd634b174a62eef6946f84dfc6a7127512b381c" +dependencies = [ + "ansi_term", + "atty", + "bitflags 1.3.2", + "strsim 0.8.0", + "textwrap", + "unicode-width", + "vec_map", +] + [[package]] name = "clap" version = "4.5.32" @@ -84,7 +119,7 @@ checksum = "22a7ef7f676155edfb82daa97f99441f3ebf4a58d5e32f295a56259f1b6facc8" dependencies = [ "anstyle", "clap_lex", - "strsim", + "strsim 0.11.1", ] [[package]] @@ -103,6 +138,7 @@ dependencies = [ "cxx-qt-lib", "dirs", "log", + "structopt", "syntect", ] @@ -157,7 +193,7 @@ dependencies = [ "codespan-reporting", "proc-macro2", "quote", - "syn", + "syn 2.0.100", ] [[package]] @@ -203,7 +239,7 @@ dependencies = [ "indoc", "proc-macro2", "quote", - "syn", + "syn 2.0.100", ] [[package]] @@ -226,7 +262,7 @@ checksum = "58a4fe02c0604eda28c605792f5ba0d0251b4947f8f0fc43e55b61c06b2b8ec6" dependencies = [ "cxx-qt-gen", "proc-macro2", - "syn", + "syn 2.0.100", ] [[package]] @@ -235,11 +271,11 @@ version = "1.0.148" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "40399fddbf3977647bfff7453dacffc6b5701b19a282a283369a870115d0a049" dependencies = [ - "clap", + "clap 4.5.32", "codespan-reporting", "proc-macro2", "quote", - "syn", + "syn 2.0.100", ] [[package]] @@ -257,7 +293,7 @@ dependencies = [ "proc-macro2", "quote", "rustversion", - "syn", + "syn 2.0.100", ] [[package]] @@ -341,6 +377,24 @@ version = "0.15.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bf151400ff0baff5465007dd2f3e717f3fe502074ca563069ce3a6629d07b289" +[[package]] +name = "heck" +version = "0.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6d621efb26863f0e9924c6ac577e8275e5e6b77455db64ffa6c65c904e9e132c" +dependencies = [ + "unicode-segmentation", +] + +[[package]] +name = "hermit-abi" +version = "0.1.19" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "62b467343b94ba476dcb2500d242dadbb39557df889310ac77c5d99100aaac33" +dependencies = [ + "libc", +] + [[package]] name = "indexmap" version = "2.8.0" @@ -381,6 +435,12 @@ dependencies = [ "libc", ] +[[package]] +name = "lazy_static" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe" + [[package]] name = "libc" version = "0.2.171" @@ -514,6 +574,30 @@ version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "439ee305def115ba05938db6eb1644ff94165c5ab5e9420d1c1bcedbba909391" +[[package]] +name = "proc-macro-error" +version = "1.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "da25490ff9892aab3fcf7c36f08cfb902dd3e71ca0f9f9517bea02a73a5ce38c" +dependencies = [ + "proc-macro-error-attr", + "proc-macro2", + "quote", + "syn 1.0.109", + "version_check", +] + +[[package]] +name = "proc-macro-error-attr" +version = "1.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a1be40180e52ecc98ad80b184934baf3d0d29f979574e439af5a55274b35f869" +dependencies = [ + "proc-macro2", + "quote", + "version_check", +] + [[package]] name = "proc-macro2" version = "1.0.94" @@ -607,7 +691,7 @@ checksum = "5b0276cf7f2c73365f7157c8123c21cd9a50fbbd844757af28ca1f5925fc2a00" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 2.0.100", ] [[package]] @@ -634,12 +718,53 @@ version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f" +[[package]] +name = "strsim" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8ea5119cdb4c55b55d432abb513a0429384878c15dde60cc77b1c99de1a95a6a" + [[package]] name = "strsim" version = "0.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7da8b5736845d9f2fcb837ea5d9e2628564b3b043a70948a3f0b778838c5fb4f" +[[package]] +name = "structopt" +version = "0.3.26" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0c6b5c64445ba8094a6ab0c3cd2ad323e07171012d9c98b0b15651daf1787a10" +dependencies = [ + "clap 2.34.0", + "lazy_static", + "structopt-derive", +] + +[[package]] +name = "structopt-derive" +version = "0.4.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dcb5ae327f9cc13b68763b5749770cb9e048a99bd9dfdfa58d0cf05d5f64afe0" +dependencies = [ + "heck", + "proc-macro-error", + "proc-macro2", + "quote", + "syn 1.0.109", +] + +[[package]] +name = "syn" +version = "1.0.109" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237" +dependencies = [ + "proc-macro2", + "quote", + "unicode-ident", +] + [[package]] name = "syn" version = "2.0.100" @@ -682,6 +807,15 @@ dependencies = [ "winapi-util", ] +[[package]] +name = "textwrap" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d326610f408c7a4eb6f51c37c330e496b08506c9457c9d34287ecc38809fb060" +dependencies = [ + "unicode-width", +] + [[package]] name = "thiserror" version = "1.0.69" @@ -708,7 +842,7 @@ checksum = "4fee6c4efc90059e10f81e6d42c60a18f76588c3d74cb83a0b242a2b6c7504c1" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 2.0.100", ] [[package]] @@ -719,7 +853,7 @@ checksum = "7f7cf42b4507d8ea322120659672cf1b9dbb93f8f2d4ecfd6e51350ff5b17a1d" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 2.0.100", ] [[package]] @@ -771,6 +905,12 @@ version = "0.1.14" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7dd6e30e90baa6f72411720665d41d89b9a3d039dc45b8faea1ddd07f617f6af" +[[package]] +name = "vec_map" +version = "0.8.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f1bddf1187be692e79c5ffeab891132dfb0f236ed36a43c7ed39f1165ee20191" + [[package]] name = "version_check" version = "0.9.5" @@ -803,6 +943,22 @@ version = "0.11.0+wasi-snapshot-preview1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" +[[package]] +name = "winapi" +version = "0.3.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419" +dependencies = [ + "winapi-i686-pc-windows-gnu", + "winapi-x86_64-pc-windows-gnu", +] + +[[package]] +name = "winapi-i686-pc-windows-gnu" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" + [[package]] name = "winapi-util" version = "0.1.9" @@ -812,6 +968,12 @@ dependencies = [ "windows-sys", ] +[[package]] +name = "winapi-x86_64-pc-windows-gnu" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" + [[package]] name = "windows-sys" version = "0.59.0" diff --git a/Cargo.toml b/Cargo.toml index 1eddc33..ab6ff76 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -10,6 +10,7 @@ cxx-qt-lib = { version="0.7", features = ["qt_full", "qt_gui"] } log = { version = "0.4.27", features = [] } dirs = "6.0.0" syntect = "5.2.0" +structopt = "0.3.26" [build-dependencies] # The link_qt_object_files feature is required for statically linking Qt 6. diff --git a/src/main.rs b/src/main.rs index 5f8a245..03f1108 100644 --- a/src/main.rs +++ b/src/main.rs @@ -1,14 +1,15 @@ // TODO: Header use cxx_qt_lib::QString; -use std::env; use std::error::Error; -use std::process::exit; +use structopt::StructOpt; pub mod colors; pub mod filesystem; -fn run_gui() -> Result<(), Box> { +fn run_gui(root_path: std::path::PathBuf) -> Result<(), Box> { + println!("Starting the GUI editor at {:?}", root_path); + use cxx_qt_lib::{QGuiApplication, QQmlApplicationEngine, QUrl}; let mut app = QGuiApplication::new(); @@ -28,53 +29,36 @@ fn run_gui() -> Result<(), Box> { Ok(()) } -fn run_tui() -> Result<(), Box> { - println!("Starting TUI editor..."); - // Your cursive logic here, like: - // let mut siv = cursive::default(); - // siv.add_layer(...); - // siv.run(); +fn run_tui(root_path: std::path::PathBuf) -> Result<(), Box> { + println!("Starting the TUI editor at {:?}", root_path); Ok(()) } -fn print_help() { - println!("Usage: app_launcher [OPTION]"); - println!("Options:"); - println!(" gui Launch the QML GUI application"); - println!(" tui Launch the TUI text editor (cursive-based)"); - println!(" help Show this help message"); +#[derive(StructOpt, Debug)] +#[structopt(name = "clide")] +struct Cli { + /// The root path to open with the clide editor. + #[structopt(parse(from_os_str))] + pub path: Option, + + /// Run in headless mode if this flag is present. + #[structopt(name = "tui", short, long)] + pub tui: bool, } -fn main() { - let args: Vec = env::args().collect(); +fn main() -> Result<(), Box> { + let args = Cli::from_args(); - if args.len() < 2 { - if let Err(e) = run_gui() { - eprintln!("Error launching GUI: {}", e); - exit(1); - } - } + // If the CLI was provided a directory to open use it. + // Otherwise, attempt to find the home directory. If that fails use CWD. + let root_path = args + .path + .or_else(dirs::home_dir) + .unwrap_or_else(|| std::env::current_dir().expect("Failed to access filesystem.")); - match args.get(1).map(|s| s.as_str()) { - Some("gui") => { - if let Err(e) = run_gui() { - eprintln!("Error launching GUI: {}", e); - exit(1); - } - } - Some("tui") => { - if let Err(e) = run_tui() { - eprintln!("Error launching TUI: {}", e); - exit(1); - } - } - Some("help") | None => { - print_help(); - } - Some(arg) => { - eprintln!("Unknown argument: {}", arg); - print_help(); - exit(1); - } + // Open the TUI editor if requested, otherwise use the QML GUI by default. + match args.tui { + true => run_tui(root_path), + false => run_gui(root_path), } }