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: cleanup APIs returning !bool to either return ! or bool (#16111)

Browse Source
This commit is contained in:
Delyan Angelov
2022-10-20 13:56:06 +03:00
committed by GitHub
parent ac63fa1b11
commit 2083e6b04c
13 changed files with 69 additions and 109 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
vlib/io/util/util.v
View File

@ -19,7 +19,7 @@ pub fn temp_file(tfo TempFileOptions) !(os.File, string) {
if d == '' {
d = os.temp_dir()
}
os.is_writable_folder(d) or {
os.ensure_folder_is_writable(d) or {
return error(@FN +
' could not create temporary file in "$d". Please ensure write permissions.')
}
@ -46,31 +46,28 @@ pub struct TempDirOptions {
pattern string
}
fn error_for_temporary_folder(fn_name string, d string) !string {
return error('$fn_name could not create temporary directory "$d". Please ensure you have write permissions for it.')
}
// temp_dir returns an uniquely named, writable, directory path
pub fn temp_dir(tdo TempFileOptions) !string {
mut d := tdo.path
if d == '' {
d = os.temp_dir()
}
os.is_writable_folder(d) or {
return error(@FN +
' could not create temporary directory "$d". Please ensure write permissions.')
}
os.ensure_folder_is_writable(d) or { return error_for_temporary_folder(@FN, d) }
d = d.trim_right(os.path_separator)
prefix, suffix := prefix_and_suffix(tdo.pattern) or { return error(@FN + ' $err.msg()') }
for retry := 0; retry < util.retries; retry++ {
path := os.join_path(d, prefix + random_number() + suffix)
os.mkdir_all(path) or { continue }
if os.is_dir(path) && os.exists(path) {
os.is_writable_folder(path) or {
return error(@FN +
' could not create temporary directory "$d". Please ensure write permissions.')
}
os.ensure_folder_is_writable(path) or { return error_for_temporary_folder(@FN, d) }
return path
}
}
return error(@FN +
' could not create temporary directory "$d". Retry limit ($util.retries) exhausted. Please ensure write permissions.')
return error('${@FN} could not create temporary directory "$d". Retry limit ($util.retries) exhausted.')
}
// * Utility functions