fix(symlink): fix --dereference --sort=size

`File::length()` did not take `--dereference` into account, and used symlink metadata unconditionally. This commit fixes that. Signed-off-by: Mohammad AlSaleh <[email protected]>
eza-community · May 17, 2024 · b8a481e · b8a481e
1 parent bbede6d
commit b8a481e
Show file tree

Hide file tree

Showing 13 changed files with 28 additions and 1 deletion.
diff --git a/src/fs/file.rs b/src/fs/file.rs
@@ -646,7 +646,12 @@ impl<'dir> File<'dir> {
     /// of a directory when `total_size` is used.
     #[inline]
     pub fn length(&self) -> u64 {
-        self.recursive_size.unwrap_bytes_or(self.metadata.len())
+        self.recursive_size.unwrap_bytes_or(
+            match (self.is_link(), self.deref_links, self.link_target_recurse()) {
+                (true, true, FileTarget::Ok(f)) => f.metadata.len(),
+                _ => self.metadata.len(),
+            },
+        )
     }
 
     /// Is the file is using recursive size calculation

diff --git a/tests/cmd/absolute_recurse_unix.stdout b/tests/cmd/absolute_recurse_unix.stdout
@@ -2,6 +2,7 @@
 [CWD]/tests/itest/b
 [CWD]/tests/itest/c
 [CWD]/tests/itest/d
+[CWD]/tests/itest/dereferenced-sort-size
 [CWD]/tests/itest/dir-symlink -> vagrant/debug
 [CWD]/tests/itest/e
 [CWD]/tests/itest/exa
@@ -21,6 +22,15 @@
 [CWD]/tests/itest/q
 [CWD]/tests/itest/vagrant
 
+tests/itest/dereferenced-sort-size:
+[CWD]/tests/itest/dereferenced-sort-size/links
+[CWD]/tests/itest/dereferenced-sort-size/longgggggggggggggg-name-smaller-size
+[CWD]/tests/itest/dereferenced-sort-size/short-name-larger-size
+
+tests/itest/dereferenced-sort-size/links:
+[CWD]/tests/itest/dereferenced-sort-size/links/a -> ../longgggggggggggggg-name-smaller-size
+[CWD]/tests/itest/dereferenced-sort-size/links/b -> ../short-name-larger-size
+
 tests/itest/exa:
 [CWD]/tests/itest/exa/file.c -> djihisudjuhfius
 [CWD]/tests/itest/exa/sssssssssssssssssssssssssggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggsssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssss

diff --git a/tests/cmd/absolute_unix.stdout b/tests/cmd/absolute_unix.stdout
@@ -2,6 +2,7 @@
 [CWD]/tests/itest/b
 [CWD]/tests/itest/c
 [CWD]/tests/itest/d
+[CWD]/tests/itest/dereferenced-sort-size
 [CWD]/tests/itest/dir-symlink -> vagrant/debug
 [CWD]/tests/itest/e
 [CWD]/tests/itest/exa

diff --git a/tests/cmd/basic_all.stdout b/tests/cmd/basic_all.stdout
@@ -2,6 +2,7 @@ a
 b
 c
 d
+dereferenced-sort-size
 dir-symlink -> vagrant/debug
 e
 exa

diff --git a/tests/cmd/dereferenced_sort_size_unix.stderr b/tests/cmd/dereferenced_sort_size_unix.stderr
diff --git a/tests/cmd/dereferenced_sort_size_unix.stdout b/tests/cmd/dereferenced_sort_size_unix.stdout
@@ -0,0 +1,2 @@
+a
+b
diff --git a/tests/cmd/dereferenced_sort_size_unix.toml b/tests/cmd/dereferenced_sort_size_unix.toml
@@ -0,0 +1,2 @@
+bin.name = "eza"
+args = "tests/itest/dereferenced-sort-size/links -1 --sort=size --dereference"
diff --git a/tests/cmd/icons_all.stdout b/tests/cmd/icons_all.stdout
@@ -2,6 +2,7 @@
  b
  c
  d
+ dereferenced-sort-size
  dir-symlink -> vagrant/debug
  e
  exa

diff --git a/tests/cmd/long_windows.stdout b/tests/cmd/long_windows.stdout
@@ -2,6 +2,7 @@
 -a--- b
 -a--- c
 -a--- d
+d---- dereferenced-sort-size
 l---- dir-symlink -> vagrant/debug
 -a--- e
 d---- exa

diff --git a/tests/itest/dereferenced-sort-size/links/a b/tests/itest/dereferenced-sort-size/links/a
@@ -0,0 +1 @@
+../longgggggggggggggg-name-smaller-size
diff --git a/tests/itest/dereferenced-sort-size/links/b b/tests/itest/dereferenced-sort-size/links/b
@@ -0,0 +1 @@
+../short-name-larger-size
diff --git a/tests/itest/dereferenced-sort-size/longgggggggggggggg-name-smaller-size b/tests/itest/dereferenced-sort-size/longgggggggggggggg-name-smaller-size
@@ -0,0 +1 @@
+12345
diff --git a/tests/itest/dereferenced-sort-size/short-name-larger-size b/tests/itest/dereferenced-sort-size/short-name-larger-size
@@ -0,0 +1 @@
+1234567890