From 19be52dc8cd771cfc50b64218204e4f0d9cc37ba Mon Sep 17 00:00:00 2001 From: Tavee Khunbida Date: Tue, 8 Jan 2019 00:34:51 +0700 Subject: [PATCH 1/7] Fix panic on running tests for newly generated project --- cmd/commands/api/apiapp.go | 2 +- cmd/commands/new/new.go | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/cmd/commands/api/apiapp.go b/cmd/commands/api/apiapp.go index e1862be..2803fd3 100644 --- a/cmd/commands/api/apiapp.go +++ b/cmd/commands/api/apiapp.go @@ -511,7 +511,7 @@ import ( ) func init() { - _, file, _, _ := runtime.Caller(1) + _, file, _, _ := runtime.Caller(0) apppath, _ := filepath.Abs(filepath.Dir(filepath.Join(file, ".." + string(filepath.Separator)))) beego.TestBeegoInit(apppath) } diff --git a/cmd/commands/new/new.go b/cmd/commands/new/new.go index 299f094..120efa2 100644 --- a/cmd/commands/new/new.go +++ b/cmd/commands/new/new.go @@ -101,7 +101,7 @@ import ( ) func init() { - _, file, _, _ := runtime.Caller(1) + _, file, _, _ := runtime.Caller(0) apppath, _ := filepath.Abs(filepath.Dir(filepath.Join(file, ".." + string(filepath.Separator)))) beego.TestBeegoInit(apppath) } From 79d6746aa22d4cffbe2d8895612d7cbd22858d27 Mon Sep 17 00:00:00 2001 From: Tavee Khunbida Date: Tue, 8 Jan 2019 01:02:14 +0700 Subject: [PATCH 2/7] Fix staticcheck failed - should use time.Until instead of t.Sub(time.Now()) (S1024) --- cmd/commands/dlv/dlv_amd64.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmd/commands/dlv/dlv_amd64.go b/cmd/commands/dlv/dlv_amd64.go index 6eda3fb..6ed5901 100644 --- a/cmd/commands/dlv/dlv_amd64.go +++ b/cmd/commands/dlv/dlv_amd64.go @@ -227,7 +227,7 @@ func startWatcher(paths []string, ch chan int) { // Wait 1s before re-build until there is no file change scheduleTime := time.Now().Add(1 * time.Second) - time.Sleep(scheduleTime.Sub(time.Now())) + time.Until(scheduleTime) _, err := buildDebug() if err != nil { utils.Notify("Build Failed: "+err.Error(), "bee") From d24c05d83ef389db389342672475255eb3c6b082 Mon Sep 17 00:00:00 2001 From: Tavee Khunbida Date: Tue, 8 Jan 2019 01:03:58 +0700 Subject: [PATCH 3/7] Fix staticcheck failed - should use time.Until instead of t.Sub(time.Now()) (S1024) --- cmd/commands/run/watch.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cmd/commands/run/watch.go b/cmd/commands/run/watch.go index be547cb..6ad984b 100644 --- a/cmd/commands/run/watch.go +++ b/cmd/commands/run/watch.go @@ -85,7 +85,7 @@ func NewWatcher(paths []string, files []string, isgenerate bool) { go func() { // Wait 1s before autobuild until there is no file change. scheduleTime = time.Now().Add(1 * time.Second) - time.Sleep(scheduleTime.Sub(time.Now())) + time.Until(scheduleTime) AutoBuild(files, isgenerate) if config.Conf.EnableReload { @@ -148,7 +148,7 @@ func AutoBuild(files []string, isgenerate bool) { } appName := appname if err == nil { - + if runtime.GOOS == "windows" { appName += ".exe" } From f2696160ae921f28e7baae12585d2e51ad537344 Mon Sep 17 00:00:00 2001 From: Tavee Khunbida Date: Tue, 8 Jan 2019 01:04:40 +0700 Subject: [PATCH 4/7] Fix staticcheck failed - error strings should not be capitalized (ST1005) --- generate/swaggergen/g_docs.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/generate/swaggergen/g_docs.go b/generate/swaggergen/g_docs.go index 71c13bd..77ece10 100644 --- a/generate/swaggergen/g_docs.go +++ b/generate/swaggergen/g_docs.go @@ -32,7 +32,7 @@ import ( "strings" "unicode" - "gopkg.in/yaml.v2" + yaml "gopkg.in/yaml.v2" "github.com/astaxie/beego/swagger" "github.com/astaxie/beego/utils" @@ -124,7 +124,7 @@ func ParsePackagesFromDir(dirpath string) { err = parsePackageFromDir(fpath) if err != nil { // Send the error to through the channel and continue walking - c <- fmt.Errorf("Error while parsing directory: %s", err.Error()) + c <- fmt.Errorf("error while parsing directory: %s", err.Error()) return nil } } From 22af6cc712324ad9cbb9ce323989a2b81b17a4a4 Mon Sep 17 00:00:00 2001 From: Tavee Khunbida Date: Tue, 8 Jan 2019 01:07:11 +0700 Subject: [PATCH 5/7] Fix staticcheck failed - cutset contains duplicate characters (SA1024) --- generate/swaggergen/g_docs.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/generate/swaggergen/g_docs.go b/generate/swaggergen/g_docs.go index 77ece10..e24656d 100644 --- a/generate/swaggergen/g_docs.go +++ b/generate/swaggergen/g_docs.go @@ -541,7 +541,7 @@ func parserComments(f *ast.FuncDecl, controllerName, pkgpath string) error { //TODO: resultMap := buildParamMap(f.Type.Results) if comments != nil && comments.List != nil { for _, c := range comments.List { - t := strings.TrimSpace(strings.TrimLeft(c.Text, "//")) + t := strings.TrimSpace(strings.TrimPrefix(c.Text, "//")) if strings.HasPrefix(t, "@router") { elements := strings.TrimSpace(t[len("@router"):]) e1 := strings.SplitN(elements, " ", 2) From 4d1304b78c3f61cf19bf202d29197c195913d160 Mon Sep 17 00:00:00 2001 From: Tavee Khunbida Date: Tue, 8 Jan 2019 01:08:03 +0700 Subject: [PATCH 6/7] Fix staticcheck failed - error strings should not be capitalized (ST1005) --- utils/utils.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/utils/utils.go b/utils/utils.go index 13e50b1..75b6898 100644 --- a/utils/utils.go +++ b/utils/utils.go @@ -328,7 +328,7 @@ func CheckEnv(appname string) (apppath, packpath string, err error) { apppath = filepath.Join(gosrcpath, appname) if _, e := os.Stat(apppath); !os.IsNotExist(e) { - err = fmt.Errorf("Cannot create application without removing '%s' first", apppath) + err = fmt.Errorf("cannot create application without removing '%s' first", apppath) beeLogger.Log.Errorf("Path '%s' already exists", apppath) return } From df31f04b2689a9d048e948f7c26860ef89fcd771 Mon Sep 17 00:00:00 2001 From: Tavee Khunbida Date: Tue, 8 Jan 2019 22:21:19 +0700 Subject: [PATCH 7/7] Fix accidently removed time.Sleep --- cmd/commands/dlv/dlv_amd64.go | 2 +- cmd/commands/run/watch.go | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/cmd/commands/dlv/dlv_amd64.go b/cmd/commands/dlv/dlv_amd64.go index 6ed5901..a61a5fa 100644 --- a/cmd/commands/dlv/dlv_amd64.go +++ b/cmd/commands/dlv/dlv_amd64.go @@ -227,7 +227,7 @@ func startWatcher(paths []string, ch chan int) { // Wait 1s before re-build until there is no file change scheduleTime := time.Now().Add(1 * time.Second) - time.Until(scheduleTime) + time.Sleep(time.Until(scheduleTime)) _, err := buildDebug() if err != nil { utils.Notify("Build Failed: "+err.Error(), "bee") diff --git a/cmd/commands/run/watch.go b/cmd/commands/run/watch.go index 6ad984b..f698f71 100644 --- a/cmd/commands/run/watch.go +++ b/cmd/commands/run/watch.go @@ -85,7 +85,7 @@ func NewWatcher(paths []string, files []string, isgenerate bool) { go func() { // Wait 1s before autobuild until there is no file change. scheduleTime = time.Now().Add(1 * time.Second) - time.Until(scheduleTime) + time.Sleep(time.Until(scheduleTime)) AutoBuild(files, isgenerate) if config.Conf.EnableReload {