From 5bc5c3f0b8fa89c1f09e1061c0fc6eef84ef405c Mon Sep 17 00:00:00 2001
From: Abin Simon <abinsimon10@gmail.com>
Date: Sat, 26 Jan 2019 12:39:22 +0530
Subject: [PATCH 1/2] color files with lscolors

---
 Cargo.lock       | 10 +++++++
 Cargo.toml       |  1 +
 src/color.rs     | 73 +++++++++++++++++++++++++++++++++++++++++++++++-
 src/main.rs      |  1 +
 src/meta/name.rs |  9 ++++--
 5 files changed, 90 insertions(+), 4 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index f9107ee97..ca7566240 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -82,6 +82,14 @@ name = "libc"
 version = "0.2.44"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 
+[[package]]
+name = "lscolors"
+version = "0.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "ansi_term 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
 [[package]]
 name = "lsd"
 version = "0.12.1-pre"
@@ -90,6 +98,7 @@ dependencies = [
  "chrono-humanize 0.0.11 (registry+https://github.com/rust-lang/crates.io-index)",
  "clap 2.32.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "libc 0.2.44 (registry+https://github.com/rust-lang/crates.io-index)",
+ "lscolors 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "tempdir 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)",
  "term_grid 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)",
  "terminal_size 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -276,6 +285,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 "checksum fuchsia-zircon-sys 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)" = "3dcaa9ae7725d12cdb85b3ad99a434db70b468c09ded17e012d86b5c1010f7a7"
 "checksum kernel32-sys 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "7507624b29483431c0ba2d82aece8ca6cdba9382bff4ddd0f7490560c056098d"
 "checksum libc 0.2.44 (registry+https://github.com/rust-lang/crates.io-index)" = "10923947f84a519a45c8fefb7dd1b3e8c08747993381adee176d7a82b4195311"
+"checksum lscolors 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)" = "e9938fd8c379393454f73ec4c9c5b40f3d8332d80b25a29da05e41ee0ecbb559"
 "checksum num-integer 0.1.39 (registry+https://github.com/rust-lang/crates.io-index)" = "e83d528d2677f0518c570baf2b7abdcf0cd2d248860b68507bdcb3e91d4c0cea"
 "checksum num-traits 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)" = "0b3a5d7cc97d6d30d8b9bc8fa19bf45349ffe46241e8816f50f62f6d6aaabee1"
 "checksum rand 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)" = "8356f47b32624fef5b3301c1be97e5944ecdd595409cc5da11d05f211db6cfbd"
