feat: recursively walk symlinks pointing at dirs

Before: ``` /tmp/test-recursive-dir-symlinks ├── dir │ └── test.txt └── symlinkdir -> /tmp/test-recursive-dir-symlinks/dir ``` After: ``` /tmp/test-recursive-dir-symlinks ├── dir │ └── test.txt └── symlinkdir -> /tmp/test-recursive-dir-symlinks/dir └── test.txt ``` Signed-off-by: Ihar Hrachyshka <[email protected]>
eza-community · Sep 1, 2024 · 9a0a0a4 · 9a0a0a4
1 parent 4151568
commit 9a0a0a4
Show file tree

Hide file tree

Showing 6 changed files with 13 additions and 2 deletions.
diff --git a/src/main.rs b/src/main.rs
@@ -358,7 +358,7 @@ impl<'args> Exa<'args> {
                     let mut child_dirs = Vec::new();
                     for child_dir in children
                         .iter()
-                        .filter(|f| f.is_directory() && !f.is_all_all)
+                        .filter(|f| f.points_to_directory() && !f.is_all_all)
                     {
                         match child_dir.to_dir() {
                             Ok(d) => child_dirs.push(d),

diff --git a/src/output/details.rs b/src/output/details.rs
@@ -286,7 +286,7 @@ impl<'a> Render<'a> {
 
                 let mut dir = None;
                 if let Some(r) = self.recurse {
-                    if file.is_directory() && r.tree && !r.is_too_deep(depth.0) {
+                    if file.points_to_directory() && r.tree && !r.is_too_deep(depth.0) {
                         trace!("matching on to_dir");
                         match file.to_dir() {
                             Ok(d) => {

diff --git a/tests/cmd/absolute_recurse_unix.stdout b/tests/cmd/absolute_recurse_unix.stdout
@@ -21,6 +21,11 @@
 [CWD]/tests/itest/q
 [CWD]/tests/itest/vagrant
 
+tests/itest/dir-symlink:
+[CWD]/tests/itest/dir-symlink/a
+[CWD]/tests/itest/dir-symlink/symlink -> a
+[CWD]/tests/itest/dir-symlink/symlink-broken -> ./b
+
 tests/itest/exa:
 [CWD]/tests/itest/exa/file.c -> djihisudjuhfius
 [CWD]/tests/itest/exa/sssssssssssssssssssssssssggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggsssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssss

diff --git a/tests/gen/long_links_recurse_unix.stdout b/tests/gen/long_links_recurse_unix.stdout
@@ -4186,6 +4186,8 @@ tests/test_dir/symlinks:
 
 tests/test_dir/symlinks/dir:
 
+tests/test_dir/symlinks/symlink3:
+
 tests/test_dir/time:
 1 1d
 1 1h

diff --git a/tests/gen/recursive_long_unix.stdout b/tests/gen/recursive_long_unix.stdout
@@ -4186,6 +4186,8 @@ symlink4 -> pipitek
 
 tests/test_dir/symlinks/dir:
 
+tests/test_dir/symlinks/symlink3:
+
 tests/test_dir/time:
 1d
 1h

diff --git a/tests/gen/recursive_unix.stdout b/tests/gen/recursive_unix.stdout
@@ -4186,6 +4186,8 @@ symlink4 -> pipitek
 
 tests/test_dir/symlinks/dir:
 
+tests/test_dir/symlinks/symlink3:
+
 tests/test_dir/time:
 1d
 1h