Updated parser to use reader

Author: KyleWardle

html-link-parser/html-link-parser

@@ -4,12 +4,19 @@ import (
 	"flag"
 	"github.com/KyleWardle/gophercises/html-link-parser/parser"
 	"github.com/davecgh/go-spew/spew"
+	"os"
 )
 
 func main() {
 	example := flag.String("example", "ex1", "")
 	flag.Parse()
 
-	links := parser.ParseLinks("examples/" + *example + ".html")
+	file, err := os.Open("examples/" + *example + ".html")
+	if err != nil {
+		panic(err)
+	}
+	defer file.Close()
+
+	links := parser.ParseLinks(file)
 	spew.Dump(links)
 }

html-link-parser/main.go

@@ -2,7 +2,7 @@ package parser
 
 import (
 	"golang.org/x/net/html"
-	"os"
+	"io"
 	"strings"
 )
 
@@ -11,14 +11,8 @@ type Link struct {
 	Text string
 }
 
-func ParseLinks(path string) []Link {
-	file, err := os.Open(path)
-	if err != nil {
-		panic(err)
-	}
-	defer file.Close()
-
-	doc, err := html.Parse(file)
+func ParseLinks(reader io.Reader) []Link {
+	doc, err := html.Parse(reader)
 	if err != nil {
 		panic(err)
 	}

html-link-parser/parser/parser.go

@@ -3,6 +3,6 @@ module sitemap-builder
 go 1.17
 
 require (
-	github.com/davecgh/go-spew v1.1.1 // indirect
-	golang.org/x/net v0.0.0-20220225172249-27dd8689420f // indirect
+	github.com/KyleWardle/gophercises/html-link-parser v0.0.0-20220310104057-b51db8e68298
+	github.com/davecgh/go-spew v1.1.1
 )

sitemap-builder/go.mod

@@ -1,7 +1,7 @@
+github.com/KyleWardle/gophercises/html-link-parser v0.0.0-20220310104057-b51db8e68298 h1:7ZJXsOpgz99YXtC8MiRlVcsQ7VKQQ2x+AkQ7BaVCiFU=
+github.com/KyleWardle/gophercises/html-link-parser v0.0.0-20220310104057-b51db8e68298/go.mod h1:KioJO93PUc9DDY1osADSBG6iasXXjasyiqA9VCDoP7o=
 github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
-github.com/mitchellh/mapstructure v1.4.3 h1:OVowDSCllw/YjdLkam3/sm7wEtOy59d8ndGgCcyj8cs=
-github.com/mitchellh/mapstructure v1.4.3/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RRV2QTWOzhPopBRo=
 golang.org/x/net v0.0.0-20220225172249-27dd8689420f h1:oA4XRj0qtSt8Yo1Zms0CUlsT3KG69V2UGQWPBxujDmc=
 golang.org/x/net v0.0.0-20220225172249-27dd8689420f/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk=
 golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=

sitemap-builder/go.sum

@@ -1,5 +1,7 @@
 package main
 
 func main() {
-
+	//resp, _ := http.Get("calhoun.io")
+	//links := parser.ParseLinks(	resp.Body)
+	//spew.Dump(links)
 }