From 8ac07398587cd91c26a9f1f2307cb31557627074 Mon Sep 17 00:00:00 2001 From: yuyi Date: Tue, 3 Mar 2020 02:30:04 +0800 Subject: [PATCH] os api: cp_r => cp_all --- vlib/os/os.v | 7 ++++++- vlib/os/os_test.v | 6 +++--- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/vlib/os/os.v b/vlib/os/os.v index a3e255967f..d9d5adf69d 100644 --- a/vlib/os/os.v +++ b/vlib/os/os.v @@ -170,7 +170,12 @@ pub fn cp(old, new string) ?bool { } } +[deprecated] 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) dest_path := os.realpath(odest_path) if !os.exists(source_path) { @@ -206,7 +211,7 @@ pub fn cp_r(osource_path, odest_path string, overwrite bool) ?bool { panic(err) } } - cp_r(sp, dp, overwrite) or { + cp_all(sp, dp, overwrite) or { os.rmdir(dp) panic(err) } diff --git a/vlib/os/os_test.v b/vlib/os/os_test.v index ca59406e02..937ce9643c 100644 --- a/vlib/os/os_test.v +++ b/vlib/os/os_test.v @@ -171,18 +171,18 @@ fn test_cp_r() { // NB: clean up of the files happens inside the cleanup_leftovers function os.write_file('ex1.txt', 'wow!') 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) } new := os.read_file('ex/ex1.txt') or { panic(err) } assert old == new os.mkdir('ex/ex2') or { panic(err) } 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) } new2 := os.read_file('ex/ex2/ex2.txt') or { panic(err) } assert old2 == new2 //recurring on dir -> local dir - os.cp_r('ex', './', true) or { panic(err) } + os.cp_all('ex', './', true) or { panic(err) } } fn test_tmpdir(){