added static string and -f flag (0.3)

Author: tidle

Cargo.lock

@@ -1,6 +1,6 @@
 [package]
 name = "dicers"
-version = "0.2.0"
+version = "0.3.0"
 authors = ["Tidle <tidle@users.noreply.github.com>"]
 edition = "2018"
 

Cargo.toml

@@ -5,12 +5,13 @@ pub struct Args {
     pub long: bool,
     pub manual: bool,
     pub words: usize,
+    pub wordlist: Option<String>,
 }
 
 impl Args {
     pub fn new() -> Args {
         let app = App::new("dicers")
-            .version("0.2")
+            .version("0.3")
             .about("generates a diceware password")
             .author("tidle")
             .arg(
@@ -25,6 +26,13 @@ impl Args {
                     .long("manual")
                     .help("manually input dice rolls rather than using the computer"),
             )
+            .arg(
+                Arg::with_name("FILE")
+                    .short("f")
+                    .long("file")
+                    .takes_value(true)
+                    .help("manually specify a wordlist, rather than using the built in wordlists"),
+            )
             .arg(
                 Arg::with_name("WORD COUNT")
                     .short("w")
@@ -44,11 +52,13 @@ impl Args {
                 eprintln!("Invalid number: {}", e);
                 std::process::exit(60);
             });
+        let wordlist = app.value_of("FILE").map(|x| x.to_string());
 
         Args {
             long,
             manual,
             words,
+            wordlist,
         }
     }
 }

src/args.rs

@@ -0,0 +1,2 @@
+pub static LIST4: &'static str = include_str!("../list4.txt");
+pub static LIST5: &'static str = include_str!("../list5.txt");

src/dat.rs

@@ -1,5 +1,6 @@
 mod args;
 mod dice;
+mod dat;
 
 use args::Args;
 use dice::roll;
@@ -14,14 +15,14 @@ fn main() {
         password.push_str(&match result {
             Roll4(v) => format!(
                 "{} ",
-                short_word(v).unwrap_or_else(|e| {
+                short_word(v, &args.wordlist).unwrap_or_else(|e| {
                     eprintln!("Error getting word: {}", e);
                     std::process::exit(128)
                 })
             ),
             Roll5(v) => format!(
                 "{} ",
-                long_word(v).unwrap_or_else(|e| {
+                long_word(v, &args.wordlist).unwrap_or_else(|e| {
                     eprintln!("Error getting word: {}", e);
                     std::process::exit(128)
                 })
@@ -42,22 +43,27 @@ fn main() {
     )
 }
 
-fn short_word(dice: [DiceFace; 4]) -> std::io::Result<String> {
+fn short_word(dice: [DiceFace; 4], wordlist: &Option<String>) -> std::io::Result<String> {
     let match_str = format!("{}{}{}{}", dice[0], dice[1], dice[2], dice[3]);
-    word(&match_str, "list4.txt")
+    word(&match_str, wordlist, dat::LIST4)
 }
 
-fn long_word(dice: [DiceFace; 5]) -> std::io::Result<String> {
+fn long_word(dice: [DiceFace; 5], wordlist: &Option<String>) -> std::io::Result<String> {
     let match_str = format!("{}{}{}{}{}", dice[0], dice[1], dice[2], dice[3], dice[4]);
-    word(&match_str, "list5.txt")
+    word(&match_str, wordlist, dat::LIST5)
 }
 
-fn word(match_str: &str, filename: &str) -> std::io::Result<String> {
+fn word(match_str: &str, filename: &Option<String>, fblist: &str) -> std::io::Result<String> {
     use std::io::BufRead;
     use std::{fs, io};
 
-    let wordlist = fs::File::open(filename)?;
-    let wordlist = io::BufReader::new(wordlist);
+    let wordlist : Box<dyn BufRead>;
+    if let Some(f) = filename {
+        let w = fs::File::open(f)?;
+        wordlist = Box::new(io::BufReader::new(w));
+    } else {
+        wordlist = Box::new(io::BufReader::new(fblist.as_bytes()))
+    }
     let mut result = String::new();
 
     for line in wordlist.lines() {