vieter-v
/
v
2
0
Fork 0
Code Issues Pull Requests Releases Activity

os api: cp_r => cp_all

pull/3915/head
yuyi 2020-03-03 02:30:04 +08:00 committed by GitHub
parent 22ffe336cb
commit 8ac0739858
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
vlib/os/os.v
View File

@ -170,7 +170,12 @@ pub fn cp(old, new string) ?bool {
} }
} }
[deprecated]
pub fn cp_r(osource_path, odest_path string, overwrite bool) ?bool { pub fn cp_r(osource_path, odest_path string, overwrite bool) ?bool {
panic('Use `os.cp_all` instead of `os.cp_r`')
}
pub fn cp_all(osource_path, odest_path string, overwrite bool) ?bool {
source_path := os.realpath(osource_path) source_path := os.realpath(osource_path)
dest_path := os.realpath(odest_path) dest_path := os.realpath(odest_path)
if !os.exists(source_path) { if !os.exists(source_path) {
@ -206,7 +211,7 @@ pub fn cp_r(osource_path, odest_path string, overwrite bool) ?bool {
panic(err) panic(err)
} }
} }
cp_r(sp, dp, overwrite) or { cp_all(sp, dp, overwrite) or {
os.rmdir(dp) os.rmdir(dp)
panic(err) panic(err)
} }

6
vlib/os/os_test.v
View File

@ -171,18 +171,18 @@ fn test_cp_r() {
// NB: clean up of the files happens inside the cleanup_leftovers function // NB: clean up of the files happens inside the cleanup_leftovers function
os.write_file('ex1.txt', 'wow!') os.write_file('ex1.txt', 'wow!')
os.mkdir('ex') or { panic(err) } os.mkdir('ex') or { panic(err) }
os.cp_r('ex1.txt', 'ex', false) or { panic(err) } os.cp_all('ex1.txt', 'ex', false) or { panic(err) }
old := os.read_file('ex1.txt') or { panic(err) } old := os.read_file('ex1.txt') or { panic(err) }
new := os.read_file('ex/ex1.txt') or { panic(err) } new := os.read_file('ex/ex1.txt') or { panic(err) }
assert old == new assert old == new
os.mkdir('ex/ex2') or { panic(err) } os.mkdir('ex/ex2') or { panic(err) }
os.write_file('ex2.txt', 'great!') os.write_file('ex2.txt', 'great!')
os.cp_r('ex2.txt', 'ex/ex2', false) or { panic(err) } os.cp_all('ex2.txt', 'ex/ex2', false) or { panic(err) }
old2 := os.read_file('ex2.txt') or { panic(err) } old2 := os.read_file('ex2.txt') or { panic(err) }
new2 := os.read_file('ex/ex2/ex2.txt') or { panic(err) } new2 := os.read_file('ex/ex2/ex2.txt') or { panic(err) }
assert old2 == new2 assert old2 == new2
//recurring on dir -> local dir //recurring on dir -> local dir
os.cp_r('ex', './', true) or { panic(err) } os.cp_all('ex', './', true) or { panic(err) }
} }
fn test_tmpdir(){ fn test_tmpdir(){