Browse Source

Fix verbose option

renovate/configure
Yota Toyama 8 years ago
parent
commit
13a21486cf
  1. 8
      file_checker.go
  2. 4
      main.go
  3. 5
      url_checker.go

8
file_checker.go

@ -14,8 +14,8 @@ type fileChecker struct {
urlChecker urlChecker urlChecker urlChecker
} }
func newFileChecker(timeout time.Duration, verbose bool) fileChecker { func newFileChecker(timeout time.Duration) fileChecker {
return fileChecker{newURLChecker(timeout, verbose)} return fileChecker{newURLChecker(timeout)}
} }
func (c fileChecker) Check(f string) ([]urlResult, error) { func (c fileChecker) Check(f string) ([]urlResult, error) {
@ -50,12 +50,14 @@ type fileResult struct {
err error err error
} }
func (r fileResult) String() string { func (r fileResult) String(verbose bool) string {
ss := make([]string, 0, len(r.urlResults)) ss := make([]string, 0, len(r.urlResults))
for _, r := range r.urlResults { for _, r := range r.urlResults {
if r.err != nil || verbose {
ss = append(ss, "\t"+r.String()) ss = append(ss, "\t"+r.String())
} }
}
return strings.Join(append([]string{r.filename}, ss...), "\n") return strings.Join(append([]string{r.filename}, ss...), "\n")
} }

4
main.go

@ -28,7 +28,7 @@ func main() {
args := getArgs() args := getArgs()
fs := args["<filenames>"].([]string) fs := args["<filenames>"].([]string)
rc := make(chan fileResult, len(fs)) rc := make(chan fileResult, len(fs))
c := newFileChecker(5*time.Second, args["--verbose"].(bool)) c := newFileChecker(5 * time.Second)
for _, f := range fs { for _, f := range fs {
go func(f string) { go func(f string) {
@ -49,7 +49,7 @@ func main() {
ok = ok && r.Ok() ok = ok && r.Ok()
printToStderr(r.String()) printToStderr(r.String(args["--verbose"].(bool)))
} }
if !ok { if !ok {

5
url_checker.go

@ -10,11 +10,10 @@ import (
type urlChecker struct { type urlChecker struct {
client http.Client client http.Client
verbose bool
} }
func newURLChecker(timeout time.Duration, verbose bool) urlChecker { func newURLChecker(timeout time.Duration) urlChecker {
return urlChecker{http.Client{Timeout: timeout}, verbose} return urlChecker{http.Client{Timeout: timeout}}
} }
func (c urlChecker) Check(s string) error { func (c urlChecker) Check(s string) error {

Loading…
Cancel
Save