all: reformat
This commit is contained in:
@@ -25,12 +25,11 @@ var Visited = struct {
|
||||
visited map[string]bool
|
||||
}{visited: make(map[string]bool)}
|
||||
|
||||
|
||||
// visitNode inspects the current node and, if it contains a link we haven’t
|
||||
// visited it yet, will spawn a goroutine for it. It will also return that link,
|
||||
// because we have to add it to our list of linked nodes.
|
||||
func visitNode(node *html.Node, parent, current string, wg *sync.WaitGroup) (*string, error) {
|
||||
var val *string
|
||||
var val *string
|
||||
if node.Type == html.ElementNode && node.Data == "a" {
|
||||
for _, a := range node.Attr {
|
||||
if a.Key != "href" {
|
||||
@@ -56,17 +55,17 @@ func visitNode(node *html.Node, parent, current string, wg *sync.WaitGroup) (*st
|
||||
|
||||
Visited.RLock()
|
||||
if !Visited.visited[val] {
|
||||
Visited.RUnlock()
|
||||
Visited.RUnlock()
|
||||
Visited.Lock()
|
||||
Visited.visited[val] = true
|
||||
Visited.Unlock()
|
||||
go doCrawl(val, parent, wg)
|
||||
} else {
|
||||
Visited.RUnlock()
|
||||
}
|
||||
Visited.RUnlock()
|
||||
}
|
||||
}
|
||||
}
|
||||
return val, nil
|
||||
return val, nil
|
||||
}
|
||||
|
||||
// parseNode parses a single node. It is recursive, and will first be called
|
||||
@@ -74,15 +73,15 @@ func visitNode(node *html.Node, parent, current string, wg *sync.WaitGroup) (*st
|
||||
// but we don’t know the amount of links we will encounter yet.
|
||||
func parseNode(node *html.Node, parent, current string, wg *sync.WaitGroup) ([]string, error) {
|
||||
links := []string{}
|
||||
val, err := visitNode(node, parent, current, wg)
|
||||
val, err := visitNode(node, parent, current, wg)
|
||||
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
|
||||
if val != nil {
|
||||
links = append(links, val)
|
||||
}
|
||||
if val != nil {
|
||||
links = append(links, val)
|
||||
}
|
||||
|
||||
for c := node.FirstChild; c != nil; c = c.NextSibling {
|
||||
newLinks, err := parseNode(c, parent, current, wg)
|
||||
@@ -109,8 +108,8 @@ func parseRequest(body io.ReadCloser, parent, url string, wg *sync.WaitGroup) {
|
||||
|
||||
links, err := parseNode(document, parent, url, wg)
|
||||
|
||||
// this can look weird with concurrent printing, but oh well. I’m not sure
|
||||
// it’s worth it to make this linear for now.
|
||||
// this can look weird with concurrent printing, but oh well. I’m not sure
|
||||
// it’s worth it to make this linear for now.
|
||||
pretty.Print(url, links)
|
||||
}
|
||||
|
||||
@@ -119,9 +118,10 @@ func parseRequest(body io.ReadCloser, parent, url string, wg *sync.WaitGroup) {
|
||||
// don’t exit prematurely, since this is all concurrent.
|
||||
func doCrawl(toVisit string, parent string, wg *sync.WaitGroup) {
|
||||
wg.Add(1)
|
||||
resp, err := http.Get(toVisit)
|
||||
defer wg.Done()
|
||||
|
||||
resp, err := http.Get(toVisit)
|
||||
|
||||
if err != nil {
|
||||
log.Println(err)
|
||||
return
|
||||
|
Reference in New Issue
Block a user