fix: statDirIfExist

Author: wolfogre

modules/options/base.go

@@ -78,3 +78,18 @@ func walkAssetDir(root string, callback func(path, name string, d fs.DirEntry, e
 	}
 	return nil
 }
+
+func statDirIfExist(dir string) ([]string, error) {
+	isDir, err := util.IsDir(dir)
+	if err != nil {
+		return nil, fmt.Errorf("unable to check if static directory %s is a directory. %w", dir, err)
+	}
+	if !isDir {
+		return nil, nil
+	}
+	files, err := util.StatDir(dir, true)
+	if err != nil {
+		return nil, fmt.Errorf("unable to read directory %q. %w", dir, err)
+	}
+	return files, nil
+}

modules/options/dynamic.go

@@ -29,9 +29,9 @@ func Dir(name string) ([]string, error) {
 		path.Join(setting.CustomPath, "options", name),     // custom dir
 		path.Join(setting.StaticRootPath, "options", name), // static dir
 	} {
-		files, err := util.StatDir(dir, true)
+		files, err := statDirIfExist(dir)
 		if err != nil {
-			return nil, fmt.Errorf("unable to read directory %q. %w", dir, err)
+			return nil, err
 		}
 		result = append(result, files...)
 	}

modules/options/static.go

@@ -30,9 +30,9 @@ func Dir(name string) ([]string, error) {
 		path.Join(setting.CustomPath, "options", name), // custom dir
 		// no static dir
 	} {
-		files, err := util.StatDir(dir, true)
+		files, err := statDirIfExist(dir)
 		if err != nil {
-			return nil, fmt.Errorf("unable to read directory %q. %w", dir, err)
+			return nil, err
 		}
 		result = append(result, files...)
 	}