Add input file as pos argument, depricate -f

Author: AxlLind

src/config.rs

@@ -1,10 +1,10 @@
 use clap::{App, Arg};
 
 pub struct Config {
-  pub minimize:  bool,
+  pub minimize: bool,
   pub separator: String,
-  pub file:      Option<String>,
-  pub outfile:   Option<String>,
+  pub file: Option<String>,
+  pub out:  Option<String>,
 }
 
 impl Config {
@@ -13,36 +13,17 @@ impl Config {
       .version("1.0.2")
       .author("Axel Lindeberg")
       .about("Makes creating tables in markdown much easier!")
-      .arg(Arg::with_name("minimize")
-        .help("Minimizes table output")
-        .long("minimize")
-        .short("m")
-      )
-      .arg(Arg::with_name("file")
-        .help("Reads table values from this if given, stdin otherwise.")
-        .long("file")
-        .short("f")
-        .takes_value(true)
-      )
-      .arg(Arg::with_name("outfile")
-        .help("Prints output to this if given, stdout otherwise.")
-        .long("out")
-        .short("o")
-        .takes_value(true)
-      )
-      .arg(Arg::with_name("separator")
-        .help("String that separates values.")
-        .long("separator")
-        .short("s")
-        .default_value(",")
-      )
+      .arg(Arg::from_usage("[FILE] 'Reads table tables from this. [default: stdin]'"))
+      .arg(Arg::from_usage("-o --out       [FILE]   'Prints output to this.  [default: stdout]'"))
+      .arg(Arg::from_usage("-s --separator [STRING] 'Separates values.       [default: ,]'"))
+      .arg(Arg::from_usage("-m --minimize           'Minimizes table output'"))
       .get_matches();
 
     Config {
       minimize:  args.is_present("minimize"),
-      separator: args.value_of("separator").map(String::from).unwrap(),
-      file:      args.value_of("file").map(String::from),
-      outfile:   args.value_of("outfile").map(String::from),
+      separator: args.value_of("separator").unwrap_or(",").to_string(),
+      file:      args.value_of("FILE").map(String::from),
+      out:       args.value_of("out").map(String::from),
     }
   }
 }

src/main.rs

@@ -10,6 +10,9 @@ use config::Config;
 
 fn read_lines(file: &Option<String>) -> Result<Vec<String>> {
   match file {
+    Some(f) => BufReader::new( File::open(f)? )
+      .lines()
+      .collect(),
     None => {
       let stdin = io::stdin();
       let lines = stdin.lock()
@@ -21,21 +24,18 @@ fn read_lines(file: &Option<String>) -> Result<Vec<String>> {
         .collect();
       lines
     },
-    Some(f) => BufReader::new( File::open(f)? )
-      .lines()
-      .collect()
   }
 }
 
 fn parse_table_data(lines: &Vec<String>, separator: &String) -> Vec<Vec<String>> {
-  let mut rows: Vec<Vec<String>> = lines.iter()
+  let mut rows = lines.iter()
     .map(|line| line
       .split(separator)
       .map(|word| word.trim())
       .map(String::from)
-      .collect()
+      .collect::<Vec<_>>()
     )
-    .collect();
+    .collect::<Vec<_>>();
   let max_len = rows.iter()
     .map(|row| row.len())
     .max()
@@ -87,8 +87,8 @@ fn format_pretty(data: &Vec<Vec<String>>) -> String {
 
 fn main() -> Result<()> {
   let config = Config::from_args();
-  let lines  = read_lines(&config.file)?;
-  let data   = parse_table_data(&lines, &config.separator);
+  let lines = read_lines(&config.file)?;
+  let data = parse_table_data(&lines, &config.separator);
 
   if data.len() < 2 || data[0].len() == 0 {
     eprintln!("Bad Input: Table requires at least 2 rows (including header) and 1 column.");
@@ -99,9 +99,9 @@ fn main() -> Result<()> {
     true  => format_minimized(&data),
     false => format_pretty(&data),
   } + "\n";
-  match config.outfile {
-    None    => print!("{}", &table),
+  match config.out {
     Some(f) => fs::write(f, &table)?,
+    None    => print!("{}", &table),
   };
   Ok(())
 }