generated from PlexSheep/rs-base
Compare commits
No commits in common. "c5790f9d7901f30e7c58b4df0896adde27c5d108" and "826c3c78932391c2f5cee1ed292a70ddf4bbd072" have entirely different histories.
c5790f9d79
...
826c3c7893
3 changed files with 2 additions and 48 deletions
|
@ -19,5 +19,4 @@ clap = { version = "4.5.4", features = ["derive"] }
|
||||||
fast32 = "1.0.2"
|
fast32 = "1.0.2"
|
||||||
libpt = { version = "0.5.1", features = ["bintols"], default-features = false }
|
libpt = { version = "0.5.1", features = ["bintols"], default-features = false }
|
||||||
num = "0.4.3"
|
num = "0.4.3"
|
||||||
rand = "0.8.5"
|
|
||||||
|
|
||||||
|
|
|
@ -86,16 +86,6 @@ pub struct FormatOptions {
|
||||||
#[arg(short = 's', long)]
|
#[arg(short = 's', long)]
|
||||||
/// format to base64
|
/// format to base64
|
||||||
base64: bool,
|
base64: bool,
|
||||||
#[arg(short = 'r', long, default_value_t = 0, value_parser=numf_parser::<NumberType>)]
|
|
||||||
/// output random numbers
|
|
||||||
///
|
|
||||||
/// Add a user defined amount of cryptographically pseudorandom numbers to the number list.
|
|
||||||
rand: NumberType,
|
|
||||||
#[arg(long, default_value_t = NumberType::MAX, value_parser=numf_parser::<NumberType>)]
|
|
||||||
/// max for the random numbers
|
|
||||||
///
|
|
||||||
/// Generated numbers will not be lower than this. Only has an effect with --rand set.
|
|
||||||
rand_max: NumberType,
|
|
||||||
#[arg(short = 'z', long)]
|
#[arg(short = 'z', long)]
|
||||||
/// format to base32
|
/// format to base32
|
||||||
base32: bool,
|
base32: bool,
|
||||||
|
@ -193,26 +183,6 @@ impl FormatOptions {
|
||||||
pub fn push_number(&mut self, value: NumberType) {
|
pub fn push_number(&mut self, value: NumberType) {
|
||||||
self.numbers.push(value)
|
self.numbers.push(value)
|
||||||
}
|
}
|
||||||
|
|
||||||
/// get rand
|
|
||||||
pub fn rand(&self) -> NumberType {
|
|
||||||
self.rand
|
|
||||||
}
|
|
||||||
|
|
||||||
/// set amount of extra random numbers manually
|
|
||||||
pub fn set_rand(&mut self, rand: NumberType) {
|
|
||||||
self.rand = rand;
|
|
||||||
}
|
|
||||||
|
|
||||||
/// get highes allowed random value
|
|
||||||
pub fn rand_max(&self) -> NumberType {
|
|
||||||
self.rand_max
|
|
||||||
}
|
|
||||||
|
|
||||||
/// set highes allowed random value
|
|
||||||
pub fn set_rand_max(&mut self, rand_max: NumberType) {
|
|
||||||
self.rand_max = rand_max;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
impl Default for FormatOptions {
|
impl Default for FormatOptions {
|
||||||
|
@ -227,8 +197,6 @@ impl Default for FormatOptions {
|
||||||
base64: false,
|
base64: false,
|
||||||
dec: false,
|
dec: false,
|
||||||
numbers: vec![],
|
numbers: vec![],
|
||||||
rand: 0,
|
|
||||||
rand_max: NumberType::MAX,
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
17
src/main.rs
17
src/main.rs
|
@ -12,7 +12,7 @@ mod format;
|
||||||
use format::*;
|
use format::*;
|
||||||
use numf::format::numf_parser;
|
use numf::format::numf_parser;
|
||||||
|
|
||||||
fn main() -> anyhow::Result<()> {
|
fn main() {
|
||||||
// try to read from stdin first, appending the numbers we read to the FormatOptions
|
// try to read from stdin first, appending the numbers we read to the FormatOptions
|
||||||
let mut options = FormatOptions::parse();
|
let mut options = FormatOptions::parse();
|
||||||
let mut stdin_nums = Vec::new();
|
let mut stdin_nums = Vec::new();
|
||||||
|
@ -23,7 +23,6 @@ fn main() -> anyhow::Result<()> {
|
||||||
let whole: String = match String::from_utf8(stdin_nums) {
|
let whole: String = match String::from_utf8(stdin_nums) {
|
||||||
Ok(r) => r,
|
Ok(r) => r,
|
||||||
Err(e) => {
|
Err(e) => {
|
||||||
eprintln!("{}", FormatOptions::command().render_usage());
|
|
||||||
eprintln!("stdin for this program only accepts text: {e:#?}");
|
eprintln!("stdin for this program only accepts text: {e:#?}");
|
||||||
exit(1);
|
exit(1);
|
||||||
}
|
}
|
||||||
|
@ -33,7 +32,6 @@ fn main() -> anyhow::Result<()> {
|
||||||
let number = match numf_parser(s) {
|
let number = match numf_parser(s) {
|
||||||
Ok(n) => n,
|
Ok(n) => n,
|
||||||
Err(e) => {
|
Err(e) => {
|
||||||
eprintln!("{}", FormatOptions::command().render_usage());
|
|
||||||
eprintln!("could not parse number from stdin: {e:#?}");
|
eprintln!("could not parse number from stdin: {e:#?}");
|
||||||
exit(2);
|
exit(2);
|
||||||
}
|
}
|
||||||
|
@ -42,24 +40,14 @@ fn main() -> anyhow::Result<()> {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
Err(e) => {
|
Err(e) => {
|
||||||
eprintln!("{}", FormatOptions::command().render_usage());
|
|
||||||
eprintln!("could not read from stdin: {e:#?}");
|
eprintln!("could not read from stdin: {e:#?}");
|
||||||
exit(2);
|
exit(2);
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
if options.rand() > 0 {
|
|
||||||
use rand::prelude::*;
|
|
||||||
let mut rand = rand::rngs::OsRng;
|
|
||||||
for _i in 0..options.rand() {
|
|
||||||
options.push_number(rand.gen_range(0..options.rand_max()));
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
if options.numbers().is_empty() {
|
if options.numbers().is_empty() {
|
||||||
eprintln!("{}", FormatOptions::command().render_usage());
|
format!("{}", FormatOptions::command().render_usage());
|
||||||
eprintln!("no numbers have been provided");
|
|
||||||
exit(1);
|
exit(1);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -71,5 +59,4 @@ fn main() -> anyhow::Result<()> {
|
||||||
for o in out {
|
for o in out {
|
||||||
println!("{o}")
|
println!("{o}")
|
||||||
}
|
}
|
||||||
Ok(())
|
|
||||||
}
|
}
|
||||||
|
|
Reference in a new issue