Browse Source

Rename some variables

renovate/configure
Yota Toyama 7 years ago
parent
commit
5026acc6df
  1. 10
      arguments.go
  2. 4
      file_checker.go
  3. 6
      main.go
  4. 8
      url_checker.go

10
arguments.go

@ -30,7 +30,7 @@ type arguments struct {
concurrency int
timeout time.Duration
recursive bool
exclude *regexp.Regexp
excludedPattern *regexp.Regexp
verbose bool
}
@ -61,9 +61,11 @@ func getArguments(argv []string) (arguments, error) {
}
}
var exclude *regexp.Regexp
r := (*regexp.Regexp)(nil)
if args["--exclude"] != nil {
exclude, err = regexp.Compile(args["--exclude"].(string))
r, err = regexp.Compile(args["--exclude"].(string))
if err != nil {
return arguments{}, err
}
@ -75,7 +77,7 @@ func getArguments(argv []string) (arguments, error) {
int(c),
time.Duration(t) * time.Second,
args["--recursive"].(bool),
exclude,
r,
args["--verbose"].(bool),
}, nil
}

4
file_checker.go

@ -18,8 +18,8 @@ type fileChecker struct {
semaphore semaphore
}
func newFileChecker(timeout time.Duration, d string, x *regexp.Regexp, s semaphore) fileChecker {
return fileChecker{newURLChecker(timeout, d, x, s), s}
func newFileChecker(timeout time.Duration, d string, r *regexp.Regexp, s semaphore) fileChecker {
return fileChecker{newURLChecker(timeout, d, r, s), s}
}
func (c fileChecker) Check(f string) ([]urlResult, error) {

6
main.go

@ -30,7 +30,11 @@ func main() {
}()
rc := make(chan fileResult, maxOpenFiles)
c := newFileChecker(args.timeout, args.documentRoot, args.exclude, newSemaphore(args.concurrency))
c := newFileChecker(
args.timeout,
args.documentRoot,
args.excludedPattern,
newSemaphore(args.concurrency))
go c.CheckMany(m.Filenames(), rc)

8
url_checker.go

@ -15,12 +15,12 @@ import (
type urlChecker struct {
timeout time.Duration
documentRoot string
exclude *regexp.Regexp
excludedPattern *regexp.Regexp
semaphore semaphore
}
func newURLChecker(t time.Duration, d string, x *regexp.Regexp, s semaphore) urlChecker {
return urlChecker{t, d, x, s}
func newURLChecker(t time.Duration, d string, r *regexp.Regexp, s semaphore) urlChecker {
return urlChecker{t, d, r, s}
}
func (c urlChecker) Check(u string, f string) error {
@ -29,7 +29,7 @@ func (c urlChecker) Check(u string, f string) error {
return err
}
if c.exclude != nil && c.exclude.MatchString(u) {
if c.excludedPattern != nil && c.excludedPattern.MatchString(u) {
return nil
}

Loading…
Cancel
Save