mirror/v
1
0
Fork 0
mirror of https://github.com/vlang/v.git synced 2023-08-10 21:13:21 +03:00
Code Issues Projects Releases Wiki Activity

os: join => join_path

Browse Source
This commit is contained in:
yuyi
2020-03-09 09:23:34 +08:00
committed by GitHub
parent e3687dc257
commit 876b73f92c
23 changed files with 62 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
vlib/os/os.v
View File

@@ -181,7 +181,7 @@ pub fn cp_all(osource_path, odest_path string, overwrite bool) ?bool {
}
// single file copy
if !os.is_dir(source_path) {
adjasted_path := if os.is_dir(dest_path) { os.join(dest_path,os.filename(source_path)) } else { dest_path }
adjasted_path := if os.is_dir(dest_path) { os.join_path(dest_path,os.filename(source_path)) } else { dest_path }
if os.exists(adjasted_path) {
if overwrite {
os.rm(adjasted_path)
@@ -202,8 +202,8 @@ pub fn cp_all(osource_path, odest_path string, overwrite bool) ?bool {
return error(err)
}
for file in files {
sp := os.join(source_path,file)
dp := os.join(dest_path,file)
sp := os.join_path(source_path, file)
dp := os.join_path(dest_path, file)
if os.is_dir(sp) {
os.mkdir(dp) or {
panic(err)
@@ -632,10 +632,10 @@ pub fn rmdir_all(path string) {
return
}
for item in items {
if os.is_dir(os.join(path,item)) {
rmdir_all(os.join(path,item))
if os.is_dir(os.join_path(path, item)) {
rmdir_all(os.join_path(path, item))
}
os.rm(os.join(path,item))
os.rm(os.join_path(path, item))
}
os.rmdir(path)
}
@@ -1002,7 +1002,7 @@ pub fn is_abs(path string) bool {
}
// join returns path as string from string parameter(s).
pub fn join(base string, dirs ...string) string {
pub fn join_path(base string, dirs ...string) string {
mut result := []string
result << base.trim_right('\\/')
for d in dirs {
@@ -1192,5 +1192,5 @@ pub fn resource_abs_path(path string) string {
if vresource.len != 0 {
base_path = vresource
}
return os.realpath( os.join( base_path, path ) )
return os.realpath(os.join_path(base_path, path))
}

4
vlib/os/os_test.v
View File

@@ -307,9 +307,9 @@ fn test_is_abs() {
fn test_join() {
$if windows {
assert os.join('v', 'vlib', 'os') == 'v\\vlib\\os'
assert os.join_path('v', 'vlib', 'os') == 'v\\vlib\\os'
} $else {
assert os.join('v', 'vlib', 'os') == 'v/vlib/os'
assert os.join_path('v', 'vlib', 'os') == 'v/vlib/os'
}
}