Merge pull request #122 from solidiquis/bug/default-icon-ansi-escape

remove ansi escapes for default icon

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "erdtree"
-version = "1.8.0"
+version = "1.8.1"
 edition = "2021"
 authors = ["Benjamin Nguyen <[email protected]>"]
 description = """

src/icons.rs

@@ -30,8 +30,8 @@ pub fn icon_from_file_name(name: &OsStr) -> Option<&'static str> {
 }
 
 /// Returns the default fallback icon.
-pub fn get_default_icon<'a>() -> &'a str {
-    DEFAULT_ICON.as_str()
+pub fn get_default_icon<'a>() -> (u8, &'a str) {
+    *DEFAULT_ICON
 }
 
 /// Convenience method to paint fixed colors.
@@ -40,7 +40,7 @@ pub fn col(num: u8, code: &str) -> String {
 }
 
 /// Default fallback icon.
-static DEFAULT_ICON: Lazy<String> = Lazy::new(|| col(66, "\u{f15b}"));
+static DEFAULT_ICON: Lazy<(u8, &str)> = Lazy::new(|| (66, "\u{f15b}"));
 
 /// Lazily evaluated static hash-map of special file-types and their corresponding styled icons.
 /// These icons will take on the color properties of their associated file which is based on

src/render/context/mod.rs

@@ -26,7 +26,7 @@ mod test;
 #[derive(Parser, Debug)]
 #[command(name = "erdtree")]
 #[command(author = "Benjamin Nguyen. <[email protected]>")]
-#[command(version = "1.8.0")]
+#[command(version = "1.8.1")]
 #[command(about = "erdtree (et) is a multi-threaded file-tree visualization and disk usage analysis tool.", long_about = None)]
 pub struct Context {
     /// Include aggregate file count in tree output

src/render/tree/node/mod.rs

@@ -321,7 +321,12 @@ impl Node {
             return icon;
         }
 
-        Some(Cow::from(get_default_icon()))
+        if no_color {
+            Some(Cow::from(get_default_icon().1))
+        } else {
+            let (code, icon) = get_default_icon();
+            Some(Cow::from(icons::col(code, icon)))
+        }
     }
 }
 
@@ -355,7 +360,8 @@ impl TryFrom<(DirEntry, &Context)> for Node {
         };
 
         let icon = if ctx.icons {
-            Self::compute_icon(&dir_entry, link_target.as_ref(), style, ctx.no_color)
+            let no_color = ctx.no_color || !tty::stdout_is_tty();
+            Self::compute_icon(&dir_entry, link_target.as_ref(), style, no_color)
         } else {
             None
         };