fix: use full PathBuf key in build_coloring_map to prevent basename collision

Co-authored-by: KSXGitHub <11488886+KSXGitHub@users.noreply.github.com>

Author: Copilot

src/app/sub.rs

@@ -197,7 +197,7 @@ where
                 .or(deduplication_result);
         }
 
-        let coloring: Option<Coloring<OsStringDisplay>> = color.map(|ls_colors| {
+        let coloring: Option<Coloring> = color.map(|ls_colors| {
             let mut map = HashMap::new();
             build_coloring_map(&data_tree, PathBuf::new(), &mut map);
             Coloring::new(ls_colors, map)
@@ -279,7 +279,7 @@ where
     }
 }
 
-/// Recursively walk a pruned [`DataTree`] and build a map of leaf node names to [`Color`] values.
+/// Recursively walk a pruned [`DataTree`] and build a map of full paths to [`Color`] values.
 ///
 /// The `path` argument should be the current path prefix for reconstructing full filesystem paths.
 /// Leaf nodes (files or childless directories after pruning) are added to the map.
@@ -288,7 +288,7 @@ where
 fn build_coloring_map(
     node: &DataTree<OsStringDisplay, impl size::Size>,
     path: PathBuf,
-    map: &mut HashMap<OsStringDisplay, Color>,
+    map: &mut HashMap<PathBuf, Color>,
 ) {
     let node_path = path.join(node.name().as_os_str());
     if !node.children().is_empty() {
@@ -297,7 +297,8 @@ fn build_coloring_map(
         }
         return;
     }
-    map.insert(node.name().clone(), file_color(&node_path));
+    let color = file_color(&node_path);
+    map.insert(node_path, color);
 }
 
 fn file_color(path: &Path) -> Color {

src/visualizer.rs

@@ -62,7 +62,7 @@ where
     /// Distribution and total number of characters/blocks can be placed in a line.
     pub column_width_distribution: ColumnWidthDistribution,
     /// Mapping of names to colors for colorful output.
-    pub coloring: Option<&'a Coloring<Name>>,
+    pub coloring: Option<&'a Coloring>,
 }
 
 mod copy;

src/visualizer/coloring.rs

@@ -1,28 +1,32 @@
 use super::{ChildPosition, TreeHorizontalSlice};
 use crate::ls_colors::LsColors;
 use derive_more::Display;
-use std::{collections::HashMap, fmt, hash::Hash};
+use std::{
+    collections::HashMap,
+    fmt,
+    path::{Path, PathBuf},
+};
 use zero_copy_pads::Width;
 
-/// Coloring configuration: ANSI prefix strings from the environment and a name-to-color map.
+/// Coloring configuration: ANSI prefix strings from the environment and a full-path-to-color map.
 #[derive(Debug)]
-pub struct Coloring<Name> {
+pub struct Coloring {
     ansi_prefixes: LsColors,
-    map: HashMap<Name, Color>,
+    map: HashMap<PathBuf, Color>,
 }
 
-impl<Name: Hash + Eq> Coloring<Name> {
-    /// Create a new [`Coloring`] from ANSI prefixes and a name-to-color map.
-    pub fn new(ansi_prefixes: LsColors, map: HashMap<Name, Color>) -> Self {
+impl Coloring {
+    /// Create a new [`Coloring`] from ANSI prefixes and a full-path-to-color map.
+    pub fn new(ansi_prefixes: LsColors, map: HashMap<PathBuf, Color>) -> Self {
         Coloring { ansi_prefixes, map }
     }
 
     /// Return `(color, prefixes)` for a node, used to build a colored slice for rendering.
-    pub(super) fn node_color(&self, name: &Name, has_children: bool) -> Option<(Color, &LsColors)> {
+    pub(super) fn node_color(&self, path: &Path, has_children: bool) -> Option<(Color, &LsColors)> {
         let color = if has_children {
             Some(Color::Directory)
         } else {
-            self.map.get(name).copied()
+            self.map.get(path).copied()
         }?;
         Some((color, &self.ansi_prefixes))
     }

src/visualizer/display.rs

@@ -1,13 +1,14 @@
 use super::{Direction::*, Visualizer};
 use crate::size;
 use std::{
+    ffi::OsStr,
     fmt::{Display, Error, Formatter},
     hash::Hash,
 };
 
 impl<'a, Name, Size> Display for Visualizer<'a, Name, Size>
 where
-    Name: Display + Hash + Eq,
+    Name: Display + Hash + Eq + AsRef<OsStr>,
     Size: size::Size + Into<u64>,
 {
     /// Create the ASCII chart.

src/visualizer/methods.rs

@@ -14,12 +14,12 @@ use tree_table::*;
 
 use super::{coloring::ColoredTreeHorizontalSlice, ColumnWidthDistribution, Visualizer};
 use crate::size;
-use std::{cmp::min, fmt::Display, hash::Hash};
+use std::{cmp::min, ffi::OsStr, fmt::Display, hash::Hash, path::PathBuf};
 use zero_copy_pads::{align_left, align_right};
 
 impl<'a, Name, Size> Visualizer<'a, Name, Size>
 where
-    Name: Display + Hash + Eq,
+    Name: Display + Hash + Eq + AsRef<OsStr>,
     Size: size::Size + Into<u64>,
 {
     /// Create ASCII rows that visualize the [tree](crate::data_tree::DataTree), such rows
@@ -92,10 +92,15 @@ where
                 } = tree_row;
 
                 let colored = self.coloring.and_then(|coloring| {
-                    coloring.node_color(
-                        initial_row.node_info.name,
-                        initial_row.node_info.children_count > 0,
-                    )
+                    let path: PathBuf = initial_row
+                        .ancestors
+                        .iter()
+                        .map(|a| a.name.as_ref() as &OsStr)
+                        .chain(std::iter::once(
+                            initial_row.node_info.name.as_ref() as &OsStr
+                        ))
+                        .collect();
+                    coloring.node_color(&path, initial_row.node_info.children_count > 0)
                 });
 
                 let aligned_colored_slice;

tests/usual_cli.rs

@@ -27,7 +27,7 @@ use parallel_disk_usage::{
     visualizer::{Color, Coloring},
 };
 #[cfg(unix)]
-use std::collections::HashMap;
+use std::{collections::HashMap, path::PathBuf};
 
 #[cfg(unix)]
 use parallel_disk_usage::get_size::{GetBlockCount, GetBlockSize};
@@ -932,39 +932,15 @@ fn color_always() {
 
     let ls_colors = LsColors::from_ls_colors_string(LS_COLORS);
     let map = HashMap::from([
-        (
-            OsStringDisplay::os_string_from("file-a1.txt"),
-            Color::Normal,
-        ),
-        (
-            OsStringDisplay::os_string_from("file-a2.txt"),
-            Color::Normal,
-        ),
-        (
-            OsStringDisplay::os_string_from("file-a3.txt"),
-            Color::Normal,
-        ),
-        (
-            OsStringDisplay::os_string_from("file-b1.txt"),
-            Color::Normal,
-        ),
-        (
-            OsStringDisplay::os_string_from("file-root.txt"),
-            Color::Normal,
-        ),
-        (OsStringDisplay::os_string_from("link-dir"), Color::Symlink),
-        (
-            OsStringDisplay::os_string_from("link-file.txt"),
-            Color::Symlink,
-        ),
-        (
-            OsStringDisplay::os_string_from("empty-dir-1"),
-            Color::Directory,
-        ),
-        (
-            OsStringDisplay::os_string_from("empty-dir-2"),
-            Color::Directory,
-        ),
+        (PathBuf::from("./dir-a/file-a1.txt"), Color::Normal),
+        (PathBuf::from("./dir-a/file-a2.txt"), Color::Normal),
+        (PathBuf::from("./dir-a/subdir-a/file-a3.txt"), Color::Normal),
+        (PathBuf::from("./dir-b/file-b1.txt"), Color::Normal),
+        (PathBuf::from("./file-root.txt"), Color::Normal),
+        (PathBuf::from("./link-dir"), Color::Symlink),
+        (PathBuf::from("./link-file.txt"), Color::Symlink),
+        (PathBuf::from("./empty-dir-1"), Color::Directory),
+        (PathBuf::from("./empty-dir-2"), Color::Directory),
     ]);
     let coloring = Coloring::new(ls_colors, map);