color files with lscolors

Author: meain

Cargo.lock

@@ -28,6 +28,7 @@ time = "0.1.40"
 users = "0.8.0"
 chrono-humanize = "0.0.11"
 unicode-width = "0.1.5"
+lscolors = "0.5.0"
 
 [dependencies.clap]
 features = ["suggestions", "color", "wrap_help"]

Cargo.toml

@@ -1,4 +1,5 @@
 use ansi_term::{ANSIString, Colour, Style};
+use lscolors::{Indicator, LsColors};
 use std::collections::HashMap;
 
 #[allow(dead_code)]
@@ -62,6 +63,7 @@ pub enum Theme {
 
 pub struct Colors {
     colors: Option<HashMap<Elem, Colour>>,
+    lscolors: LsColors,
 }
 
 impl Colors {
@@ -70,24 +72,83 @@ impl Colors {
             Theme::NoColor => None,
             Theme::Default => Some(Self::get_light_theme_colour_map()),
         };
+        let lscolors = LsColors::from_env().unwrap_or_default();
 
-        Self { colors }
+        Self { colors, lscolors }
     }
 
     pub fn colorize<'a>(&self, input: String, elem: &Elem) -> ColoredString<'a> {
         self.style(elem).paint(input)
     }
 
+    pub fn colorize_using_path<'a>(&self, input: String, path: &str) -> ColoredString<'a> {
+        self.style_from_path(path).paint(input)
+    }
+
+    fn style_from_path(&self, path: &str) -> Style {
+        let style = self.lscolors.style_for_path(path);
+        style
+            .map(lscolors::Style::to_ansi_term_style)
+            .unwrap_or_default()
+    }
+
     fn style(&self, elem: &Elem) -> Style {
-        if let Some(ref colors) = self.colors {
-            let style_fg = Style::default().fg(colors[elem]);
-            if elem.has_suid() {
-                style_fg.on(Colour::Fixed(124)) // Red3
-            } else {
-                style_fg
+        let indicator = self.get_indicator_from_elem(elem);
+        match indicator {
+            Some(style) => {
+                let style = self.lscolors.style_for_indicator(style);
+                let ans = style
+                    .map(lscolors::Style::to_ansi_term_style)
+                    .unwrap_or_default();
+                ans
+            }
+            None => {
+                if let Some(ref colors) = self.colors {
+                    let style_fg = Style::default().fg(colors[elem]);
+                    if elem.has_suid() {
+                        style_fg.on(Colour::Fixed(124)) // Red3
+                    } else {
+                        style_fg
+                    }
+                } else {
+                    Style::default()
+                }
+            }
+        }
+    }
+
+    fn get_indicator_from_elem(&self, elem: &Elem) -> Option<Indicator> {
+        let indicator_string = match elem {
+            Elem::File { exec, uid } => {
+                if !uid {
+                    if !exec {
+                        Some("fi")
+                    } else {
+                        Some("ex")
+                    }
+                } else {
+                    None
+                }
             }
-        } else {
-            Style::default()
+            Elem::Dir { uid } => {
+                if !uid {
+                    Some("di")
+                } else {
+                    None
+                }
+            }
+            Elem::SymLink => Some("ln"),
+            Elem::Pipe => Some("pi"),
+            Elem::Socket => Some("so"),
+            Elem::BlockDevice => Some("bd"),
+            Elem::CharDevice => Some("cd"),
+            Elem::BrokenSymLink => Some("or"),
+            _ => None,
+        };
+
+        match indicator_string {
+            Some(ids) => Indicator::from(ids),
+            None => None,
         }
     }
 

src/color.rs

@@ -13,6 +13,7 @@ extern crate clap;
 extern crate ansi_term;
 extern crate chrono_humanize;
 extern crate libc;
+extern crate lscolors;
 #[cfg(test)]
 extern crate tempdir;
 extern crate term_grid;

src/main.rs

@@ -1,4 +1,4 @@
-use color::{ColoredString, Colors, Elem};
+use color::{ColoredString, Colors};
 use icon::Icons;
 use meta::filetype::FileType;
 use std::cmp::{Ordering, PartialOrd};
@@ -7,6 +7,7 @@ use std::path::Path;
 #[derive(Debug, Eq)]
 pub struct Name {
     name: String,
+    path: String,
     extension: Option<String>,
     file_type: FileType,
 }
@@ -27,8 +28,11 @@ impl Name {
             );
         }
 
+        let path_string = path.to_string_lossy().to_string();
+
         Self {
             name,
+            path:path_string,
             extension,
             file_type,
         }
@@ -39,21 +43,9 @@ impl Name {
         let mut content = String::with_capacity(icon.len() + self.name.len() + 3 /* spaces */);
 
         content += icon.as_str();
-
-        let elem = match self.file_type {
-            FileType::CharDevice => Elem::CharDevice,
-            FileType::Directory { uid } => Elem::Dir { uid },
-            FileType::SymLink => Elem::SymLink,
-            FileType::File { uid, exec } => Elem::File { uid, exec },
-            _ => Elem::File {
-                exec: false,
-                uid: false,
-            },
-        };
-
         content += &self.name;
 
-        colors.colorize(content, &elem)
+        colors.colorize_using_path(content, &self.path)
     }
 
     pub fn name(&self) -> String {