zeromicro/go-zero
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

refactor file|path (#1409)

Browse Source 
Co-authored-by: anqiansong <anqiansong@bytedance.com>
This commit is contained in:
anqiansong
2022-01-03 21:32:40 +08:00
committed by GitHub
parent 290de6aa96
commit 89ce5e492b
81 changed files with 279 additions and 245 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
tools/goctl/util/ctx/gomod.go
View File

@@ -7,7 +7,7 @@ import (
"github.com/tal-tech/go-zero/core/jsonx"
"github.com/tal-tech/go-zero/tools/goctl/rpc/execx"
"github.com/tal-tech/go-zero/tools/goctl/util"
"github.com/tal-tech/go-zero/tools/goctl/util/pathx"
)
// Module contains the relative data of go module,
@@ -31,7 +31,7 @@ func projectFromGoMod(workDir string) (*ProjectContext, error) {
return nil, err
}
workDir, err := util.ReadLink(workDir)
workDir, err := pathx.ReadLink(workDir)
if err != nil {
return nil, err
}
@@ -49,7 +49,7 @@ func projectFromGoMod(workDir string) (*ProjectContext, error) {
var ret ProjectContext
ret.WorkDir = workDir
ret.Name = filepath.Base(m.Dir)
dir, err := util.ReadLink(m.Dir)
dir, err := pathx.ReadLink(m.Dir)
if err != nil {
return nil, err
}

4
tools/goctl/util/ctx/gomod_test.go
View File

@@ -9,7 +9,7 @@ import (
"github.com/stretchr/testify/assert"
"github.com/tal-tech/go-zero/core/stringx"
"github.com/tal-tech/go-zero/tools/goctl/rpc/execx"
"github.com/tal-tech/go-zero/tools/goctl/util"
"github.com/tal-tech/go-zero/tools/goctl/util/pathx"
)
func TestProjectFromGoMod(t *testing.T) {
@@ -20,7 +20,7 @@ func TestProjectFromGoMod(t *testing.T) {
}
projectName := stringx.Rand()
dir := filepath.Join(gp, "src", projectName)
err := util.MkdirIfNotExist(dir)
err := pathx.MkdirIfNotExist(dir)
if err != nil {
return
}

8
tools/goctl/util/ctx/gopath.go
View File

@@ -7,7 +7,7 @@ import (
"path/filepath"
"strings"
"github.com/tal-tech/go-zero/tools/goctl/util"
"github.com/tal-tech/go-zero/tools/goctl/util/pathx"
)
// projectFromGoPath is used to find the main module and project file path
@@ -21,20 +21,20 @@ func projectFromGoPath(workDir string) (*ProjectContext, error) {
return nil, err
}
workDir, err := util.ReadLink(workDir)
workDir, err := pathx.ReadLink(workDir)
if err != nil {
return nil, err
}
buildContext := build.Default
goPath := buildContext.GOPATH
goPath, err = util.ReadLink(goPath)
goPath, err = pathx.ReadLink(goPath)
if err != nil {
return nil, err
}
goSrc := filepath.Join(goPath, "src")
if !util.FileExists(goSrc) {
if !pathx.FileExists(goSrc) {
return nil, errModuleCheck
}

6
tools/goctl/util/ctx/gopath_test.go
View File

@@ -8,7 +8,7 @@ import (
"github.com/stretchr/testify/assert"
"github.com/tal-tech/go-zero/core/stringx"
"github.com/tal-tech/go-zero/tools/goctl/util"
"github.com/tal-tech/go-zero/tools/goctl/util/pathx"
)
func TestProjectFromGoPath(t *testing.T) {
@@ -19,7 +19,7 @@ func TestProjectFromGoPath(t *testing.T) {
}
projectName := stringx.Rand()
dir := filepath.Join(gp, "src", projectName)
err := util.MkdirIfNotExist(dir)
err := pathx.MkdirIfNotExist(dir)
if err != nil {
return
}
@@ -41,7 +41,7 @@ func TestProjectFromGoPathNotInGoSrc(t *testing.T) {
}
projectName := stringx.Rand()
dir := filepath.Join(gp, "src", projectName)
err := util.MkdirIfNotExist(dir)
err := pathx.MkdirIfNotExist(dir)
if err != nil {
return
}

6
tools/goctl/util/ctx/modcheck_test.go
View File

@@ -9,7 +9,7 @@ import (
"github.com/stretchr/testify/assert"
"github.com/tal-tech/go-zero/core/stringx"
"github.com/tal-tech/go-zero/tools/goctl/rpc/execx"
"github.com/tal-tech/go-zero/tools/goctl/util"
"github.com/tal-tech/go-zero/tools/goctl/util/pathx"
)
func TestIsGoMod(t *testing.T) {
@@ -21,7 +21,7 @@ func TestIsGoMod(t *testing.T) {
}
projectName := stringx.Rand()
dir := filepath.Join(gp, "src", projectName)
err := util.MkdirIfNotExist(dir)
err := pathx.MkdirIfNotExist(dir)
if err != nil {
return
}
@@ -45,7 +45,7 @@ func TestIsGoModNot(t *testing.T) {
}
projectName := stringx.Rand()
dir := filepath.Join(gp, "src", projectName)
err := util.MkdirIfNotExist(dir)
err := pathx.MkdirIfNotExist(dir)
if err != nil {
return
}