diff --git a/Cargo.lock b/Cargo.lock index c756cc1..1d8e1a9 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -144,7 +144,7 @@ dependencies = [ [[package]] name = "dolltool" -version = "1.0.0" +version = "1.1.0" dependencies = [ "clap", "num-bigint", diff --git a/Cargo.toml b/Cargo.toml index a771f24..e996e10 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -2,7 +2,7 @@ year = "2026" license = "GPL-3.0-or-later" name = "dolltool" -version = "1.0.0" +version = "1.1.0" authors = ["ika4422"] description = "A simple dollcode encoder, decoder, and generator inside your terminal :3" edition = "2024" diff --git a/src/main.rs b/src/main.rs index 0c93a70..e3d4cac 100644 --- a/src/main.rs +++ b/src/main.rs @@ -67,7 +67,13 @@ fn main() { if args.no_doll { println!("{}", generated); } else { - match BigUint::parse_bytes(generated.as_bytes(), 10) { + let as_num = if args.text { + None + } else { + BigUint::parse_bytes(generated.as_bytes(), 10) + }; + + match as_num { Some(num) => { println!("{} :: {}", generated, to_dollcode(num).unwrap()); } @@ -84,23 +90,21 @@ fn main() { } if let Some(input) = args.encode { - if args.text { + let encode_as_text = args.text || input.parse::().is_err(); + + if encode_as_text { let result: Vec = input .chars() .map(|c| to_dollcode(BigUint::from(c as u64)).unwrap()) .collect(); println!("{}", result.join(" ")); } else { - match input.parse::() { - Ok(num) => match to_dollcode(num) { - Ok(code) => println!("{}", code), - Err(e) => { - eprintln!("Error: {}", e); - process::exit(1); - } - }, - Err(_) => { - eprintln!("Error: input must be a positive integer!"); + let num = input.parse::().unwrap(); + + match to_dollcode(num) { + Ok(code) => println!("{}", code), + Err(e) => { + eprintln!("Error: {}", e); process::exit(1); } }