Mirrors/nushell
2
0
Fork 0
mirror of https://github.com/nushell/nushell synced 2024-12-27 21:43:09 +00:00
Code Issues Projects Releases Packages Wiki Activity

Revert "Fix ls relative path and erroring on fake dir (#697)" (#744)

Browse source 
This reverts commit bee5ba3deb.
This commit is contained in:
Jakub Žádník 2022-01-15 12:58:24 +02:00 committed by GitHub
parent bee5ba3deb
commit 21a7278259
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 52 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

59
crates/nu-command/src/filesystem/ls.rs
View file

@ -63,18 +63,11 @@ impl Command for Ls {
let short_names = call.has_flag("short-names"); let short_names = call.has_flag("short-names");
let call_span = call.head; let call_span = call.head;
// when we're asking for relative paths like ../../, we need to figure out if we need a prefix for display purposes
let mut new_prefix = false;
let mut prefix_str = PathBuf::new();
let (pattern, prefix) = if let Some(result) = let (pattern, prefix) = if let Some(result) =
call.opt::<Spanned<String>>(engine_state, stack, 0)? call.opt::<Spanned<String>>(engine_state, stack, 0)?
{ {
let curr_dir = current_dir(engine_state, stack)?; let path = PathBuf::from(&result.item);
let path = match nu_path::canonicalize_with(&result.item, curr_dir) {
Ok(p) => p,
Err(_e) => return Err(ShellError::DirectoryNotFound(result.span)),
};
let (mut path, prefix) = if path.is_relative() { let (mut path, prefix) = if path.is_relative() {
let cwd = current_dir(engine_state, stack)?; let cwd = current_dir(engine_state, stack)?;
@ -83,12 +76,7 @@ impl Command for Ls {
(path, None) (path, None)
}; };
if path.is_file() { if path.is_dir() {
(
path.to_string_lossy().to_string(),
Some(current_dir(engine_state, stack)?),
)
} else if path.is_dir() {
if permission_denied(&path) { if permission_denied(&path) {
#[cfg(unix)] #[cfg(unix)]
let error_msg = format!( let error_msg = format!(
@ -110,28 +98,13 @@ impl Command for Ls {
if is_empty_dir(&path) { if is_empty_dir(&path) {
return Ok(PipelineData::new(call_span)); return Ok(PipelineData::new(call_span));
} }
// we figure out how to display a relative path which was requested from a subdirectory, e.g., ls ../
let curr_dir = current_dir(engine_state, stack)?;
new_prefix = curr_dir.ancestors().any(|x| x.to_path_buf() == path);
if new_prefix {
for a in curr_dir.ancestors() {
if a.to_path_buf() == path {
break;
}
prefix_str.push(format!("..{}", std::path::MAIN_SEPARATOR));
}
}
if path.is_dir() { if path.is_dir() {
path = path.join("*"); path = path.join("*");
} }
(
path.to_string_lossy().to_string(),
Some(current_dir(engine_state, stack)?),
)
} else {
(path.to_string_lossy().to_string(), prefix)
} }
(path.to_string_lossy().to_string(), prefix)
} else { } else {
let cwd = current_dir(engine_state, stack)?; let cwd = current_dir(engine_state, stack)?;
(cwd.join("*").to_string_lossy().to_string(), Some(cwd)) (cwd.join("*").to_string_lossy().to_string(), Some(cwd))
@ -187,27 +160,9 @@ impl Command for Ls {
match display_name { match display_name {
Ok(name) => { Ok(name) => {
let filename = if new_prefix { let entry =
match path.file_name() { dir_entry_dict(&path, name, metadata.as_ref(), call_span, long);
Some(p) => {
format!(
"{}{}",
prefix_str.to_string_lossy(),
p.to_string_lossy()
)
}
None => path.to_string_lossy().to_string(),
}
} else {
name.to_string()
};
let entry = dir_entry_dict(
&path,
filename.as_str(),
metadata.as_ref(),
call_span,
long,
);
match entry { match entry {
Ok(value) => Some(value), Ok(value) => Some(value),
Err(err) => Some(Value::Error { error: err }), Err(err) => Some(Value::Error { error: err }),