extern/nushell
1
0
Fork 1
mirror of https://github.com/nushell/nushell.git synced 2025-08-09 09:55:42 +02:00
Code Issues Packages Projects Releases Wiki Activity

ls **/* does not show hidden files without the -a flag (#2407)

Browse Source 
* fixed: .*.(ext|*)

* ls **/* does not return hidden files without the -a flag

* fixed formatting

* fixed clippy issues

* fixed clippy issues, v2

* added `#[cfg(unix)]` to windows-failing test
This commit is contained in:
Abhi V
2020-09-05 01:02:58 +05:30
committed by GitHub
parent 2ae2f2ea9d
commit 16f85f32a2
2 changed files with 58 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
crates/nu-cli/src/shell/filesystem_shell.rs
View File

@ -139,6 +139,8 @@ impl Shell for FilesystemShell {
));
}
let mut hidden_dirs = vec![];
// Generated stream: impl Stream<Item = Result<ReturnSuccess, ShellError>
Ok(futures::stream::iter(paths.filter_map(move |path| {
@ -147,7 +149,14 @@ impl Shell for FilesystemShell {
Err(err) => return Some(Err(err)),
};
if path_contains_hidden_folder(&path, &hidden_dirs) {
return None;
}
if !all && !hidden_dir_specified && is_hidden_dir(&path) {
if path.is_dir() {
hidden_dirs.push(path);
}
return None;
}
@ -1001,3 +1010,14 @@ pub(crate) fn dir_entry_dict(
Ok(dict.into_value())
}
fn path_contains_hidden_folder(path: &PathBuf, folders: &[PathBuf]) -> bool {
let path_str = path.to_str().expect("failed to read path");
if folders
.iter()
.any(|p| path_str.starts_with(&p.to_str().expect("failed to read hidden paths")))
{
return true;
}
false
}