mirror of
https://github.com/nushell/nushell.git
synced 2024-11-23 00:43:33 +01:00
fc23c6721a
# NOTE Clean duplicate of #7825 Sorry about all the mess guys... I got confuse with GitHub and and ended up mankind that mess. This the same code I just cleaned the commits. # Description Progress bar implementation for the `cp` command. Now if the flag `-p` or `--progress` is set, then the user will be able to see the progress of the file or files being copy ![progressbar_cp01](https://user-images.githubusercontent.com/38369407/213899494-0f6a4aa9-ee82-48c3-a1f1-1816f3fc1d9c.jpg) ![progressbar_cp02](https://user-images.githubusercontent.com/38369407/213899497-2f9e6e8c-fdd9-400b-bd8d-c59899ae0368.jpg) # User-Facing Changes A new flag (`--progress` `-p`) was added to the `cp` command Examples: ```nu cp -p test_file.txt test_folder_1\ cp -r -p test_folder\* test_folder_1\ cp -r -p -i test_folder\* test_folder_1\ ``` ## Notes - The progress bar uses `std::io::{Read, Write}` instead of `std::fs::copy` to get the progress. that means that when the progress bar is used the copy process might be a bit slower. - Progress bar for symbolic links TBD: Since symbolic links are usually very light I think is not worth it to duplicate the function `copy_symlink` just to add a progress bar that will be so fast to the point is not needed, but.. for consistency purposes we might need to added it, In that case I would have to pass the variable `progress` by parameter (to not duplicate code unnecessary). If I do that i would have to pass the `progress` var to every function to respect `copy_impl: impl Fn(PathBuf, PathBuf, Span)`. Please let me know if this is not clear :p --------- Co-authored-by: Reilly Wood <reilly.wood@icloud.com>
582 lines
18 KiB
Rust
582 lines
18 KiB
Rust
use nu_test_support::fs::file_contents;
|
|
use nu_test_support::fs::{
|
|
files_exist_at, AbsoluteFile,
|
|
Stub::{EmptyFile, FileWithPermission},
|
|
};
|
|
use nu_test_support::nu;
|
|
use nu_test_support::playground::Playground;
|
|
use std::path::Path;
|
|
|
|
fn get_file_hash<T: std::fmt::Display>(file: T) -> String {
|
|
nu!("open {} | to text | hash md5", file).out
|
|
}
|
|
|
|
#[test]
|
|
fn copies_a_file() {
|
|
copies_a_file_impl(false);
|
|
copies_a_file_impl(true);
|
|
}
|
|
|
|
fn copies_a_file_impl(progress: bool) {
|
|
Playground::setup("cp_test_1", |dirs, _| {
|
|
let test_file = dirs.formats().join("sample.ini");
|
|
let progress_flag = if progress { "-p" } else { "" };
|
|
|
|
// Get the hash of the file content to check integrity after copy.
|
|
let first_hash = get_file_hash(&test_file.display());
|
|
|
|
nu!(
|
|
cwd: dirs.root(),
|
|
"cp {} `{}` cp_test_1/sample.ini",
|
|
progress_flag,
|
|
test_file.display()
|
|
);
|
|
|
|
assert!(dirs.test().join("sample.ini").exists());
|
|
|
|
// Get the hash of the copied file content to check against first_hash.
|
|
let after_cp_hash = get_file_hash(dirs.test().join("sample.ini").display());
|
|
assert_eq!(first_hash, after_cp_hash);
|
|
});
|
|
}
|
|
|
|
#[test]
|
|
fn copies_the_file_inside_directory_if_path_to_copy_is_directory() {
|
|
copies_the_file_inside_directory_if_path_to_copy_is_directory_impl(false);
|
|
copies_the_file_inside_directory_if_path_to_copy_is_directory_impl(true);
|
|
}
|
|
|
|
fn copies_the_file_inside_directory_if_path_to_copy_is_directory_impl(progress: bool) {
|
|
Playground::setup("cp_test_2", |dirs, _| {
|
|
let expected_file = AbsoluteFile::new(dirs.test().join("sample.ini"));
|
|
let progress_flag = if progress { "-p" } else { "" };
|
|
|
|
// Get the hash of the file content to check integrity after copy.
|
|
let first_hash = get_file_hash(dirs.formats().join("../formats/sample.ini").display());
|
|
nu!(
|
|
cwd: dirs.formats(),
|
|
"cp {} ../formats/sample.ini {}",
|
|
progress_flag,
|
|
expected_file.dir()
|
|
);
|
|
|
|
assert!(dirs.test().join("sample.ini").exists());
|
|
|
|
// Check the integrity of the file.
|
|
let after_cp_hash = get_file_hash(expected_file);
|
|
assert_eq!(first_hash, after_cp_hash);
|
|
})
|
|
}
|
|
|
|
#[test]
|
|
fn error_if_attempting_to_copy_a_directory_to_another_directory() {
|
|
error_if_attempting_to_copy_a_directory_to_another_directory_impl(false);
|
|
error_if_attempting_to_copy_a_directory_to_another_directory_impl(true);
|
|
}
|
|
|
|
fn error_if_attempting_to_copy_a_directory_to_another_directory_impl(progress: bool) {
|
|
Playground::setup("cp_test_3", |dirs, _| {
|
|
let progress_flag = if progress { "-p" } else { "" };
|
|
|
|
let actual = nu!(
|
|
cwd: dirs.formats(),
|
|
"cp {} ../formats {}",
|
|
progress_flag,
|
|
dirs.test().display()
|
|
);
|
|
|
|
assert!(actual.err.contains("../formats"));
|
|
assert!(actual.err.contains("resolves to a directory (not copied)"));
|
|
});
|
|
}
|
|
|
|
#[test]
|
|
fn copies_the_directory_inside_directory_if_path_to_copy_is_directory_and_with_recursive_flag() {
|
|
copies_the_directory_inside_directory_if_path_to_copy_is_directory_and_with_recursive_flag_impl(
|
|
false,
|
|
);
|
|
copies_the_directory_inside_directory_if_path_to_copy_is_directory_and_with_recursive_flag_impl(
|
|
true,
|
|
);
|
|
}
|
|
|
|
fn copies_the_directory_inside_directory_if_path_to_copy_is_directory_and_with_recursive_flag_impl(
|
|
progress: bool,
|
|
) {
|
|
Playground::setup("cp_test_4", |dirs, sandbox| {
|
|
sandbox
|
|
.within("originals")
|
|
.with_files(vec![
|
|
EmptyFile("yehuda.txt"),
|
|
EmptyFile("jonathan.txt"),
|
|
EmptyFile("andres.txt"),
|
|
])
|
|
.mkdir("expected");
|
|
|
|
let expected_dir = dirs.test().join("expected").join("originals");
|
|
let progress_flag = if progress { "-p" } else { "" };
|
|
|
|
nu!(
|
|
cwd: dirs.test(),
|
|
"cp {} originals expected -r",
|
|
progress_flag
|
|
);
|
|
|
|
assert!(expected_dir.exists());
|
|
assert!(files_exist_at(
|
|
vec![
|
|
Path::new("yehuda.txt"),
|
|
Path::new("jonathan.txt"),
|
|
Path::new("andres.txt")
|
|
],
|
|
&expected_dir
|
|
));
|
|
})
|
|
}
|
|
|
|
#[test]
|
|
fn deep_copies_with_recursive_flag() {
|
|
deep_copies_with_recursive_flag_impl(false);
|
|
deep_copies_with_recursive_flag_impl(true);
|
|
}
|
|
|
|
fn deep_copies_with_recursive_flag_impl(progress: bool) {
|
|
Playground::setup("cp_test_5", |dirs, sandbox| {
|
|
sandbox
|
|
.within("originals")
|
|
.with_files(vec![EmptyFile("manifest.txt")])
|
|
.within("originals/contributors")
|
|
.with_files(vec![
|
|
EmptyFile("yehuda.txt"),
|
|
EmptyFile("jonathan.txt"),
|
|
EmptyFile("andres.txt"),
|
|
])
|
|
.within("originals/contributors/jonathan")
|
|
.with_files(vec![EmptyFile("errors.txt"), EmptyFile("multishells.txt")])
|
|
.within("originals/contributors/andres")
|
|
.with_files(vec![EmptyFile("coverage.txt"), EmptyFile("commands.txt")])
|
|
.within("originals/contributors/yehuda")
|
|
.with_files(vec![EmptyFile("defer-evaluation.txt")])
|
|
.mkdir("expected");
|
|
|
|
let expected_dir = dirs.test().join("expected").join("originals");
|
|
let progress_flag = if progress { "-p" } else { "" };
|
|
|
|
let jonathans_expected_copied_dir = expected_dir.join("contributors").join("jonathan");
|
|
let andres_expected_copied_dir = expected_dir.join("contributors").join("andres");
|
|
let yehudas_expected_copied_dir = expected_dir.join("contributors").join("yehuda");
|
|
|
|
nu!(
|
|
cwd: dirs.test(),
|
|
"cp {} originals expected --recursive",
|
|
progress_flag
|
|
);
|
|
|
|
assert!(expected_dir.exists());
|
|
assert!(files_exist_at(
|
|
vec![Path::new("errors.txt"), Path::new("multishells.txt")],
|
|
&jonathans_expected_copied_dir
|
|
));
|
|
assert!(files_exist_at(
|
|
vec![Path::new("coverage.txt"), Path::new("commands.txt")],
|
|
&andres_expected_copied_dir
|
|
));
|
|
assert!(files_exist_at(
|
|
vec![Path::new("defer-evaluation.txt")],
|
|
&yehudas_expected_copied_dir
|
|
));
|
|
})
|
|
}
|
|
|
|
#[test]
|
|
fn copies_using_path_with_wildcard() {
|
|
copies_using_path_with_wildcard_impl(false);
|
|
copies_using_path_with_wildcard_impl(true);
|
|
}
|
|
|
|
fn copies_using_path_with_wildcard_impl(progress: bool) {
|
|
Playground::setup("cp_test_6", |dirs, _| {
|
|
let progress_flag = if progress { "-p" } else { "" };
|
|
|
|
// Get the hash of the file content to check integrity after copy.
|
|
let src_hashes = nu!(
|
|
cwd: dirs.formats(),
|
|
"for file in (ls ../formats/*) { open --raw $file.name | to text | hash md5 }"
|
|
)
|
|
.out;
|
|
|
|
nu!(
|
|
cwd: dirs.formats(),
|
|
"cp {} -r ../formats/* {}",
|
|
progress_flag,
|
|
dirs.test().display()
|
|
);
|
|
|
|
assert!(files_exist_at(
|
|
vec![
|
|
Path::new("caco3_plastics.csv"),
|
|
Path::new("cargo_sample.toml"),
|
|
Path::new("jonathan.xml"),
|
|
Path::new("sample.ini"),
|
|
Path::new("sgml_description.json"),
|
|
Path::new("utf16.ini"),
|
|
],
|
|
dirs.test()
|
|
));
|
|
|
|
// Check integrity after the copy is done
|
|
let dst_hashes = nu!(
|
|
cwd: dirs.formats(),
|
|
"for file in (ls {}) {{ open --raw $file.name | to text | hash md5 }}", dirs.test().display()
|
|
).out;
|
|
assert_eq!(src_hashes, dst_hashes);
|
|
})
|
|
}
|
|
|
|
#[test]
|
|
fn copies_using_a_glob() {
|
|
copies_using_a_glob_impl(false);
|
|
copies_using_a_glob_impl(true);
|
|
}
|
|
|
|
fn copies_using_a_glob_impl(progress: bool) {
|
|
Playground::setup("cp_test_7", |dirs, _| {
|
|
let progress_flag = if progress { "-p" } else { "" };
|
|
|
|
// Get the hash of the file content to check integrity after copy.
|
|
let src_hashes = nu!(
|
|
cwd: dirs.formats(),
|
|
"for file in (ls *) { open --raw $file.name | to text | hash md5 }"
|
|
)
|
|
.out;
|
|
|
|
nu!(
|
|
cwd: dirs.formats(),
|
|
"cp {} -r * {}",
|
|
progress_flag,
|
|
dirs.test().display()
|
|
);
|
|
|
|
assert!(files_exist_at(
|
|
vec![
|
|
Path::new("caco3_plastics.csv"),
|
|
Path::new("cargo_sample.toml"),
|
|
Path::new("jonathan.xml"),
|
|
Path::new("sample.ini"),
|
|
Path::new("sgml_description.json"),
|
|
Path::new("utf16.ini"),
|
|
],
|
|
dirs.test()
|
|
));
|
|
|
|
// Check integrity after the copy is done
|
|
let dst_hashes = nu!(
|
|
cwd: dirs.formats(),
|
|
"for file in (ls {}) {{ open --raw $file.name | to text | hash md5 }}",
|
|
dirs.test().display()
|
|
)
|
|
.out;
|
|
assert_eq!(src_hashes, dst_hashes);
|
|
});
|
|
}
|
|
|
|
#[test]
|
|
fn copies_same_file_twice() {
|
|
copies_same_file_twice_impl(false);
|
|
copies_same_file_twice_impl(true);
|
|
}
|
|
|
|
fn copies_same_file_twice_impl(progress: bool) {
|
|
Playground::setup("cp_test_8", |dirs, _| {
|
|
let progress_flag = if progress { "-p" } else { "" };
|
|
|
|
nu!(
|
|
cwd: dirs.root(),
|
|
"cp {} `{}` cp_test_8/sample.ini",
|
|
progress_flag,
|
|
dirs.formats().join("sample.ini").display()
|
|
);
|
|
|
|
nu!(
|
|
cwd: dirs.root(),
|
|
"cp {} `{}` cp_test_8/sample.ini",
|
|
progress_flag,
|
|
dirs.formats().join("sample.ini").display()
|
|
);
|
|
|
|
assert!(dirs.test().join("sample.ini").exists());
|
|
});
|
|
}
|
|
|
|
#[test]
|
|
fn copy_files_using_glob_two_parents_up_using_multiple_dots() {
|
|
copy_files_using_glob_two_parents_up_using_multiple_dots_imp(false);
|
|
copy_files_using_glob_two_parents_up_using_multiple_dots_imp(true);
|
|
}
|
|
|
|
fn copy_files_using_glob_two_parents_up_using_multiple_dots_imp(progress: bool) {
|
|
Playground::setup("cp_test_9", |dirs, sandbox| {
|
|
sandbox.within("foo").within("bar").with_files(vec![
|
|
EmptyFile("jonathan.json"),
|
|
EmptyFile("andres.xml"),
|
|
EmptyFile("yehuda.yaml"),
|
|
EmptyFile("kevin.txt"),
|
|
EmptyFile("many_more.ppl"),
|
|
]);
|
|
|
|
let progress_flag = if progress { "-p" } else { "" };
|
|
|
|
nu!(
|
|
cwd: dirs.test().join("foo/bar"),
|
|
" cp {} * ...",
|
|
progress_flag,
|
|
);
|
|
|
|
assert!(files_exist_at(
|
|
vec![
|
|
"yehuda.yaml",
|
|
"jonathan.json",
|
|
"andres.xml",
|
|
"kevin.txt",
|
|
"many_more.ppl",
|
|
],
|
|
dirs.test()
|
|
));
|
|
})
|
|
}
|
|
|
|
#[test]
|
|
fn copy_file_and_dir_from_two_parents_up_using_multiple_dots_to_current_dir_recursive() {
|
|
copy_file_and_dir_from_two_parents_up_using_multiple_dots_to_current_dir_recursive_impl(false);
|
|
copy_file_and_dir_from_two_parents_up_using_multiple_dots_to_current_dir_recursive_impl(true);
|
|
}
|
|
|
|
fn copy_file_and_dir_from_two_parents_up_using_multiple_dots_to_current_dir_recursive_impl(
|
|
progress: bool,
|
|
) {
|
|
Playground::setup("cp_test_10", |dirs, sandbox| {
|
|
sandbox.with_files(vec![EmptyFile("hello_there")]);
|
|
sandbox.mkdir("hello_again");
|
|
sandbox.within("foo").mkdir("bar");
|
|
|
|
let progress_flag = if progress { "-p" } else { "" };
|
|
|
|
nu!(
|
|
cwd: dirs.test().join("foo/bar"),
|
|
"cp {} -r .../hello* .",
|
|
progress_flag
|
|
);
|
|
|
|
let expected = dirs.test().join("foo/bar");
|
|
|
|
assert!(files_exist_at(vec!["hello_there", "hello_again"], expected));
|
|
})
|
|
}
|
|
|
|
#[test]
|
|
fn copy_to_non_existing_dir() {
|
|
copy_to_non_existing_dir_impl(false);
|
|
copy_to_non_existing_dir_impl(true);
|
|
}
|
|
|
|
fn copy_to_non_existing_dir_impl(progress: bool) {
|
|
Playground::setup("cp_test_11", |_dirs, sandbox| {
|
|
sandbox.with_files(vec![EmptyFile("empty_file")]);
|
|
|
|
let progress_flag = if progress { "-p" } else { "" };
|
|
|
|
let actual = nu!(
|
|
cwd: sandbox.cwd(),
|
|
"cp {} empty_file ~/not_a_dir/",
|
|
progress_flag
|
|
);
|
|
assert!(actual.err.contains("directory not found"));
|
|
assert!(actual.err.contains("destination directory does not exist"));
|
|
});
|
|
}
|
|
|
|
#[test]
|
|
fn copy_dir_contains_symlink_ignored() {
|
|
copy_dir_contains_symlink_ignored_impl(false);
|
|
copy_dir_contains_symlink_ignored_impl(true);
|
|
}
|
|
|
|
fn copy_dir_contains_symlink_ignored_impl(progress: bool) {
|
|
Playground::setup("cp_test_12", |_dirs, sandbox| {
|
|
sandbox
|
|
.within("tmp_dir")
|
|
.with_files(vec![EmptyFile("hello_there"), EmptyFile("good_bye")])
|
|
.within("tmp_dir")
|
|
.symlink("good_bye", "dangle_symlink");
|
|
|
|
let progress_flag = if progress { "-p" } else { "" };
|
|
|
|
// make symbolic link and copy.
|
|
nu!(
|
|
cwd: sandbox.cwd(),
|
|
"rm {} tmp_dir/good_bye; cp -r tmp_dir tmp_dir_2",
|
|
progress_flag
|
|
);
|
|
|
|
// check hello_there exists inside `tmp_dir_2`, and `dangle_symlink` don't exists inside `tmp_dir_2`.
|
|
let expected = sandbox.cwd().join("tmp_dir_2");
|
|
assert!(files_exist_at(vec!["hello_there"], expected.clone()));
|
|
let path = expected.join("dangle_symlink");
|
|
assert!(!path.exists() && !path.is_symlink());
|
|
});
|
|
}
|
|
|
|
#[test]
|
|
fn copy_dir_contains_symlink() {
|
|
copy_dir_contains_symlink_impl(false);
|
|
copy_dir_contains_symlink_impl(true);
|
|
}
|
|
|
|
fn copy_dir_contains_symlink_impl(progress: bool) {
|
|
Playground::setup("cp_test_13", |_dirs, sandbox| {
|
|
sandbox
|
|
.within("tmp_dir")
|
|
.with_files(vec![EmptyFile("hello_there"), EmptyFile("good_bye")])
|
|
.within("tmp_dir")
|
|
.symlink("good_bye", "dangle_symlink");
|
|
|
|
let progress_flag = if progress { "-p" } else { "" };
|
|
|
|
// make symbolic link and copy.
|
|
nu!(
|
|
cwd: sandbox.cwd(),
|
|
"rm tmp_dir/good_bye; cp {} -r -n tmp_dir tmp_dir_2",
|
|
progress_flag
|
|
);
|
|
|
|
// check hello_there exists inside `tmp_dir_2`, and `dangle_symlink` also exists inside `tmp_dir_2`.
|
|
let expected = sandbox.cwd().join("tmp_dir_2");
|
|
assert!(files_exist_at(vec!["hello_there"], expected.clone()));
|
|
let path = expected.join("dangle_symlink");
|
|
assert!(path.is_symlink());
|
|
});
|
|
}
|
|
|
|
#[test]
|
|
fn copy_dir_symlink_file_body_not_changed() {
|
|
copy_dir_symlink_file_body_not_changed_impl(false);
|
|
copy_dir_symlink_file_body_not_changed_impl(true);
|
|
}
|
|
|
|
fn copy_dir_symlink_file_body_not_changed_impl(progress: bool) {
|
|
Playground::setup("cp_test_14", |_dirs, sandbox| {
|
|
sandbox
|
|
.within("tmp_dir")
|
|
.with_files(vec![EmptyFile("hello_there"), EmptyFile("good_bye")])
|
|
.within("tmp_dir")
|
|
.symlink("good_bye", "dangle_symlink");
|
|
|
|
let progress_flag = if progress { "-p" } else { "" };
|
|
|
|
// make symbolic link and copy.
|
|
nu!(
|
|
cwd: sandbox.cwd(),
|
|
"rm tmp_dir/good_bye; cp {} -r -n tmp_dir tmp_dir_2; rm -r tmp_dir; cp {} -r -n tmp_dir_2 tmp_dir; echo hello_data | save tmp_dir/good_bye",
|
|
progress_flag,
|
|
progress_flag,
|
|
);
|
|
|
|
// check dangle_symlink in tmp_dir is no longer dangling.
|
|
let expected_file = sandbox.cwd().join("tmp_dir").join("dangle_symlink");
|
|
let actual = file_contents(expected_file);
|
|
assert!(actual.contains("hello_data"));
|
|
});
|
|
}
|
|
|
|
#[test]
|
|
fn copy_identical_file() {
|
|
copy_identical_file_impl(false);
|
|
copy_identical_file_impl(true);
|
|
}
|
|
|
|
fn copy_identical_file_impl(progress: bool) {
|
|
Playground::setup("cp_test_15", |_dirs, sandbox| {
|
|
sandbox.with_files(vec![EmptyFile("same.txt")]);
|
|
|
|
let progress_flag = if progress { "-p" } else { "" };
|
|
|
|
let actual = nu!(
|
|
cwd: sandbox.cwd(),
|
|
"cp {} same.txt same.txt",
|
|
progress_flag,
|
|
);
|
|
assert!(actual.err.contains("Copy aborted"));
|
|
});
|
|
}
|
|
|
|
#[test]
|
|
fn copy_ignores_ansi() {
|
|
copy_ignores_ansi_impl(false);
|
|
copy_ignores_ansi_impl(true);
|
|
}
|
|
|
|
fn copy_ignores_ansi_impl(progress: bool) {
|
|
Playground::setup("cp_test_16", |_dirs, sandbox| {
|
|
sandbox.with_files(vec![EmptyFile("test.txt")]);
|
|
|
|
let progress_flag = if progress { "-p" } else { "" };
|
|
|
|
let actual = nu!(
|
|
cwd: sandbox.cwd(),
|
|
"ls | find test | get name | cp {} $in.0 success.txt; ls | find success | get name | ansi strip | get 0",
|
|
progress_flag,
|
|
);
|
|
assert_eq!(actual.out, "success.txt");
|
|
});
|
|
}
|
|
|
|
#[test]
|
|
fn copy_file_not_exists_dst() {
|
|
copy_file_not_exists_dst_impl(false);
|
|
copy_file_not_exists_dst_impl(true);
|
|
}
|
|
|
|
fn copy_file_not_exists_dst_impl(progress: bool) {
|
|
Playground::setup("cp_test_17", |_dirs, sandbox| {
|
|
sandbox.with_files(vec![EmptyFile("valid.txt")]);
|
|
|
|
let progress_flag = if progress { "-p" } else { "" };
|
|
|
|
let actual = nu!(
|
|
cwd: sandbox.cwd(),
|
|
"cp {} valid.txt ~/invalid_dir/invalid_dir1",
|
|
progress_flag,
|
|
);
|
|
assert!(
|
|
actual.err.contains("invalid_dir1") && actual.err.contains("copying to destination")
|
|
);
|
|
});
|
|
}
|
|
|
|
#[test]
|
|
fn copy_file_with_read_permission() {
|
|
copy_file_with_read_permission_impl(false);
|
|
copy_file_with_read_permission_impl(true);
|
|
}
|
|
|
|
fn copy_file_with_read_permission_impl(progress: bool) {
|
|
Playground::setup("cp_test_18", |_dirs, sandbox| {
|
|
sandbox.with_files(vec![
|
|
EmptyFile("valid.txt"),
|
|
FileWithPermission("invalid_prem.txt", false),
|
|
]);
|
|
|
|
let progress_flag = if progress { "-p" } else { "" };
|
|
|
|
let actual = nu!(
|
|
cwd: sandbox.cwd(),
|
|
"cp {} valid.txt invalid_prem.txt",
|
|
progress_flag,
|
|
);
|
|
assert!(
|
|
actual.err.contains("invalid_prem.txt")
|
|
&& actual.err.contains("copying to destination")
|
|
);
|
|
});
|
|
}
|