Merge branch 'master' into patch-1

CHANGELOG.md

@@ -18,7 +18,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Fix obsolete Nerd Font icons from [Han Yeong-woo](https://github.com/nix6839)
 
 ### Fixed
-- `profile` and `.profile` now share the same icon
+- `profile` and `.profile` now share the same icon from [Aaron Lichtman](https://github.com/alichtman)
+- Make tox.ini files use the gear/settings icon ([#859](https://github.com/lsd-rs/lsd/pull/859))
 - Do not quote filename when piping into another program from [TeamTamoad](https://github.com/TeamTamoad)
 - Respect `hidden` flag on Windows [#752](https://github.com/Peltoche/lsd/issues/752)
 - Do not show every file are `executable` (green) on Windows
@@ -28,6 +29,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Handle dereference (-L) with broken symlink from [r3dArch](https://github.com/r3dArch)
 - Avoid using Clap's deprecated structs and functions [sudame](https://github.com/sudame)
 - Icon theme with overrides from config [sudame](https://github.com/sudame)
+- Incorrect colorizing with `--size=bytes` [bells307](https://github.com/bells307)
 
 ## [0.23.1] - 2022-09-13
 

CODEOWNERS

@@ -1 +1 @@
-*       @meain @Peltoche
+*       @meain @Peltoche @zwpaper

src/meta/size.rs

@@ -86,12 +86,15 @@ impl Size {
         ColoredString::new(Colors::default_style(), res)
     }
 
-    fn paint(&self, colors: &Colors, flags: &Flags, content: String) -> ColoredString {
-        let unit = self.get_unit(flags);
-        let elem = match unit {
-            Unit::Byte | Unit::Kilo => &Elem::FileSmall,
-            Unit::Mega => &Elem::FileMedium,
-            _ => &Elem::FileLarge,
+    fn paint(&self, colors: &Colors, content: String) -> ColoredString {
+        let bytes = self.get_bytes();
+
+        let elem = if bytes >= GB {
+            &Elem::FileLarge
+        } else if bytes >= MB {
+            &Elem::FileMedium
+        } else {
+            &Elem::FileSmall
         };
 
         colors.colorize(content, elem)
@@ -100,7 +103,7 @@ impl Size {
     pub fn render_value(&self, colors: &Colors, flags: &Flags) -> ColoredString {
         let content = self.value_string(flags);
 
-        self.paint(colors, flags, content)
+        self.paint(colors, content)
     }
 
     pub fn value_string(&self, flags: &Flags) -> String {
@@ -118,7 +121,7 @@ impl Size {
     pub fn render_unit(&self, colors: &Colors, flags: &Flags) -> ColoredString {
         let content = self.unit_string(flags);
 
-        self.paint(colors, flags, content)
+        self.paint(colors, content)
     }
 
     pub fn unit_string(&self, flags: &Flags) -> String {

src/theme/icon.rs

@@ -280,7 +280,7 @@ impl IconTheme {
             ("sudoers", "\u{f023}"),            // ""
             ("sxhkdrc", "\u{e615}"),            // ""
             ("tigrc", "\u{e615}"),              // ""
-            ("tox.ini", "\u{f0320}"),           // "󰌠"
+            ("tox.ini", "\u{e615}"),            // ""
             (".trash", "\u{f1f8}"),             // ""
             ("ts", "\u{e628}"),                 // ""
             ("unlicense", "\u{e60a}"),          // ""