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

opt: improve ls by call get_file_type only one time (#5500)

Browse Source 
* opt: improve ls by call get_file_type only one time

* fmt

* cs
This commit is contained in:
Justin Ma 2022-05-10 21:01:06 +08:00 committed by GitHub
parent 7e5e9c28dd
commit b00098ccc6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
crates/nu-command/src/filesystem/ls.rs
View File

@ -353,6 +353,7 @@ pub(crate) fn dir_entry_dict(
) -> Result<Value, ShellError> { ) -> Result<Value, ShellError> {
let mut cols = vec![]; let mut cols = vec![];
let mut vals = vec![]; let mut vals = vec![];
let mut file_type = "unknown";
cols.push("name".into()); cols.push("name".into());
vals.push(Value::String { vals.push(Value::String {
@ -361,9 +362,10 @@ pub(crate) fn dir_entry_dict(
}); });
if let Some(md) = metadata { if let Some(md) = metadata {
file_type = get_file_type(md);
cols.push("type".into()); cols.push("type".into());
vals.push(Value::String { vals.push(Value::String {
val: get_file_type(md).to_string(), val: file_type.to_string(),
span, span,
}); });
} else { } else {
@ -449,10 +451,8 @@ pub(crate) fn dir_entry_dict(
cols.push("size".to_string()); cols.push("size".to_string());
if let Some(md) = metadata { if let Some(md) = metadata {
#[cfg(unix)] let zero_sized =
let zero_sized = md.file_type().is_socket() file_type == "socket" || file_type == "block device" || file_type == "char device";
|| md.file_type().is_char_device()
|| md.file_type().is_block_device();
if md.is_dir() { if md.is_dir() {
if du { if du {
@ -486,9 +486,6 @@ pub(crate) fn dir_entry_dict(
vals.push(Value::nothing(span)); vals.push(Value::nothing(span));
} }
} else { } else {
#[cfg(not(unix))]
let value = Value::nothing(span);
#[cfg(unix)]
let value = if zero_sized { let value = if zero_sized {
Value::Filesize { val: 0, span } Value::Filesize { val: 0, span }
} else { } else {