diff --git a/src/commands/cp.rs b/src/commands/cp.rs index c0cb36544..d3f2e913c 100644 --- a/src/commands/cp.rs +++ b/src/commands/cp.rs @@ -2,11 +2,12 @@ use crate::errors::ShellError; use crate::parser::hir::SyntaxType; use crate::parser::registry::{CommandRegistry, Signature}; use crate::prelude::*; -use std::path::{Path, PathBuf}; +use crate::utils::FileStructure; +use std::path::PathBuf; -pub struct Copycp; +pub struct Cpy; -impl StaticCommand for Copycp { +impl StaticCommand for Cpy { fn run( &self, args: CommandArgs, @@ -26,75 +27,6 @@ impl StaticCommand for Copycp { } } -#[derive(Debug, Eq, Ord, PartialEq, PartialOrd)] -pub struct Res { - pub loc: PathBuf, - pub at: usize, -} - -impl Res {} - -pub struct FileStructure { - root: PathBuf, - resources: Vec, -} - -impl FileStructure { - pub fn new() -> FileStructure { - FileStructure { - root: PathBuf::new(), - resources: Vec::::new(), - } - } - - pub fn set_root(&mut self, path: &Path) { - self.root = path.to_path_buf(); - } - - pub fn paths_applying_with(&mut self, to: F) -> Vec<(PathBuf, PathBuf)> - where - F: Fn((PathBuf, usize)) -> (PathBuf, PathBuf), - { - self.resources - .iter() - .map(|f| (PathBuf::from(&f.loc), f.at)) - .map(|f| to(f)) - .collect() - } - - pub fn walk_decorate(&mut self, start_path: &Path) { - self.set_root(&dunce::canonicalize(start_path).unwrap()); - self.resources = Vec::::new(); - self.build(start_path, 0); - self.resources.sort(); - } - - fn build(&mut self, src: &'a Path, lvl: usize) { - let source = dunce::canonicalize(src).unwrap(); - - if source.is_dir() { - for entry in std::fs::read_dir(&source).unwrap() { - let entry = entry.unwrap(); - let path = entry.path(); - - if path.is_dir() { - self.build(&path, lvl + 1); - } - - self.resources.push(Res { - loc: path.to_path_buf(), - at: lvl, - }); - } - } else { - self.resources.push(Res { - loc: source, - at: lvl, - }); - } - } -} - pub fn cp(args: CommandArgs, registry: &CommandRegistry) -> Result { let mut source = PathBuf::from(args.shell_manager.path()); let mut destination = PathBuf::from(args.shell_manager.path()); @@ -306,10 +238,10 @@ pub fn cp(args: CommandArgs, registry: &CommandRegistry) -> Result Result { - return Err(ShellError::labeled_error( - e.to_string(), - e.to_string(), - name_span, - )); - } - Ok(o) => o, - }; + if entry.is_file() { + match std::fs::copy(&entry, &to) { + Err(e) => { + return Err(ShellError::labeled_error( + e.to_string(), + e.to_string(), + args.nth(0).unwrap().span(), + )); + } + Ok(o) => o, + }; + } } } } else { @@ -348,58 +282,3 @@ pub fn cp(args: CommandArgs, registry: &CommandRegistry) -> Result PathBuf { - let mut sdx = PathBuf::new(); - sdx.push("tests"); - sdx.push("fixtures"); - sdx.push("formats"); - dunce::canonicalize(sdx).unwrap() - } - - #[test] - fn prepares_and_decorates_source_files_for_copying() { - let mut res = FileStructure::new(); - res.walk_decorate(fixtures().as_path()); - - assert_eq!( - res.resources, - vec![ - Res { - loc: fixtures().join("appveyor.yml"), - at: 0 - }, - Res { - loc: fixtures().join("caco3_plastics.csv"), - at: 0 - }, - Res { - loc: fixtures().join("cargo_sample.toml"), - at: 0 - }, - Res { - loc: fixtures().join("jonathan.xml"), - at: 0 - }, - Res { - loc: fixtures().join("sample.ini"), - at: 0 - }, - Res { - loc: fixtures().join("sgml_description.json"), - at: 0 - }, - Res { - loc: fixtures().join("utf16.ini"), - at: 0 - } - ] - ); - } -} diff --git a/tests/command_cp_tests.rs b/tests/command_cp_tests.rs index 2907155e8..85c17f057 100644 --- a/tests/command_cp_tests.rs +++ b/tests/command_cp_tests.rs @@ -7,7 +7,7 @@ use std::path::{Path, PathBuf}; #[test] fn copies_a_file() { - let sandbox = Playground::setup_for("cp_test").test_dir_name(); + let sandbox = Playground::setup_for("cp_test_1").test_dir_name(); let full_path = format!("{}/{}", Playground::root(), sandbox); let expected_file = format!("{}/{}", full_path, "sample.ini"); @@ -15,7 +15,7 @@ fn copies_a_file() { nu!( _output, cwd(&Playground::root()), - "cp ../formats/sample.ini cp_test/sample.ini" + "cp ../formats/sample.ini cp_test_1/sample.ini" ); assert!(h::file_exists_at(PathBuf::from(expected_file))); @@ -56,7 +56,7 @@ fn copies_the_directory_inside_directory_if_path_to_copy_is_directory_and_with_r EmptyFile("jonathan.txt"), EmptyFile("andres.txt"), ]) - .within("copies_expected") + .mkdir("copies_expected") .test_dir_name(); let full_path = format!("{}/{}", Playground::root(), sandbox); @@ -114,7 +114,7 @@ fn deep_copies_with_recursive_flag() { .with_files(vec![EmptyFile("coverage.txt"), EmptyFile("commands.txt")]) .within("originals/contributors/yehuda") .with_files(vec![EmptyFile("defer-evaluation.txt")]) - .within("copies_expected") + .mkdir("copies_expected") .test_dir_name(); let full_path = format!("{}/{}", Playground::root(), sandbox); @@ -162,7 +162,8 @@ fn copies_using_path_with_wildcard() { Path::new("cargo_sample.toml"), Path::new("jonathan.xml"), Path::new("sample.ini"), - Path::new("sgml_description.json") + Path::new("sgml_description.json"), + Path::new("utf16.ini"), ], PathBuf::from(&expected_copies_path) )); @@ -185,7 +186,8 @@ fn copies_using_a_glob() { Path::new("cargo_sample.toml"), Path::new("jonathan.xml"), Path::new("sample.ini"), - Path::new("sgml_description.json") + Path::new("sgml_description.json"), + Path::new("utf16.ini"), ], PathBuf::from(&expected_copies_path) ));