From 665902237292333cb538ba8e30330168bcb6ebde Mon Sep 17 00:00:00 2001 From: Ben Bridle Date: Wed, 15 Jan 2025 15:30:34 +1300 Subject: Use original path when using Entry as a path Using the original path preserves the original unresolved path of the entry, which is important for directory traversal tasks. --- src/entry.rs | 2 +- src/operations/ls.rs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'src') diff --git a/src/entry.rs b/src/entry.rs index b59ced5..72eeb7e 100644 --- a/src/entry.rs +++ b/src/entry.rs @@ -86,6 +86,6 @@ impl Entry { impl AsRef for Entry { fn as_ref(&self) -> &Path { - &self.path + &self.original_path } } diff --git a/src/operations/ls.rs b/src/operations/ls.rs index afb0f18..ab07305 100644 --- a/src/operations/ls.rs +++ b/src/operations/ls.rs @@ -40,7 +40,7 @@ pub fn traverse_directory(path: impl AsRef) -> ReadResult> { for entry in list_directory(path)? { match entry.entry_type { EntryType::File => file_entries.push(entry), - EntryType::Directory => file_entries.extend(traverse_directory(&entry.path)?), + EntryType::Directory => file_entries.extend(traverse_directory(entry)?), } } return Ok(file_entries); -- cgit v1.2.3-70-g09d2