JOJ/JOJ3
25
6
Fork 0
Code Issues 4 Pull Requests Actions Packages Projects Releases Wiki Activity

feat: use tag & json loader only
All checks were successful
continuous-integration/drone/push Build is passing
Details

Browse Source
This commit is contained in:
张泊明518370910136 2024-09-19 17:45:42 -04:00
parent 92f375ed01
commit f4bc61654c
Signed by: 张泊明518370910136
GPG Key ID: D47306D7062CDA9D
1 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
cmd/joj3/conf.go
View File

@ -61,11 +61,21 @@ type OptionalCmd struct {
} }
func parseConfFile(path string) (conf Conf, err error) { func parseConfFile(path string) (conf Conf, err error) {
m := multiconfig.NewWithPath(path) d := &multiconfig.DefaultLoader{}
if err = m.Load(&conf); err != nil { d.Loader = multiconfig.MultiLoader(
&multiconfig.TagLoader{},
&multiconfig.JSONLoader{Path: path},
)
d.Validator = multiconfig.MultiValidator(&multiconfig.RequiredValidator{})
if err = d.Load(&conf); err != nil {
slog.Error("parse stages conf", "error", err) slog.Error("parse stages conf", "error", err)
return return
} }
if err = d.Validate(&conf); err != nil {
slog.Error("validate stages conf", "error", err)
return
}
slog.Error("parse stages conf", "conf", conf)
return return
} }