From 9a83bda8717f62abd57fffb544e8590b03447a36 Mon Sep 17 00:00:00 2001
From: boxdot <d@zerovolt.org>
Date: Sat, 15 Dec 2018 14:44:36 +0100
Subject: Review improvements + unittest of sorting.

---
 src/flags.rs | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

(limited to 'src/flags.rs')

diff --git a/src/flags.rs b/src/flags.rs
index 3e55a0e..9bc4af1 100644
--- a/src/flags.rs
+++ b/src/flags.rs
@@ -8,7 +8,8 @@ pub struct Flags {
     pub display_tree: bool,
     pub display_indicators: bool,
     pub recursive: bool,
-    pub sort: (SortFlag, SortOrder),
+    pub sort_by: SortFlag,
+    pub sort_order: SortOrder,
     pub date: DateFlag,
     pub color: WhenFlag,
     pub icon: WhenFlag,
@@ -20,10 +21,10 @@ impl<'a> From<ArgMatches<'a>> for Flags {
         let icon_inputs: Vec<&str> = matches.values_of("icon").unwrap().collect();
         let date_inputs: Vec<&str> = matches.values_of("date").unwrap().collect();
 
-        let sort_flag = if matches.is_present("timesort") {
+        let sort_by = if matches.is_present("timesort") {
             SortFlag::Time
         } else {
-            SortFlag::Lexicographical
+            SortFlag::Name
         };
         let sort_order = if matches.is_present("reverse") {
             SortOrder::Reverse
@@ -38,7 +39,8 @@ impl<'a> From<ArgMatches<'a>> for Flags {
             display_tree: matches.is_present("tree"),
             display_indicators: matches.is_present("indicators"),
             recursive: matches.is_present("recursive"),
-            sort: (sort_flag, sort_order),
+            sort_by,
+            sort_order,
             // Take only the last value
             date: DateFlag::from(date_inputs[date_inputs.len() - 1]),
             color: WhenFlag::from(color_inputs[color_inputs.len() - 1]),
@@ -56,7 +58,8 @@ impl Default for Flags {
             display_tree: false,
             display_indicators: false,
             recursive: false,
-            sort: (SortFlag::Lexicographical, SortOrder::Default),
+            sort_by: SortFlag::Name,
+            sort_order: SortOrder::Default,
             date: DateFlag::Date,
             color: WhenFlag::Auto,
             icon: WhenFlag::Auto,
@@ -100,7 +103,7 @@ impl<'a> From<&'a str> for WhenFlag {
 
 #[derive(Clone, Debug, Copy, PartialEq, Eq)]
 pub enum SortFlag {
-    Lexicographical,
+    Name,
     Time,
 }
 
-- 
cgit v1.2.3