From eeae2bc238871a5883624ced30a5ee43b4f8fdfb Mon Sep 17 00:00:00 2001
From: Piotr Wach <pwach@bloomberg.net>
Date: Sun, 14 Jan 2024 00:43:31 +0000
Subject: Fix file count

---
 src/interactive/widgets/entries.rs | 2 +-
 src/traverse.rs                    | 8 +++++---
 2 files changed, 6 insertions(+), 4 deletions(-)

(limited to 'src')

diff --git a/src/interactive/widgets/entries.rs b/src/interactive/widgets/entries.rs
index 45e070c..4005739 100644
--- a/src/interactive/widgets/entries.rs
+++ b/src/interactive/widgets/entries.rs
@@ -157,7 +157,7 @@ fn title_block(title: &str, border_style: Style) -> Block<'_> {
 
 fn title(current_path: &str, item_count: u64, display: DisplayOptions, size: u128) -> String {
     format!(
-        " {} ({} item{}, {}) ",
+        " {} ({} file{}, {}) ",
         current_path,
         COUNT.format(item_count as f64),
         match item_count {
diff --git a/src/traverse.rs b/src/traverse.rs
index 94eb9d9..f8b343d 100644
--- a/src/traverse.rs
+++ b/src/traverse.rs
@@ -270,6 +270,7 @@ impl BackgroundTraversal {
 
                         let mut file_size = 0u128;
                         let mut mtime: SystemTime = UNIX_EPOCH;
+                        let mut file_count = 0u64;
                         match &entry.client_state {
                             Some(Ok(ref m)) => {
                                 if !m.is_dir()
@@ -277,6 +278,7 @@ impl BackgroundTraversal {
                                     && (self.walk_options.cross_filesystems
                                         || crossdev::is_same_device(device_id, m))
                                 {
+                                    file_count = 1;
                                     if self.walk_options.apparent_size {
                                         file_size = m.len() as u128;
                                     } else {
@@ -316,7 +318,7 @@ impl BackgroundTraversal {
                                     .push(self.current_directory_at_depth);
                                 self.current_directory_at_depth = EntryInfo {
                                     size: file_size,
-                                    entries_count: Some(1),
+                                    entries_count: Some(file_count),
                                 };
                                 self.parent_node_idx = self.previous_node_idx;
                             }
@@ -340,7 +342,7 @@ impl BackgroundTraversal {
                                 *self
                                     .current_directory_at_depth
                                     .entries_count
-                                    .get_or_insert(0) += 1;
+                                    .get_or_insert(0) += file_count;
                                 set_entry_info_or_panic(
                                     &mut traversal.tree,
                                     self.parent_node_idx,
@@ -352,7 +354,7 @@ impl BackgroundTraversal {
                                 *self
                                     .current_directory_at_depth
                                     .entries_count
-                                    .get_or_insert(0) += 1;
+                                    .get_or_insert(0) += file_count;
                             }
                         };
 
-- 
cgit v1.2.3