Browse Source

Fix lint errors

renovate/configure
Yota Toyama 8 years ago
parent
commit
d324862e1a
  1. 4
      arguments.go
  2. 8
      main.go
  3. 28
      utils.go
  4. 3
      utils_test.go

4
arguments.go

@ -34,8 +34,8 @@ Options:
type arguments struct { type arguments struct {
filenames []string filenames []string
concurrency int concurrency int
recursive bool
timeout time.Duration timeout time.Duration
recursive bool
verbose bool verbose bool
} }
@ -65,8 +65,8 @@ func getArgs() (arguments, error) {
return arguments{ return arguments{
args["<filenames>"].([]string), args["<filenames>"].([]string),
int(c), int(c),
args["--recursive"].(bool),
time.Duration(t) * time.Second, time.Duration(t) * time.Second,
args["--recursive"].(bool),
args["--verbose"].(bool), args["--verbose"].(bool),
}, nil }, nil
} }

8
main.go

@ -52,7 +52,13 @@ func listFilesRecursively(fs []string) ([]string, error) {
} }
if i.IsDir() { if i.IsDir() {
gs = append(gs, listFiles(f)...) fs, err := listFiles(f)
if err != nil {
return nil, err
}
gs = append(gs, fs...)
} else { } else {
gs = append(gs, f) gs = append(gs, f)
} }

28
utils.go

@ -27,32 +27,30 @@ func indent(s string) string {
return text.Indent(s, "\t") return text.Indent(s, "\t")
} }
func listFiles(d string) []string { func listFiles(d string) ([]string, error) {
fc := make(chan string, 1024) fs := []string{}
err := filepath.Walk(d, func(f string, i os.FileInfo, err error) error {
if err != nil {
return err
}
go func() { b, err := regexp.MatchString("(^\\.)|(/\\.)", f)
filepath.Walk(d, func(p string, f os.FileInfo, err error) error {
b, err := regexp.MatchString("(^\\.)|(/\\.)", p)
if err != nil { if err != nil {
return err return err
} }
if !f.IsDir() && !b && isMarkupFile(p) { if !i.IsDir() && !b && isMarkupFile(f) {
fc <- p fs = append(fs, f)
} }
return nil return nil
}) })
close(fc) if err != nil {
}() return nil, err
fs := []string{}
for f := range fc {
fs = append(fs, f)
} }
return fs return fs, nil
} }

3
utils_test.go

@ -8,8 +8,9 @@ import (
) )
func TestListFiles(t *testing.T) { func TestListFiles(t *testing.T) {
fs := listFiles(".") fs, err := listFiles(".")
assert.Equal(t, nil, err)
assert.NotEqual(t, 0, len(fs)) assert.NotEqual(t, 0, len(fs))
for _, f := range fs { for _, f := range fs {

Loading…
Cancel
Save