lbsadmin/bee
1
0
Fork 0
mirror of https://github.com/beego/bee.git synced 2024-11-21 23:50:54 +00:00
Code Issues Releases Activity

Revert "Only contents in "CompareExcept" are excluded during comparison"

Browse Source 
This reverts commit a9d3de0872.
This commit is contained in:
askuy 2020-07-27 13:09:56 +08:00 committed by GitHub
parent a9d3de0872
commit e6c630ea75
3 changed files with 19 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
internal/app/module/beegopro/config.go
View File

@ -6,8 +6,6 @@ import (
"io/ioutil" "io/ioutil"
) )
var CompareExcept = []string{"@BeeGenerateTime"}
func (c *Container) GenConfig() { func (c *Container) GenConfig() {
if utils.IsExist(c.BeegoProFile) { if utils.IsExist(c.BeegoProFile) {
beeLogger.Log.Fatalf("beego pro toml exist") beeLogger.Log.Fatalf("beego pro toml exist")

5
internal/app/module/beegopro/render.go
View File

@ -130,8 +130,7 @@ func (r *RenderFile) Exec(name string) {
} }
// Replace or create when content changes // Replace or create when content changes
output := []byte(buf) output := []byte(buf)
ext := filepath.Ext(r.FlushFile) if r.Option.EnableFormat && filepath.Ext(r.FlushFile) == ".go" {
if r.Option.EnableFormat && ext == ".go" {
// format code // format code
var bts []byte var bts []byte
bts, err = format.Source([]byte(buf)) bts, err = format.Source([]byte(buf))
@ -142,7 +141,7 @@ func (r *RenderFile) Exec(name string) {
output = bts output = bts
} }
if FileContentChange(orgContent,output,GetSeg(ext)) { if FileContentChange(orgContent,output) {
err = r.write(r.FlushFile, output) err = r.write(r.FlushFile, output)
if err != nil { if err != nil {
beeLogger.Log.Fatalf("Could not create file: %s", err) beeLogger.Log.Fatalf("Could not create file: %s", err)

47
internal/app/module/beegopro/util.go
View File

@ -80,7 +80,11 @@ func (c *RenderFile) write(filename string, buf []byte) (err error) {
} }
func isNeedOverwrite(fileName string) (flag bool) { func isNeedOverwrite(fileName string) (flag bool) {
seg := GetSeg(filepath.Ext(fileName)) seg := "//"
ext := filepath.Ext(fileName)
if ext == ".sql" {
seg = "--"
}
f, err := os.Open(fileName) f, err := os.Open(fileName)
if err != nil { if err != nil {
@ -186,12 +190,21 @@ func getModelType(orm string) (inputType, goType, mysqlType, tag string) {
return return
} }
func FileContentChange(org,new []byte, seg string) bool { func FileContentChange(org,new []byte) bool {
if len(org) == 0 { if len(org) == 0 {
return true return true
} }
orgContent := GetFilterContent(string(org),seg) var orgContent,newContent string
newContent := GetFilterContent(string(org),string(new)) for i, s := range strings.Split(string(org), "\n") {
if i > 1 {
orgContent += s
}
}
for i, s := range strings.Split(string(new), "\n") {
if i > 1 {
newContent += s
}
}
orgMd5 := md5.Sum([]byte(orgContent)) orgMd5 := md5.Sum([]byte(orgContent))
newMd5:= md5.Sum([]byte(newContent)) newMd5:= md5.Sum([]byte(newContent))
if orgMd5 != newMd5 { if orgMd5 != newMd5 {
@ -200,29 +213,3 @@ func FileContentChange(org,new []byte, seg string) bool {
beeLogger.Log.Infof("File has no change in the content") beeLogger.Log.Infof("File has no change in the content")
return false return false
} }
func GetFilterContent(content string, seg string) string {
res := ""
for _, s := range strings.Split(content, "\n") {
s = strings.TrimSpace(strings.TrimPrefix(s, seg))
var have = false
for _,except := range CompareExcept{
if strings.HasPrefix(s, except) {
have = true
}
}
if !have {
res += s
}
}
return res
}
func GetSeg(ext string) string {
switch ext {
case ".sql":
return "--"
default:
return "//"
}
}