Skip to content

Commit 5dfe2ee

Browse files
committed
chore(gen): add git-change mode for git-change flag to improve output
1 parent 3c663d6 commit 5dfe2ee

3 files changed

Lines changed: 28 additions & 16 deletions

File tree

cmd/jzero/internal/command/gen/genapi/genapi.go

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,14 @@ func (ja *JzeroApi) Gen() (map[string]*spec.ApiSpec, error) {
5252
return nil, nil
5353
}
5454

55+
if !config.C.Quiet {
56+
msg := "to generate api code from api files"
57+
if config.C.Gen.GitChange && gitstatus.IsGitRepo(filepath.Join(config.C.Wd())) && len(config.C.Gen.Desc) == 0 {
58+
msg += " (git-change mode)"
59+
}
60+
fmt.Printf("%s %s\n", console.Green("Start"), msg)
61+
}
62+
5563
apiFiles, err := desc.FindRouteApiFiles(config.C.ApiDir())
5664
if err != nil {
5765
return nil, err
@@ -167,10 +175,6 @@ func (ja *JzeroApi) Gen() (map[string]*spec.ApiSpec, error) {
167175
return apiSpecMap, nil
168176
}
169177

170-
if !config.C.Quiet {
171-
fmt.Printf("%s to generate api code from api files\n", console.Green("Start"))
172-
}
173-
174178
err = ja.generateApiCode(apiFiles, apiSpecMap, genCodeApiFiles, genCodeApiSpecMap, currentRoutesMap, importedFiles)
175179
if err != nil {
176180
return nil, err

cmd/jzero/internal/command/gen/genmodel/genmodel.go

Lines changed: 12 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,10 @@ func (jm *JzeroModel) Gen() error {
4646
conns []Conn
4747
)
4848

49+
if !pathx.FileExists(config.C.SqlDir()) && !config.C.Gen.ModelDatasource {
50+
return nil
51+
}
52+
4953
if config.C.Gen.ModelDriver == "postgres" {
5054
config.C.Gen.ModelDriver = "pgx"
5155
}
@@ -85,10 +89,14 @@ func (jm *JzeroModel) Gen() error {
8589
if !config.C.Quiet {
8690
fmt.Printf("%s to generate model from %s\n", console.Green("Start"), config.C.Gen.ModelDatasourceUrl)
8791
}
88-
}
89-
90-
if !pathx.FileExists(config.C.SqlDir()) && !config.C.Gen.ModelDatasource {
91-
return nil
92+
} else {
93+
if !config.C.Quiet {
94+
msg := "to generate model code from sql files"
95+
if config.C.Gen.GitChange && gitstatus.IsGitRepo(filepath.Join(config.C.Wd())) && len(config.C.Gen.Desc) == 0 {
96+
msg += " (git-change mode)"
97+
}
98+
fmt.Printf("%s %s\n", console.Green("Start"), msg)
99+
}
92100
}
93101

94102
// 处理模板
@@ -238,10 +246,6 @@ func (jm *JzeroModel) Gen() error {
238246
return nil
239247
}
240248

241-
if !config.C.Quiet {
242-
fmt.Printf("%s to generate model code from sql files\n", console.Green("Start"))
243-
}
244-
245249
var eg errgroup.Group
246250
eg.SetLimit(len(genCodeSqlFiles))
247251
for _, f := range genCodeSqlFiles {

cmd/jzero/internal/command/gen/genrpc/genrpc.go

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,14 @@ func (jr *JzeroRpc) Gen() (map[string]*rpcparser.Proto, error) {
5858
return nil, nil
5959
}
6060

61+
if !config.C.Quiet {
62+
msg := "to generate rpc code from proto files"
63+
if config.C.Gen.GitChange && gitstatus.IsGitRepo(filepath.Join(config.C.Wd())) && len(config.C.Gen.Desc) == 0 {
64+
msg += " (git-change mode)"
65+
}
66+
fmt.Printf("%s %s\n", console.Green("Start"), msg)
67+
}
68+
6169
protoSpecMap := make(map[string]*rpcparser.Proto, len(protoFiles))
6270
for _, v := range protoFiles {
6371
// parse proto
@@ -144,10 +152,6 @@ func (jr *JzeroRpc) Gen() (map[string]*rpcparser.Proto, error) {
144152
return protoSpecMap, nil
145153
}
146154

147-
if config.C.Quiet {
148-
fmt.Printf("%s to generate rpc code from proto files\n", console.Green("Start"))
149-
}
150-
151155
// 处理模板
152156
var goctlHome string
153157
tempDir, err := os.MkdirTemp(os.TempDir(), "")

0 commit comments

Comments
 (0)