diff --git a/src/commands.rs b/src/commands.rs index 7397db8..771b9b1 100644 --- a/src/commands.rs +++ b/src/commands.rs @@ -12,7 +12,7 @@ pub fn run_generate(pattern: &str, count: usize, base: u32, no_doll: bool, text: let mut generated_count = 0; while generated_count < count { - let generated = generate_from_pattern(pattern); + let generated = generate_from_pattern(pattern, base); if no_doll { println!("{}", generated); diff --git a/src/pattern_gen.rs b/src/pattern_gen.rs index b8e6dd4..c189db2 100644 --- a/src/pattern_gen.rs +++ b/src/pattern_gen.rs @@ -27,13 +27,16 @@ Pattern Tokens: h hex lower (0-f) H hex upper (0-F) X hex mixed (0-9, a-f, A-F) + r radix digit (0 to base-1, depends on --base) * any other character is used literally"; -pub fn generate_from_pattern(pattern: &str) -> String { +pub fn generate_from_pattern(pattern: &str, base: u32) -> String { let mut rng = rand::rng(); let tokens = parse_pattern(pattern); let mut output = String::with_capacity(tokens.iter().map(|(_, n)| n).sum()); + let base_digits = &ALNUM_LOWER[..base as usize]; + for (c, count) in tokens { let pool = match c { 'n' => Some(DIGITS), @@ -48,6 +51,7 @@ pub fn generate_from_pattern(pattern: &str) -> String { 'h' => Some(DIGITS_HEX_LOWER), 'H' => Some(DIGITS_HEX_UPPER), 'X' => Some(DIGITS_HEX_MIXED), + 'r' => Some(base_digits), _ => None, };