Reorganize massivelyv0.1.2

1 files changed, 7 insertions, 16 deletions

diff --git a/src/main.rs b/src/main.rs
index d6c7c50..1050950 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -1,15 +1,16 @@
-use regex::Regex;
 use std::fs::File;
 use std::io::{self, BufRead, BufReader, Read, Write};
-use std::process;
 use structopt::StructOpt;
 
 mod choice;
+mod config;
+use config::Config;
 
 fn main() {
-    let opt = choice::Opt::from_args();
+    let opt = config::Opt::from_args();
+    let config = Config::new(opt);
 
-    let read = match &opt.input {
+    let read = match &config.opt.input {
         Some(f) => Box::new(File::open(f).expect("Could not open file")) as Box<dyn Read>,
         None => Box::new(io::stdin()) as Box<dyn Read>,
     };
@@ -20,22 +21,12 @@ fn main() {
     let lock = stdout.lock();
     let mut handle = io::BufWriter::new(lock);
 
-    let re = Regex::new(match &opt.field_separator {
-        Some(s) => s,
-        None => "[[:space:]]",
-    })
-    .unwrap_or_else(|e| {
-        eprintln!("Failed to compile regular expression: {}", e);
-        // Exit code of 1 means failed to compile field_separator regex
-        process::exit(1);
-    });
-
     let lines = buf.lines();
     for line in lines {
         match line {
             Ok(l) => {
-                for choice in &opt.choice {
-                    choice.print_choice(&l, &opt, &re, &mut handle);
+                for choice in &config.opt.choice {
+                    choice.print_choice(&l, &config, &mut handle);
                 }
                 writeln!(handle, "");
             }