refactor: project structure

Author: RYGRIT

.gitignore

@@ -1,2 +1,3 @@
 /target
 /fixtures
+output.*

src/opts.rs src/cli/csv_opts.rssrc/opts.rs renamed to src/cli/csv_opts.rs

@@ -1,24 +1,7 @@
-use std::fmt;
-use std::{path::Path, str::FromStr};
+use std::{fmt, path::Path, str::FromStr};
 
 use clap::Parser;
 
-#[derive(Debug, Parser)]
-#[command(name = "rcli", version, author, about, long_about = None)]
-pub struct Opts {
-    #[command(subcommand)]
-    pub cmd: SubCommand,
-}
-
-#[derive(Debug, Parser)]
-pub enum SubCommand {
-    #[command(name = "csv", about = "Show CSV, or convert CSV to other formats")]
-    Csv(CsvOpts),
-
-    #[command(name = "genpass", about = "Generate a random password")]
-    GenPass(GenPassOpts),
-}
-
 #[derive(Debug, Clone, Copy)]
 pub enum OutputFormat {
     Json,
@@ -78,24 +61,6 @@ pub struct CsvOpts {
     pub delimiter: char,
 }
 
-#[derive(Debug, Parser)]
-pub struct GenPassOpts {
-    #[arg(short, long, help = "Length of the password", default_value_t = 12)]
-    pub length: u8,
-
-    #[arg(long = "no-uppercase", help = "Exclude uppercase characters", default_value_t = true, action = clap::ArgAction::SetFalse)]
-    pub uppercase: bool,
-
-    #[arg(long = "no-lowercase", help = "Exclude lowercase characters", default_value_t = true, action = clap::ArgAction::SetFalse)]
-    pub lowercase: bool,
-
-    #[arg(long = "no-numbers", help = "Exclude numbers", default_value_t = true, action = clap::ArgAction::SetFalse)]
-    pub numbers: bool,
-
-    #[arg(long = "no-special", help = "Exclude special characters", default_value_t = true, action = clap::ArgAction::SetFalse)]
-    pub special: bool,
-}
-
 fn verify_input_file(filename: &str) -> Result<String, String> {
     if Path::new(filename).exists() {
         Ok(filename.to_string())

src/cli/genpass_opts.rs

@@ -0,0 +1,19 @@
+use clap::Parser;
+
+#[derive(Debug, Parser)]
+pub struct GenPassOpts {
+    #[arg(short, long, help = "Length of the password", default_value_t = 12)]
+    pub length: u8,
+
+    #[arg(long = "no-uppercase", help = "Exclude uppercase characters", default_value_t = true, action = clap::ArgAction::SetFalse)]
+    pub uppercase: bool,
+
+    #[arg(long = "no-lowercase", help = "Exclude lowercase characters", default_value_t = true, action = clap::ArgAction::SetFalse)]
+    pub lowercase: bool,
+
+    #[arg(long = "no-numbers", help = "Exclude numbers", default_value_t = true, action = clap::ArgAction::SetFalse)]
+    pub numbers: bool,
+
+    #[arg(long = "no-special", help = "Exclude special characters", default_value_t = true, action = clap::ArgAction::SetFalse)]
+    pub special: bool,
+}

src/cli/mod.rs

@@ -0,0 +1,25 @@
+mod csv_opts;
+mod genpass_opts;
+
+use clap::Parser;
+
+pub use self::{
+    csv_opts::{CsvOpts, OutputFormat},
+    genpass_opts::GenPassOpts,
+};
+
+#[derive(Debug, Parser)]
+#[command(name = "rcli", version, author, about, long_about = None)]
+pub struct Opts {
+    #[command(subcommand)]
+    pub cmd: SubCommand,
+}
+
+#[derive(Debug, Parser)]
+pub enum SubCommand {
+    #[command(name = "csv", about = "Show CSV, or convert CSV to other formats")]
+    Csv(CsvOpts),
+
+    #[command(name = "genpass", about = "Generate a random password")]
+    GenPass(GenPassOpts),
+}

src/lib.rs

@@ -1,5 +1,5 @@
-mod opts;
+mod cli;
 mod process;
 
-pub use opts::{GenPassOpts, Opts, SubCommand};
+pub use cli::{Opts, SubCommand};
 pub use process::*;

src/process/csv.rs

@@ -4,9 +4,10 @@ use csv::Reader;
 use serde::{Deserialize, Serialize};
 use serde_json::Value;
 
-use crate::opts::{CsvOpts, OutputFormat};
 use anyhow::Ok;
 
+use crate::cli::{CsvOpts, OutputFormat};
+
 const TOML_ROOT_KEY: &str = "data";
 
 #[allow(dead_code)]

src/process/gen_pass.rs

@@ -1,7 +1,7 @@
 use rand::{Rng, seq::SliceRandom};
 use zxcvbn::zxcvbn;
 
-use crate::opts::GenPassOpts;
+use crate::cli::GenPassOpts;
 
 const UPPER_CHARSET: &[u8] = b"ABCDEFGHJKLMNPQRSTUVWXYZ";
 const LOWER_CHARSET: &[u8] = b"abcdefghijkmnopqrstuvwxyz";