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

rand: separate rand.util and rand.seed submodules (#8353)

Browse Source
This commit is contained in:
Subhomoy Haldar
2021-01-26 19:25:09 +05:30
committed by GitHub
parent 5f2b2df546
commit 97103f680a
16 changed files with 107 additions and 104 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -3,7 +3,7 @@ module util
import os
import rand
import rand.wyrand
import rand.util as rutil
import rand.seed as rseed
const (
retries = 10000
@ -26,9 +26,7 @@ pub fn temp_file(tfo TempFileOptions) ?(os.File, string) {
}
d = d.trim_right(os.path_separator)
mut rng := rand.new_default(rand.PRNGConfigStruct{})
prefix, suffix := prefix_and_suffix(tfo.pattern) or {
return error(@FN + ' ' + err)
}
prefix, suffix := prefix_and_suffix(tfo.pattern) or { return error(@FN + ' ' + err) }
for retry := 0; retry < retries; retry++ {
path := os.join_path(d, prefix + random_number(mut rng) + suffix)
mut mode := 'rw+'
@ -36,7 +34,7 @@ pub fn temp_file(tfo TempFileOptions) ?(os.File, string) {
mode = 'w+'
}
mut file := os.open_file(path, mode, 0o600) or {
rng.seed(rutil.time_seed_array(2))
rng.seed(rseed.time_seed_array(2))
continue
}
if os.exists(path) && os.is_file(path) {
@ -64,13 +62,11 @@ pub fn temp_dir(tdo TempFileOptions) ?string {
}
d = d.trim_right(os.path_separator)
mut rng := rand.new_default(rand.PRNGConfigStruct{})
prefix, suffix := prefix_and_suffix(tdo.pattern) or {
return error(@FN + ' ' + err)
}
prefix, suffix := prefix_and_suffix(tdo.pattern) or { return error(@FN + ' ' + err) }
for retry := 0; retry < retries; retry++ {
path := os.join_path(d, prefix + random_number(mut rng) + suffix)
os.mkdir_all(path) or {
rng.seed(rutil.time_seed_array(2))
rng.seed(rseed.time_seed_array(2))
continue
}
if os.is_dir(path) && os.exists(path) {
@ -96,9 +92,7 @@ fn prefix_and_suffix(pattern string) ?(string, string) {
if pat.contains(os.path_separator) {
return error('pattern cannot contain path separators ($os.path_separator).')
}
pos := pat.last_index('*') or {
-1
}
pos := pat.last_index('*') or { -1 }
mut prefix := ''
mut suffix := ''
if pos != -1 {