From 23e5d3ce8dbc973e88cd5886b05300d63e5c8234 Mon Sep 17 00:00:00 2001
From: Benjamin Sago <ogham@bsago.me>
Date: Mon, 12 Jan 2015 22:14:27 +0100
Subject: [PATCH] Allow for different types of failure

---
 src/exa.rs     | 28 ++++++++++++++++++----------
 src/options.rs | 44 +++++++++++++++++++++++++++-----------------
 2 files changed, 45 insertions(+), 27 deletions(-)

diff --git a/src/exa.rs b/src/exa.rs
index 373eaa0..a96eb01 100644
--- a/src/exa.rs
+++ b/src/exa.rs
@@ -7,11 +7,12 @@ extern crate users;
 
 use std::io::FileType;
 use std::io::fs;
-use std::os;
+use std::os::{args, set_exit_status};
 
 use dir::Dir;
 use file::File;
 use options::Options;
+use options::Error::*;
 
 pub mod column;
 pub mod dir;
@@ -21,15 +22,6 @@ pub mod options;
 pub mod output;
 pub mod term;
 
-fn main() {
-    let args: Vec<String> = os::args();
-
-    match Options::getopts(args) {
-        Err(error_code) => os::set_exit_status(error_code),
-        Ok(options) => exa(&options),
-    };
-}
-
 fn exa(options: &Options) {
     let mut dirs: Vec<String> = vec![];
     let mut files: Vec<File> = vec![];
@@ -92,3 +84,19 @@ fn exa(options: &Options) {
         };
     }
 }
+
+fn main() {
+    let args: Vec<String> = args();
+
+    match Options::getopts(args) {
+        Ok(options) => exa(&options),
+        Err(Help(text)) => {
+            println!("{}", text);
+            set_exit_status(2);
+        },
+        Err(InvalidOptions(e)) => {
+            println!("{}", e);
+            set_exit_status(3);
+        },
+    };
+}
diff --git a/src/options.rs b/src/options.rs
index 51a07ff..511c57e 100644
--- a/src/options.rs
+++ b/src/options.rs
@@ -17,18 +17,22 @@ pub enum SortField {
 impl Copy for SortField { }
 
 impl SortField {
-    fn from_word(word: String) -> SortField {
+    fn from_word(word: String) -> Result<SortField, Error> {
         match word.as_slice() {
-            "name"  => SortField::Name,
-            "size"  => SortField::Size,
-            "ext"   => SortField::Extension,
-            "none"  => SortField::Unsorted,
-            "inode" => SortField::FileInode,
-            _       => panic!("Invalid sorting order"),
+            "name"  => Ok(SortField::Name),
+            "size"  => Ok(SortField::Size),
+            "ext"   => Ok(SortField::Extension),
+            "none"  => Ok(SortField::Unsorted),
+            "inode" => Ok(SortField::FileInode),
+            field   => Err(no_sort_field(field))
         }
     }
 }
 
+fn no_sort_field(field: &str) -> Error {
+    Error::InvalidOptions(getopts::Fail::UnrecognizedOption(format!("--sort {}", field)))
+}
+
 pub struct Options {
     pub list_dirs: bool,
     path_strs: Vec<String>,
@@ -38,9 +42,14 @@ pub struct Options {
     pub view: View,
 }
 
+pub enum Error {
+    InvalidOptions(getopts::Fail),
+    Help(String),
+}
+
 impl Options {
-    pub fn getopts(args: Vec<String>) -> Result<Options, isize> {
-        let opts = [
+    pub fn getopts(args: Vec<String>) -> Result<Options, Error> {
+        let opts = &[
             getopts::optflag("1", "oneline",   "display one entry per line"),
             getopts::optflag("a", "all",       "show dot-files"),
             getopts::optflag("b", "binary",    "use binary prefixes in file sizes"),
@@ -58,25 +67,26 @@ impl Options {
             getopts::optflag("?", "help",      "show list of command-line options"),
         ];
 
-        let matches = match getopts::getopts(args.tail(), &opts) {
+        let matches = match getopts::getopts(args.tail(), opts) {
             Ok(m) => m,
-            Err(e) => {
-                println!("Invalid options: {}", e);
-                return Err(1);
-            }
+            Err(e) => return Err(Error::InvalidOptions(e)),
         };
 
         if matches.opt_present("help") {
-            println!("exa - ls with more features\n\n{}", getopts::usage("Usage:\n  exa [options] [files...]", &opts));
-            return Err(2);
+            return Err(Error::Help(getopts::usage("Usage:\n  exa [options] [files...]", opts)));
         }
 
+        let sort_field = match matches.opt_str("sort") {
+            Some(word) => try!(SortField::from_word(word)),
+            None => SortField::Name,
+        };
+
         Ok(Options {
             list_dirs:       matches.opt_present("list-dirs"),
             path_strs:       if matches.free.is_empty() { vec![ ".".to_string() ] } else { matches.free.clone() },
             reverse:         matches.opt_present("reverse"),
             show_invisibles: matches.opt_present("all"),
-            sort_field:      matches.opt_str("sort").map(|word| SortField::from_word(word)).unwrap_or(SortField::Name),
+            sort_field:      sort_field,
             view:            Options::view(&matches),
         })
     }