glenux-archive/spf13--cobra
1
0
Fork 0
mirror of https://github.com/spf13/cobra synced 2025-05-06 13:27:26 +00:00
Code Issues Projects Releases Packages Wiki Activity

add func findCmdSuffix

Browse source
This commit is contained in:
bonfy 2018-04-13 09:45:59 +08:00
parent 1f2154738b
commit c03b5c3e9c
1 changed files with 15 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
cobra/cmd/project.go
View file

@ -92,7 +92,9 @@ func NewProjectFromPath(absPath string) *Project {
} }
p := new(Project) p := new(Project)
p.absPath = strings.TrimSuffix(absPath, findCmdDir(absPath))
cmdDir := findCmdDir(absPath)
p.absPath = strings.TrimSuffix(absPath, findCmdSuffix(cmdDir))
p.name = filepath.ToSlash(trimSrcPath(p.absPath, p.SrcPath())) p.name = filepath.ToSlash(trimSrcPath(p.absPath, p.SrcPath()))
return p return p
} }
@ -130,25 +132,33 @@ func (p *Project) CmdPath() string {
return p.cmdPath return p.cmdPath
} }
// findCmdSuffix return the cmd dir start with file path separator
func findCmdSuffix(cmdDir string) string {
if filepathHasPrefix(cmdDir, string(os.PathSeparator)) {
return cmdDir
}
return string(os.PathSeparator) + cmdDir
}
// findCmdDir checks if base of absPath is cmd dir and returns it or // findCmdDir checks if base of absPath is cmd dir and returns it or
// looks for existing cmd dir in absPath. // looks for existing cmd dir in absPath.
func findCmdDir(absPath string) string { func findCmdDir(absPath string) string {
if !exists(absPath) || isEmpty(absPath) { if !exists(absPath) || isEmpty(absPath) {
return string(os.PathSeparator) + "cmd" return "cmd"
} }
if isCmdDir(absPath) { if isCmdDir(absPath) {
return string(os.PathSeparator) + filepath.Base(absPath) return filepath.Base(absPath)
} }
files, _ := filepath.Glob(filepath.Join(absPath, "c*")) files, _ := filepath.Glob(filepath.Join(absPath, "c*"))
for _, file := range files { for _, file := range files {
if isCmdDir(file) { if isCmdDir(file) {
return string(os.PathSeparator) + filepath.Base(file) return filepath.Base(file)
} }
} }
return string(os.PathSeparator) + "cmd" return "cmd"
} }
// isCmdDir checks if base of name is one of cmdDir. // isCmdDir checks if base of name is one of cmdDir.