Skip to content

Commit 3f8e67b

Browse files
committed
Refactor arround rendering result
1 parent 6a6299d commit 3f8e67b

File tree

1 file changed

+18
-11
lines changed

1 file changed

+18
-11
lines changed

cmd/unity-meta-checker/main.go

+18-11
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ package main
22

33
import (
44
"fmt"
5+
"io"
56
"os"
67
"path/filepath"
78
"sort"
@@ -63,6 +64,22 @@ func validateAssetPaths(assetPathInfos map[string]*models.AssetPathInfo) *models
6364
return models.NewResult(danglingMetaPaths, metalessAssetPaths)
6465
}
6566

67+
func renderResult(result *models.Result, output io.Writer, customTemplatePath string) error {
68+
var t *template.Template
69+
70+
if customTemplatePath != "" {
71+
customTemplate, err := render.LoadTemplate(customTemplatePath)
72+
if err != nil {
73+
return err
74+
}
75+
t = customTemplate
76+
} else {
77+
t = render.GetDefaultTemplate()
78+
}
79+
80+
return render.RenderResult(result, t, output)
81+
}
82+
6683
func isHelpFlagGiven(err error) bool {
6784
flagsErr, ok := err.(*flags.Error)
6885
return ok && flagsErr.Type == flags.ErrHelp
@@ -105,17 +122,7 @@ func main() {
105122
fmt.Fprintf(os.Stderr, "Write result to %s\n", opts.Output)
106123
}
107124

108-
var t *template.Template
109-
if opts.TemplatePath != "" {
110-
t, err = render.LoadTemplate(opts.TemplatePath)
111-
if err != nil {
112-
fmt.Fprintf(os.Stderr, "ERROR: %v\n", err)
113-
os.Exit(1)
114-
}
115-
} else {
116-
t = render.GetDefaultTemplate()
117-
}
118-
if err := render.RenderResult(result, t, output); err != nil {
125+
if err := renderResult(result, output, opts.TemplatePath); err != nil {
119126
fmt.Fprintf(os.Stderr, "ERROR: %v\n", err)
120127
os.Exit(1)
121128
}

0 commit comments

Comments
 (0)