mirror of
https://github.com/nushell/nushell.git
synced 2024-11-08 09:34:30 +01:00
Add feedback to cp (#5482)
Co-authored-by: Frank Zhang <v-frankz@microsoft.com>
This commit is contained in:
parent
5f39267a80
commit
9969fbfbb1
@ -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(_) => {
|
||||||
|
let msg =
|
||||||
|
format!("copied {:} to {:}", src.display(), dst.display());
|
||||||
|
result.push(Value::String {
|
||||||
|
val: msg,
|
||||||
|
span: call.head,
|
||||||
|
});
|
||||||
|
}
|
||||||
|
Err(e) => {
|
||||||
|
let error = Value::Error {
|
||||||
|
error: ShellError::GenericError(
|
||||||
e.to_string(),
|
e.to_string(),
|
||||||
e.to_string(),
|
e.to_string(),
|
||||||
Some(call.head),
|
Some(call.head),
|
||||||
None,
|
None,
|
||||||
Vec::new(),
|
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());
|
||||||
|
result.push(Value::String {
|
||||||
|
val: msg,
|
||||||
|
span: call.head,
|
||||||
|
});
|
||||||
|
}
|
||||||
|
Err(e) => {
|
||||||
|
let msg = "Can not copy source".to_string();
|
||||||
|
let error = Value::Error {
|
||||||
|
error: ShellError::GenericError(
|
||||||
|
msg,
|
||||||
e.to_string(),
|
e.to_string(),
|
||||||
Some(call.head),
|
Some(call.head),
|
||||||
None,
|
None,
|
||||||
Vec::new(),
|
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,
|
||||||
|
},
|
||||||
]
|
]
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user