SyntheticBird/cuprate-hinto-janai
1
0
Fork 0
mirror of https://github.com/hinto-janai/cuprate.git synced 2024-12-23 12:09:57 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

cli: fix arg handler

Browse source
This commit is contained in:
hinto.janai 2024-03-29 16:57:54 -04:00
parent c041b6b627
commit 221e775590
No known key found for this signature in database
GPG key ID: D47CE05FA175A499
2 changed files with 69 additions and 139 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

204
database/benchmark/src/cli.rs
View file

@ -1,7 +1,9 @@
//! Command line argument parsing and handling. //! Command line argument parsing and handling.
//---------------------------------------------------------------------------------------------------- Use //---------------------------------------------------------------------------------------------------- Use
use clap::{Args, Parser, Subcommand}; use std::path::PathBuf;
use clap::{crate_name, Args, Parser, Subcommand};
use crate::config::Config; use crate::config::Config;
@ -18,9 +20,13 @@ use crate::config::Config;
#[allow(clippy::struct_excessive_bools)] #[allow(clippy::struct_excessive_bools)]
pub struct Cli { pub struct Cli {
//------------------------------------------------------------------------------ TODO //------------------------------------------------------------------------------ TODO
// #[arg(long, value_name = "OFF|ERROR|INFO|WARN|DEBUG|TRACE")] /// Set filter level for console logs.
// Set filter level for console logs #[arg(
// log_level: Option<tracing::Level>, long,
value_name = "OFF|ERROR|INFO|WARN|DEBUG|TRACE",
verbatim_doc_comment
)]
log_level: Option<String>, // FIXME: tracing::Level{Filter} doesn't work with clap?
//------------------------------------------------------------------------------ Early Return //------------------------------------------------------------------------------ Early Return
// These are flags that do something // These are flags that do something
@ -58,148 +64,72 @@ pub struct Cli {
version: bool, version: bool,
} }
//---------------------------------------------------------------------------------------------------- CLI default
impl Default for Cli {
fn default() -> Self {
todo!()
}
}
//---------------------------------------------------------------------------------------------------- CLI argument handling //---------------------------------------------------------------------------------------------------- CLI argument handling
impl Cli { impl Cli {
/// `main()` calls this once. /// `main()` calls this once.
pub fn init() -> Config { pub fn init() -> Self {
// Self::parse().handle_args() match Self::parse().handle_args() {
todo!() Ok(cli) => cli,
Err(exit_code) => std::process::exit(exit_code),
}
} }
// /// Handle all the values, routing code, and exiting early if needed. /// Handle all the values, routing code, and exiting early if needed.
// /// ///
// /// The order of the `if`'s are the precedence of the `--flags`'s /// The order of the `if`'s are the precedence of the `--flags`'s
// /// themselves, e.g `--version` will execute over all else. /// themselves, e.g `--version` will execute over all else.
// fn handle_args(mut self) -> Config { fn handle_args(self) -> Result<Self, i32> {
// // TODO: // TODO:
// // Calling `exit()` on each branch could // Calling `exit()` on each branch could
// // be replaced with something better, // be replaced with something better,
// // although exit codes must be maintained. // although exit codes must be maintained.
// //-------------------------------------------------- Version. //-------------------------------------------------- Version.
// if self.version { if self.version {
// println!("{CUPRATE_BUILD_INFO}\n{CUPRATE_COPYRIGHT}"); println!("TODO");
// exit(0); return Err(0);
// } }
// //-------------------------------------------------- Path. //-------------------------------------------------- Path.
// if self.path { if self.path {
// // Cache. let p: PathBuf = todo!();
// let p: PathBuf = todo!(); println!("{}", p.display());
// println!("{}", p.display()); return Err(0);
}
// // Config. //-------------------------------------------------- Delete.
// let p: PathBuf = todo!(); if self.delete {
// println!("{}", p.display()); let path = cuprate_helper::fs::cuprate_database_dir();
// #[cfg(not(target_os = "macos"))] if path.exists() {
// { println!(
// // `.local/share` "{}: PATH does not exist '{}'",
// let p: PathBuf = todo!(); crate_name!(),
// println!("{}", p.display()); path.display()
// } );
return Err(0);
}
// exit(0); match std::fs::remove_dir_all(path) {
// } Ok(()) => {
println!("{}: deleted '{}'", crate_name!(), path.display());
return Err(0);
}
Err(e) => {
eprintln!("{} error: {} - {e}", crate_name!(), path.display());
return Err(1);
}
}
}
// //-------------------------------------------------- `reset_config` //-------------------------------------------------- Return `Config` to `main()`
// if self.reset_config { Ok(self)
// let p = Config::absolute_path().unwrap(); }
// Config::mkdir().unwrap();
// std::fs::write(&p, CUPRATE_CONFIG).unwrap();
// exit(0);
// }
// //-------------------------------------------------- `reset_cache`
// if self.reset_cache {
// let p: PathBuf = todo!();
// match std::fs::remove_dir_all(&p) {
// Ok(_) => {
// eprintln!("{}", p.display());
// exit(0);
// }
// Err(e) => {
// eprintln!("cuprate: Reset Cache failed: {e}");
// exit(1);
// }
// }
// }
// //-------------------------------------------------- Docs.
// if self.docs {
// // Create documentation.
// if let Err(e) = Docs::create_open() {
// eprintln!("cuprate: Could not create docs: {e}");
// exit(1);
// }
// exit(0);
// }
// //-------------------------------------------------- Delete.
// if self.delete {
// #[cfg(not(target_os = "macos"))]
// let paths = [
// // Cache.
// todo!(),
// // Config.
// Config::sub_dir_parent_path().unwrap(),
// // `.local/share`
// todo!(),
// ];
// #[cfg(target_os = "macos")]
// let paths = [
// // Cache.
// todo!(),
// // Config.
// Config::sub_dir_parent_path().unwrap(),
// ];
// let mut code = 0;
// for p in paths {
// if !p.exists() {
// println!("cuprate: PATH does not exist ... {}", p.display());
// continue;
// }
// // TODO:
// // Although `disk` already does this,
// // maybe do sanity checks on these PATHs
// // to make sure we aren't doing `rm -rf /`.
// match std::fs::remove_dir_all(&p) {
// Ok(_) => println!("{}", p.display()),
// Err(e) => {
// eprintln!("cuprate error: {} - {e}", p.display());
// code = 1;
// }
// }
// }
// exit(code);
// }
// //-------------------------------------------------- Print
// if self.print_config {
// println!("{CUPRATE_CONFIG}");
// exit(0);
// } else if self.print_methods {
// for method in [0 /* TODO(hinto): add methods iter */] {
// println!("{method}");
// }
// exit(0);
// }
// //-------------------------------------------------- Subcommands
// self.handle_subcommand();
// //-------------------------------------------------- Return to `main()`
// Config {
// dry_run: self.dry_run,
// log_level: self.log_level,
// config: self.map_cli_to_config(),
// }
// }
} }

4
database/benchmark/src/main.rs
View file

@ -82,12 +82,12 @@ use crate::{cli::Cli, config::Config};
//---------------------------------------------------------------------------------------------------- Main //---------------------------------------------------------------------------------------------------- Main
fn main() { fn main() {
// Handle CLI arguments. // Handle CLI arguments.
let config: Config = if std::env::args_os().len() > 1 { let cli: Cli = if std::env::args_os().len() > 1 {
// Some arguments were passed, run all the `clap` code. // Some arguments were passed, run all the `clap` code.
Cli::init() Cli::init()
} else { } else {
// No arguments were passed, use the default config. // No arguments were passed, use the default config.
Config::default() Cli::default()
}; };
// // If `dry_run`, print config/stats/etc and exit cleanly. // // If `dry_run`, print config/stats/etc and exit cleanly.