add Display enum

Author: hemreari

src/core.rs

@@ -78,8 +78,7 @@ impl Core {
             match Meta::from_path_recursive(
                 &fs::canonicalize(&absolute_path.to_path_buf()).unwrap(),
                 depth,
-                self.flags.display_all,
-                self.flags.display_almost_all,
+                self.flags.display,
             ) {
                 Ok(meta) => meta_list.push(meta),
                 Err(err) => println!("cannot access '{}': {}", path.display(), err),

src/flags.rs

@@ -2,8 +2,7 @@ use clap::{ArgMatches, Error, ErrorKind};
 
 #[derive(Clone, Debug, Copy)]
 pub struct Flags {
-    pub display_all: bool,
-    pub display_almost_all: bool,
+    pub display: Display,
     pub layout: Layout,
     pub display_indicators: bool,
     pub recursive: bool,
@@ -28,6 +27,14 @@ impl Flags {
         let date_inputs: Vec<&str> = matches.values_of("date").unwrap().collect();
         let dir_order_inputs: Vec<&str> = matches.values_of("group-dirs").unwrap().collect();
 
+        let display = if matches.is_present("all") {
+            Display::DisplayAll
+        } else if matches.is_present("almost-all") {
+            Display::DisplayAlmostAll
+        } else {
+            Display::DisplayOnlyVisible
+        };
+
         let sort_by = if matches.is_present("timesort") {
             SortFlag::Time
         } else {
@@ -68,8 +75,7 @@ impl Flags {
         };
 
         Ok(Self {
-            display_all: matches.is_present("all"),
-            display_almost_all: matches.is_present("almost-all"),
+            display,
             layout,
             display_indicators: matches.is_present("indicators"),
             recursive,
@@ -106,16 +112,15 @@ impl Flags {
 impl Default for Flags {
     fn default() -> Self {
         Self {
-            display_all: false,
-            display_almost_all: false,
+            display: Display::DisplayOnlyVisible,
             layout: Layout::Grid,
             display_indicators: false,
             recursive: false,
             recursion_depth: usize::max_value(),
             sort_by: SortFlag::Name,
             sort_order: SortOrder::Default,
             directory_order: DirOrderFlag::None,
-            size:  SizeFlag::Default,
+            size: SizeFlag::Default,
             date: DateFlag::Date,
             color: WhenFlag::Auto,
             icon: WhenFlag::Auto,
@@ -124,6 +129,13 @@ impl Default for Flags {
     }
 }
 
+#[derive(Clone, Debug, Copy, PartialEq, Eq)]
+pub enum Display {
+    DisplayAll,
+    DisplayAlmostAll,
+    DisplayOnlyVisible,
+}
+
 #[derive(Clone, Debug, Copy, PartialEq, Eq)]
 pub enum SizeFlag {
     Default,

src/meta/mod.rs

@@ -15,6 +15,7 @@ pub use self::owner::Owner;
 pub use self::permissions::Permissions;
 pub use self::size::Size;
 pub use self::symlink::SymLink;
+pub use crate::flags::Display;
 pub use crate::icon::Icons;
 
 use std::fs::read_link;
@@ -39,8 +40,7 @@ impl Meta {
     pub fn from_path_recursive(
         path: &PathBuf,
         depth: usize,
-        list_hidden_files: bool,
-        list_almost_all: bool,
+        display: Display,
     ) -> Result<Self, std::io::Error> {
         let mut meta = Self::from_path(path)?;
 
@@ -59,44 +59,49 @@ impl Meta {
         }
         let mut content = Vec::new();
 
-        if list_hidden_files {
-            let mut current_meta;
-            let mut parent_meta;
+         match display {
+            Display::DisplayAll => {
+                let mut current_meta;
+                let mut parent_meta;
 
-            let parent_path = match path.parent() {
-                None => PathBuf::from("/"),
-                Some(path) => PathBuf::from(path),
-            };
+                let parent_path = match path.parent() {
+                    None => PathBuf::from("/"),
+                    Some(path) => PathBuf::from(path),
+                };
 
-            current_meta = Self::from_path(&PathBuf::from(path))?;
-            current_meta.name.name = ".".to_string();
+                current_meta = Self::from_path(&PathBuf::from(path))?;
+                current_meta.name.name = ".".to_string();
 
-            parent_meta = Self::from_path(&PathBuf::from(parent_path))?;
-            parent_meta.name.name = "..".to_string();
+                parent_meta = Self::from_path(&PathBuf::from(parent_path))?;
+                parent_meta.name.name = "..".to_string();
 
-            content.push(current_meta);
-            content.push(parent_meta);
-        }
+                content.push(current_meta);
+                content.push(parent_meta);
+            }
+            _ => (),
+        };
 
         for entry in meta.path.read_dir()? {
             let path = entry?.path();
 
-            if !list_hidden_files
-                && !list_almost_all
-                && path
-                    .file_name()
-                    .ok_or_else(|| Error::new(ErrorKind::InvalidInput, "invalid file name"))?
-                    .to_string_lossy()
-                    .starts_with('.')
-            {
-                continue;
-            }
+           match display {
+                Display::DisplayOnlyVisible => {
+                    if path
+                        .file_name()
+                        .ok_or_else(|| Error::new(ErrorKind::InvalidInput, "invalid file name"))?
+                        .to_string_lossy()
+                        .starts_with('.')
+                    {
+                        continue;
+                    }
+                }
+                _ => (),
+            };
 
             let entry_meta = match Self::from_path_recursive(
                 &path.to_path_buf(),
                 depth - 1,
-                list_hidden_files,
-                list_almost_all,
+                display,
             ) {
                 Ok(res) => res,
                 Err(err) => {