Browse Source

Separate result objects into files

renovate/configure
Yota Toyama 8 years ago
parent
commit
57323d655c
  1. 33
      file_checker.go
  2. 37
      file_result.go
  3. 15
      url_checker.go
  4. 16
      url_result.go

33
file_checker.go

@ -4,7 +4,6 @@ import (
"bytes"
"io/ioutil"
"net/url"
"strings"
"time"
"golang.org/x/net/html"
@ -45,38 +44,6 @@ func (c fileChecker) Check(f string) ([]urlResult, error) {
return rs, nil
}
type fileResult struct {
filename string
urlResults []urlResult
err error
}
func (r fileResult) String(verbose bool) string {
ss := make([]string, 0, len(r.urlResults))
for _, r := range r.urlResults {
if r.err != nil || verbose {
ss = append(ss, "\t"+r.String())
}
}
return strings.Join(append([]string{r.filename}, ss...), "\n")
}
func (r fileResult) Ok() bool {
if r.err != nil {
return false
}
for _, r := range r.urlResults {
if r.err != nil {
return false
}
}
return true
}
func extractURLs(n *html.Node) []string {
us := make(map[string]bool)
ns := make([]*html.Node, 0, 1024)

37
file_result.go

@ -0,0 +1,37 @@
package main
import (
"strings"
)
type fileResult struct {
filename string
urlResults []urlResult
err error
}
func (r fileResult) String(verbose bool) string {
ss := make([]string, 0, len(r.urlResults))
for _, r := range r.urlResults {
if r.err != nil || verbose {
ss = append(ss, "\t"+r.String())
}
}
return strings.Join(append([]string{r.filename}, ss...), "\n")
}
func (r fileResult) Ok() bool {
if r.err != nil {
return false
}
for _, r := range r.urlResults {
if r.err != nil {
return false
}
}
return true
}

15
url_checker.go

@ -4,8 +4,6 @@ import (
"net/http"
"sync"
"time"
"github.com/fatih/color"
)
type urlChecker struct {
@ -35,16 +33,3 @@ func (c urlChecker) CheckMany(ss []string, rc chan<- urlResult) {
wg.Wait()
close(rc)
}
type urlResult struct {
url string
err error
}
func (r urlResult) String() string {
if r.err == nil {
return color.GreenString("OK") + "\t" + r.url
}
return color.RedString("ERROR") + "\t" + r.url + "\t" + color.YellowString(r.err.Error())
}

16
url_result.go

@ -0,0 +1,16 @@
package main
import "github.com/fatih/color"
type urlResult struct {
url string
err error
}
func (r urlResult) String() string {
if r.err == nil {
return color.GreenString("OK") + "\t" + r.url
}
return color.RedString("ERROR") + "\t" + r.url + "\t" + color.YellowString(r.err.Error())
}
Loading…
Cancel
Save