extern/nushell
1
0
Fork 1
mirror of https://github.com/nushell/nushell.git synced 2024-11-08 09:34:30 +01:00
Code Issues Packages Projects Releases Wiki Activity

Add feedback to cp (#5482)

Browse Source 
Co-authored-by: Frank Zhang <v-frankz@microsoft.com>
This commit is contained in:
Kangaxx-0 2022-05-11 05:06:30 -07:00 committed by GitHub
parent 5f39267a80
commit 9969fbfbb1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 58 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

78
crates/nu-command/src/filesystem/cp.rs
View File

@ -5,7 +5,10 @@ use nu_engine::CallExt;
use nu_path::canonicalize_with; use nu_path::canonicalize_with;
use nu_protocol::ast::Call; use nu_protocol::ast::Call;
use nu_protocol::engine::{Command, EngineState, Stack}; use nu_protocol::engine::{Command, EngineState, Stack};
use nu_protocol::{Category, Example, PipelineData, ShellError, Signature, Spanned, SyntaxShape}; use nu_protocol::{
Category, Example, IntoInterruptiblePipelineData, PipelineData, ShellError, Signature, Spanned,
SyntaxShape, Value,
};
use crate::filesystem::util::FileStructure; use crate::filesystem::util::FileStructure;
@ -62,6 +65,8 @@ impl Command for Cp {
let source = path.join(src.item.as_str()); let source = path.join(src.item.as_str());
let destination = path.join(dst.item.as_str()); let destination = path.join(dst.item.as_str());
let ctrlc = engine_state.ctrlc.clone();
let sources: Vec<_> = match nu_glob::glob_with(&source.to_string_lossy(), GLOB_PARAMS) { let sources: Vec<_> = match nu_glob::glob_with(&source.to_string_lossy(), GLOB_PARAMS) {
Ok(files) => files.collect(), Ok(files) => files.collect(),
Err(e) => { Err(e) => {
@ -107,6 +112,8 @@ impl Command for Cp {
)); ));
} }
let mut result = Vec::new();
for entry in sources.into_iter().flatten() { for entry in sources.into_iter().flatten() {
let mut sources = FileStructure::new(); let mut sources = FileStructure::new();
sources.walk_decorate(&entry, engine_state, stack)?; sources.walk_decorate(&entry, engine_state, stack)?;
@ -126,15 +133,28 @@ impl Command for Cp {
for (src, dst) in sources { for (src, dst) in sources {
if src.is_file() { if src.is_file() {
std::fs::copy(src, dst).map_err(|e| { match std::fs::copy(&src, &dst) {
ShellError::GenericError( Ok(_) => {
e.to_string(), let msg =
e.to_string(), format!("copied {:} to {:}", src.display(), dst.display());
Some(call.head), result.push(Value::String {
None, val: msg,
Vec::new(), span: call.head,
) });
})?; }
Err(e) => {
let error = Value::Error {
error: ShellError::GenericError(
e.to_string(),
e.to_string(),
Some(call.head),
None,
Vec::new(),
),
};
result.push(error);
}
}
} }
} }
} else if entry.is_dir() { } else if entry.is_dir() {
@ -198,21 +218,34 @@ impl Command for Cp {
} }
if s.is_file() { if s.is_file() {
std::fs::copy(&s, &d).map_err(|e| { match std::fs::copy(&s, &d) {
ShellError::GenericError( Ok(_) => {
e.to_string(), let msg = format!("copied {:} to {:}", &s.display(), &d.display());
e.to_string(), result.push(Value::String {
Some(call.head), val: msg,
None, span: call.head,
Vec::new(), });
) }
})?; Err(e) => {
let msg = "Can not copy source".to_string();
let error = Value::Error {
error: ShellError::GenericError(
msg,
e.to_string(),
Some(call.head),
None,
Vec::new(),
),
};
result.push(error);
}
}
} }
} }
} }
} }
Ok(PipelineData::new(call.head)) Ok(result.into_iter().into_pipeline_data(ctrlc))
} }
fn examples(&self) -> Vec<Example> { fn examples(&self) -> Vec<Example> {
@ -227,6 +260,11 @@ impl Command for Cp {
example: "cp -r dir_a dir_b", example: "cp -r dir_a dir_b",
result: None, result: None,
}, },
Example {
description: "Move many files into a directory",
example: "cp *.txt dir_a",
result: None,
},
] ]
} }