JOJ/JOJ3
24
5
Fork 0
Code Issues 5 Pull Requests Actions Packages Projects Releases Wiki Activity

feat(cmd/joj3): hint valid scopes on file not found #67

Merged
张泊明518370910136 merged 1 commits from hint-valid-scopes into master 2024-10-18 14:46:00 +08:00
Conversation 0 Commits 1 Files Changed 2 +8 -11
2 changed files with 8 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
cmd/joj3/conf/conf.go
View File

@ -228,10 +228,10 @@ func ParseMsg(confRoot, confName, msg, tag string) (confPath, group string, err
return return
} }
func ListValidScopes(confRoot, confName string) ([]string, error) { func HintValidScopes(confRoot, confName string) {
confRoot = filepath.Clean(confRoot) confRoot = filepath.Clean(confRoot)
validScopes := []string{} validScopes := []string{}
err := filepath.Walk(confRoot, func( _ = filepath.Walk(confRoot, func(
path string, info os.FileInfo, err error, path string, info os.FileInfo, err error,
) error { ) error {
if err != nil { if err != nil {
@ -254,7 +254,8 @@ func ListValidScopes(confRoot, confName string) ([]string, error) {
} }
return nil return nil
}) })
return validScopes, err slog.Info("HINT: use valid scopes in commit message",
"valid scopes", validScopes)
} }
func CheckExpire(conf *Conf) error { func CheckExpire(conf *Conf) error {

12
cmd/joj3/main.go
View File

@ -48,20 +48,16 @@ func mainImpl() error {
confPath, group, err := conf.ParseMsg(confRoot, confName, msg, tag) confPath, group, err := conf.ParseMsg(confRoot, confName, msg, tag)
if err != nil { if err != nil {
slog.Error("parse msg", "error", err) slog.Error("parse msg", "error", err)
validScopes, scopeErr := conf.ListValidScopes( conf.HintValidScopes(confRoot, confName)
confRoot, confName)
if scopeErr != nil {
slog.Error("list valid scopes", "error", scopeErr)
return err
}
slog.Info("HINT: use valid scopes in commit message",
"valid scopes", validScopes)
return err return err
} }
slog.Info("try to load conf", "path", confPath) slog.Info("try to load conf", "path", confPath)
confObj, err := conf.ParseConfFile(confPath) confObj, err := conf.ParseConfFile(confPath)
if err != nil { if err != nil {
slog.Error("parse conf", "error", err) slog.Error("parse conf", "error", err)
if _, statErr := os.Stat(confPath); os.IsNotExist(statErr) {
conf.HintValidScopes(confRoot, confName)
}
return err return err
} }
slog.Debug("conf loaded", "conf", confObj) slog.Debug("conf loaded", "conf", confObj)