diff --git a/Cargo.toml b/Cargo.toml
index d7c5a037d..96e6d7fd7 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -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"]
diff --git a/src/color.rs b/src/color.rs
index 4587e3673..baad8ac65 100644
--- a/src/color.rs
+++ b/src/color.rs
@@ -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: Option<LsColors>,
 }
 
 impl Colors {
@@ -70,15 +72,55 @@ impl Colors {
             Theme::NoColor => None,
             Theme::Default => Some(Self::get_light_theme_colour_map()),
         };
+        let lscolors = LsColors::from_env();
 
-        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,
+        elem: &Elem,
+    ) -> ColoredString<'a> {
+        let style_from_path = self.style_from_path(path);
+        match style_from_path {
+            Some(style_from_path) => style_from_path.paint(input),
+            None => self.colorize(input, elem),
+        }
+    }
+
+    fn style_from_path(&self, path: &str) -> Option<Style> {
+        match &self.lscolors {
+            Some(lscolors) => lscolors
+                    .style_for_path(path)
+                    .map(lscolors::Style::to_ansi_term_style),
+            None => None,
+        }
+    }
+
     fn style(&self, elem: &Elem) -> Style {
+        match &self.lscolors {
+            Some(lscolors) => {
+                match self.get_indicator_from_elem(elem) {
+                    Some(style) => {
+                        let style = lscolors.style_for_indicator(style);
+                        style
+                            .map(lscolors::Style::to_ansi_term_style)
+                            .unwrap_or_default()
+                    }
+                    None => self.style_default(elem),
+                }
+            }
+            None => self.style_default(elem),
+        }
+    }
+
+    fn style_default(&self, elem: &Elem) -> Style {
         if let Some(ref colors) = self.colors {
             let style_fg = Style::default().fg(colors[elem]);
             if elem.has_suid() {
@@ -91,6 +133,35 @@ impl Colors {
         }
     }
 
+    fn get_indicator_from_elem(&self, elem: &Elem) -> Option<Indicator> {
+        let indicator_string = match elem {
+            Elem::File { exec, uid } => match (exec, uid) {
+                (_, true) => None,
+                (true, false) => Some("ex"),
+                (false, false) => Some("fi"),
+            },
+            Elem::Dir { uid } => {
+                if *uid {
+                    None
+                } else {
+                    Some("di")
+                }
+            }
+            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,
+        }
+    }
+
     // You can find the table for each color, code, and display at:
     //
     //https://jonasjacek.github.io/colors/
diff --git a/src/main.rs b/src/main.rs
index 1a092c5c6..5b2be9c59 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -10,6 +10,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;
diff --git a/src/meta/name.rs b/src/meta/name.rs
index 743195c45..7d3a24ea8 100644
--- a/src/meta/name.rs
+++ b/src/meta/name.rs
@@ -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,6 +43,7 @@ impl Name {
         let mut content = String::with_capacity(icon.len() + self.name.len() + 3 /* spaces */);
 
         content += icon.as_str();
+        content += &self.name;
 
         let elem = match self.file_type {
             FileType::CharDevice => Elem::CharDevice,
@@ -51,9 +56,7 @@ impl Name {
             },
         };
 
-        content += &self.name;
-
-        colors.colorize(content, &elem)
+        colors.colorize_using_path(content, &self.path, &elem)
     }
 
     pub fn name(&self) -> String {

From d9deed86591fcdd56619732cc52f3ab1fc696f2e Mon Sep 17 00:00:00 2001
From: Abin Simon <abinsimon10@gmail.com>
Date: Fri, 8 Feb 2019 13:13:43 +0530
Subject: [PATCH 2/2] Update tests to work with LSCOLORS update

Added another enum value to Theme `NoLscolors`.
As of right now it only helps with tests, but maybe useful for something
in future.

Colouring based on LSCOLORS should be tested in the package so we should
be good.
---
 src/color.rs         | 10 +++++++++-
 src/display.rs       |  2 +-
 src/meta/filetype.rs | 12 ++++++------
 src/meta/name.rs     |  8 ++++----
 4 files changed, 20 insertions(+), 12 deletions(-)

diff --git a/src/color.rs b/src/color.rs
index baad8ac65..77c22f0b2 100644
--- a/src/color.rs
+++ b/src/color.rs
@@ -55,10 +55,13 @@ impl Elem {
 
 pub type ColoredString<'a> = ANSIString<'a>;
 
+
+#[allow(dead_code)]
 #[derive(Debug, Copy, Clone)]
 pub enum Theme {
     NoColor,
     Default,
+    NoLscolors,
 }
 
 pub struct Colors {
@@ -71,8 +74,13 @@ impl Colors {
         let colors = match theme {
             Theme::NoColor => None,
             Theme::Default => Some(Self::get_light_theme_colour_map()),
+            Theme::NoLscolors => Some(Self::get_light_theme_colour_map()),
+        };
+        let lscolors = match theme {
+            Theme::NoColor => None,
+            Theme::Default => LsColors::from_env(),
+            Theme::NoLscolors => None,
         };
-        let lscolors = LsColors::from_env();
 
         Self { colors, lscolors }
     }
diff --git a/src/display.rs b/src/display.rs
index 14091558b..0e78b3a2d 100644
--- a/src/display.rs
+++ b/src/display.rs
@@ -443,7 +443,7 @@ mod tests {
             );
             let output = name
                 .render(
-                    &Colors::new(color::Theme::Default),
+                    &Colors::new(color::Theme::NoLscolors),
                     &Icons::new(icon::Theme::NoIcon),
                 )
                 .to_string();
diff --git a/src/meta/filetype.rs b/src/meta/filetype.rs
index 8b137deaf..e0c9a4744 100644
--- a/src/meta/filetype.rs
+++ b/src/meta/filetype.rs
@@ -84,7 +84,7 @@ mod test {
         File::create(&file_path).expect("failed to create file");
         let meta = file_path.metadata().expect("failed to get metas");
 
-        let colors = Colors::new(Theme::Default);
+        let colors = Colors::new(Theme::NoLscolors);
         let file_type = FileType::new(&meta, &Permissions::from(&meta));
 
         assert_eq!(Colour::Fixed(184).paint("."), file_type.render(&colors));
@@ -95,7 +95,7 @@ mod test {
         let tmp_dir = TempDir::new("test_dir_type").expect("failed to create temp dir");
         let meta = tmp_dir.path().metadata().expect("failed to get metas");
 
-        let colors = Colors::new(Theme::Default);
+        let colors = Colors::new(Theme::NoLscolors);
         let file_type = FileType::new(&meta, &Permissions::from(&meta));
 
         assert_eq!(Colour::Fixed(33).paint("d"), file_type.render(&colors));
@@ -116,7 +116,7 @@ mod test {
             .symlink_metadata()
             .expect("failed to get metas");
 
-        let colors = Colors::new(Theme::Default);
+        let colors = Colors::new(Theme::NoLscolors);
         let file_type = FileType::new(&meta, &Permissions::from(&meta));
 
         assert_eq!(Colour::Fixed(44).paint("l"), file_type.render(&colors));
@@ -136,7 +136,7 @@ mod test {
         assert_eq!(true, success, "failed to exec mkfifo");
         let meta = pipe_path.metadata().expect("failed to get metas");
 
-        let colors = Colors::new(Theme::Default);
+        let colors = Colors::new(Theme::NoLscolors);
         let file_type = FileType::new(&meta, &Permissions::from(&meta));
 
         assert_eq!(Colour::Fixed(44).paint("|"), file_type.render(&colors));
@@ -161,7 +161,7 @@ mod test {
         assert_eq!(true, success, "failed to exec mknod");
         let meta = char_device_path.metadata().expect("failed to get metas");
 
-        let colors = Colors::new(Theme::Default);
+        let colors = Colors::new(Theme::NoLscolors);
         let file_type = FileType::new(&meta, &Permissions::from(&meta));
 
         assert_eq!(Colour::Fixed(44).paint("c"), file_type.render(&colors));
@@ -176,7 +176,7 @@ mod test {
         UnixListener::bind(&socket_path).expect("failed to create the socket");
         let meta = socket_path.metadata().expect("failed to get metas");
 
-        let colors = Colors::new(Theme::Default);
+        let colors = Colors::new(Theme::NoLscolors);
         let file_type = FileType::new(&meta, &Permissions::from(&meta));
 
         assert_eq!(Colour::Fixed(44).paint("s"), file_type.render(&colors));
diff --git a/src/meta/name.rs b/src/meta/name.rs
index 7d3a24ea8..437e882e5 100644
--- a/src/meta/name.rs
+++ b/src/meta/name.rs
@@ -115,7 +115,7 @@ mod test {
         File::create(&file_path).expect("failed to create file");
         let meta = file_path.metadata().expect("failed to get metas");
 
-        let colors = Colors::new(color::Theme::Default);
+        let colors = Colors::new(color::Theme::NoLscolors);
         let file_type = FileType::new(&meta, &Permissions::from(&meta));
         let name = Name::new(&file_path, file_type);
 
@@ -135,7 +135,7 @@ mod test {
         fs::create_dir(&dir_path).expect("failed to create the dir");
         let meta = dir_path.metadata().expect("failed to get metas");
 
-        let colors = Colors::new(color::Theme::Default);
+        let colors = Colors::new(color::Theme::NoLscolors);
         let file_type = FileType::new(&meta, &Permissions::from(&meta));
         let name = Name::new(&dir_path, file_type);
 
@@ -161,7 +161,7 @@ mod test {
             .symlink_metadata()
             .expect("failed to get metas");
 
-        let colors = Colors::new(color::Theme::Default);
+        let colors = Colors::new(color::Theme::NoLscolors);
         let file_type = FileType::new(&meta, &Permissions::from(&meta));
         let name = Name::new(&symlink_path, file_type);
 
@@ -186,7 +186,7 @@ mod test {
         assert_eq!(true, success, "failed to exec mkfifo");
         let meta = pipe_path.metadata().expect("failed to get metas");
 
-        let colors = Colors::new(color::Theme::Default);
+        let colors = Colors::new(color::Theme::NoLscolors);
         let file_type = FileType::new(&meta, &Permissions::from(&meta));
         let name = Name::new(&pipe_path, file_type);