tsanie/domain-list-community
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Print error in function main

Browse Source
This commit is contained in:
Richard Chen 2018-08-23 17:19:48 +08:00
parent 200d0a4788
commit b1f09e11fc
No known key found for this signature in database
GPG Key ID: C789FC6FC2E7BD21
1 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
main.go
View File

@ -87,17 +87,17 @@ func parseEntry(line string) (Entry, error) {
return Entry{}, errors.New("Invalid format: " + line) return Entry{}, errors.New("Invalid format: " + line)
} }
func DetectPath(path string) string { func DetectPath(path string) (string, error) {
arrPath := strings.Split(path,":") arrPath := strings.Split(path, string(filepath.ListSeparator))
for _,content := range arrPath { for _, content := range arrPath {
fullPath := filepath.Join(content, "src", "github.com", "v2ray", "domain-list-community", "data") fullPath := filepath.Join(content, "src", "github.com", "v2ray", "domain-list-community", "data")
_, err := os.Stat(fullPath) _, err := os.Stat(fullPath)
if err == nil || os.IsExist(err) { if err == nil || os.IsExist(err) {
return fullPath return fullPath, nil
} }
} }
fmt.Println("Failed: No file found in GOPATH") err := errors.New("No file found in GOPATH")
return "" return "", err
} }
func Load(path string) (*List, error) { func Load(path string) (*List, error) {
@ -164,9 +164,13 @@ func ParseList(list *List, ref map[string]*List) (*ParsedList, error) {
} }
func main() { func main() {
dir := DetectPath(os.Getenv("GOPATH")) dir, err := DetectPath(os.Getenv("GOPATH"))
if err != nil {
fmt.Println("Failed: ", err)
return
}
ref := make(map[string]*List) ref := make(map[string]*List)
err := filepath.Walk(dir, func(path string, info os.FileInfo, err error) error { err = filepath.Walk(dir, func(path string, info os.FileInfo, err error) error {
if err != nil { if err != nil {
return err return err
} }