From 0576dc0ea4a4b5debc3c7cadcf8fea2daaad7d66 Mon Sep 17 00:00:00 2001 From: ika4422 Date: Mon, 9 Feb 2026 22:06:21 +0000 Subject: [PATCH] reorganized code to be neater in separate modules :3 --- src/dollcode.rs | 38 +++++++++++++++++++++++ src/main.rs | 77 ++++++---------------------------------------- src/pattern_gen.rs | 31 +++++++++++++++++++ 3 files changed, 78 insertions(+), 68 deletions(-) create mode 100644 src/dollcode.rs create mode 100644 src/pattern_gen.rs diff --git a/src/dollcode.rs b/src/dollcode.rs new file mode 100644 index 0000000..d9e8b99 --- /dev/null +++ b/src/dollcode.rs @@ -0,0 +1,38 @@ +use num_bigint::BigUint; +use num_traits::{One, ToPrimitive, Zero}; + +pub fn to_dollcode(mut n: BigUint) -> Result { + if n.is_zero() { + return Err("Value of n must be greater than zero!".to_string()); + } + let symbols = ['▖', '▘', '▌']; + let three = BigUint::from(3u8); + let mut result = String::new(); + + while n > BigUint::zero() { + n -= BigUint::one(); + let remainder = (&n % &three).to_usize().unwrap(); + n /= &three; + result.insert(0, symbols[remainder]); + } + Ok(result) +} + +pub fn from_dollcode(code: &str) -> Result { + let mut total = BigUint::zero(); + let three = BigUint::from(3u8); + let mut multiplier = BigUint::one(); + + for c in code.chars().rev() { + let val = match c { + '▖' => BigUint::from(1u8), + '▘' => BigUint::from(2u8), + '▌' => BigUint::from(3u8), + _ => return Err(format!("Invalid dollcode character: '{}'", c)), + }; + + total += val * &multiplier; + multiplier *= &three; + } + Ok(total) +} diff --git a/src/main.rs b/src/main.rs index 6aae685..0c93a70 100644 --- a/src/main.rs +++ b/src/main.rs @@ -15,12 +15,19 @@ * along with this program. If not, see . */ +mod dollcode; +mod pattern_gen; + use std::process; use clap::Parser; use num_bigint::BigUint; -use num_traits::{One, ToPrimitive, Zero}; -use rand::RngExt; +use num_traits::ToPrimitive; + +use crate::{ + dollcode::{from_dollcode, to_dollcode}, + pattern_gen::generate_from_pattern, +}; #[derive(Parser, Debug)] #[command(author, version, about)] @@ -50,72 +57,6 @@ struct Args { license: bool, } -fn to_dollcode(mut n: BigUint) -> Result { - if n.is_zero() { - return Err("Value of n must be greater than zero!".to_string()); - } - let symbols = ['▖', '▘', '▌']; - let three = BigUint::from(3u8); - let mut result = String::new(); - - while n > BigUint::zero() { - n -= BigUint::one(); - let remainder = (&n % &three).to_usize().unwrap(); - n /= &three; - result.insert(0, symbols[remainder]); - } - Ok(result) -} - -fn from_dollcode(code: &str) -> Result { - let mut total = BigUint::zero(); - let three = BigUint::from(3u8); - let mut multiplier = BigUint::one(); - - for c in code.chars().rev() { - let val = match c { - '▖' => BigUint::from(1u8), - '▘' => BigUint::from(2u8), - '▌' => BigUint::from(3u8), - _ => return Err(format!("Invalid dollcode character: '{}'", c)), - }; - - total += val * &multiplier; - multiplier *= &three; - } - Ok(total) -} - -fn generate_from_pattern(pattern: &str, upper: bool) -> String { - let mut rng = rand::rng(); - let mut output = String::new(); - - for c in pattern.chars() { - match c { - '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 - }); - } - 'a' => { - let pool = if upper { - "0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ" - } else { - "0123456789abcdefghijklmnopqrstuvwxyz" - }; - let idx = rng.random_range(0..pool.len()); - output.push(pool.chars().nth(idx).unwrap()); - } - _ => output.push(c), - } - } - output -} - fn main() { let args = Args::parse(); diff --git a/src/pattern_gen.rs b/src/pattern_gen.rs new file mode 100644 index 0000000..ef419ad --- /dev/null +++ b/src/pattern_gen.rs @@ -0,0 +1,31 @@ +use rand::RngExt; + +pub fn generate_from_pattern(pattern: &str, upper: bool) -> String { + let mut rng = rand::rng(); + let mut output = String::new(); + + for c in pattern.chars() { + match c { + '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 + }); + } + 'a' => { + let pool = if upper { + "0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ" + } else { + "0123456789abcdefghijklmnopqrstuvwxyz" + }; + let idx = rng.random_range(0..pool.len()); + output.push(pool.chars().nth(idx).unwrap()); + } + _ => output.push(c), + } + } + output +}