Removed # and added new error message case

pull/466/head
Henrixounez 2019-06-23 18:12:21 +02:00 committed by Alex Medvednikov
parent ad5e1fd8d4
commit 13f5429dae
2 changed files with 7 additions and 8 deletions

View File

@ -516,8 +516,10 @@ mut args := ''
fn (c &V) v_files_from_dir(dir string) []string { fn (c &V) v_files_from_dir(dir string) []string {
mut res := []string mut res := []string
if !os.dir_exists(dir) { if !os.file_exists(dir) {
panic('$dir doesn\'t exist') panic('$dir doesn\'t exist')
} else if !os.dir_exists(dir) {
panic('$dir isn\'t a directory')
} }
mut files := os.ls(dir) mut files := os.ls(dir)
if c.is_verbose { if c.is_verbose {

11
os/os.v
View File

@ -332,13 +332,10 @@ pub fn file_exists(path string) bool {
} }
pub fn dir_exists(path string) bool { pub fn dir_exists(path string) bool {
res := false dir := C.opendir(path.cstr())
if file_exists(path) { res := !isnil(dir)
# DIR *dir = opendir(path.str); if res {
# res = dir != NULL; C.closedir(dir)
if res {
# closedir(dir);
}
} }
return res return res
} }