From 0d9519c0dbf111e54163b392252bb83a9c6febcd Mon Sep 17 00:00:00 2001 From: ika4422 Date: Wed, 8 Apr 2026 12:34:32 +0100 Subject: [PATCH] added uppercase variations for letter and alphanumeric generation symbols and removed --upper flag --- README.md | 2 ++ src/main.rs | 16 ++++++---------- src/pattern_gen.rs | 23 ++++++++++++----------- 3 files changed, 20 insertions(+), 21 deletions(-) diff --git a/README.md b/README.md index eea2c29..27392cd 100644 --- a/README.md +++ b/README.md @@ -77,7 +77,9 @@ Generates random codes based on a user-defined pattern: - `n`: Number (0-9) - `l`: Letter (a-z) +- `L`: Uppercase Letter (A-Z) - `a`: Alphanumeric (0-9, a-z) +- `A`: Uppercase Alphanumeric (0-9, a-z) ```bash $ dolltool -g "nn-lll" -c 3 diff --git a/src/main.rs b/src/main.rs index cb2c9d6..edcad97 100644 --- a/src/main.rs +++ b/src/main.rs @@ -40,26 +40,22 @@ struct Args { /// Decodes the following dollcode into an integer or text decode: Option, - #[arg(short, long, default_value_t = false)] - /// Specifies the encoding/decoding method as text, not as an integer - text: bool, - #[arg(short, long)] - /// Generates codes from a user-defined pattern (n = number; l = letter; a = alphanumeric) + /// Generates codes from a user-defined pattern (n = number; l = letter; L = uppercase letter; a = alphanumeric; A = uppercase alphanumeric) generate: Option, #[arg(short, long, default_value_t = 1)] /// Specifies how many codes to generate count: usize, - #[arg(short, long, default_value_t = false)] - /// Outputs generated letters as uppercase as opposed to lowercase - upper: bool, - #[arg(long, default_value_t = false)] /// Will generate codes without encoding it into dollcode no_doll: bool, + #[arg(short, long, default_value_t = false)] + /// Specifies the encoding/decoding method as text, not as an integer + text: bool, + #[arg(long)] /// Display the license for dolltool license: bool, @@ -75,7 +71,7 @@ fn main() { if let Some(pattern) = args.generate { for _ in 0..args.count { - let generated = generate_from_pattern(&pattern, args.upper); + let generated = generate_from_pattern(&pattern); if args.no_doll { println!("{}", generated); diff --git a/src/pattern_gen.rs b/src/pattern_gen.rs index ef419ad..397ff6e 100644 --- a/src/pattern_gen.rs +++ b/src/pattern_gen.rs @@ -1,6 +1,6 @@ use rand::RngExt; -pub fn generate_from_pattern(pattern: &str, upper: bool) -> String { +pub fn generate_from_pattern(pattern: &str) -> String { let mut rng = rand::rng(); let mut output = String::new(); @@ -9,18 +9,19 @@ pub fn generate_from_pattern(pattern: &str, upper: bool) -> String { 'n' => output.push(rng.random_range('0'..='9')), 'l' => { let letter = rng.random_range('a'..='z'); - output.push(if upper { - letter.to_ascii_uppercase() - } else { - letter - }); + output.push(letter); + } + 'L' => { + let letter = rng.random_range('A'..='Z'); + output.push(letter); } 'a' => { - let pool = if upper { - "0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ" - } else { - "0123456789abcdefghijklmnopqrstuvwxyz" - }; + let pool = "0123456789abcdefghijklmnopqrstuvwxyz"; + let idx = rng.random_range(0..pool.len()); + output.push(pool.chars().nth(idx).unwrap()); + } + 'A' => { + let pool = "0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ"; let idx = rng.random_range(0..pool.len()); output.push(pool.chars().nth(idx).unwrap()); }