From 4adc730db724efc7fe8d56a2d042e63559b9184b Mon Sep 17 00:00:00 2001 From: demo Date: Fri, 8 May 2026 10:38:29 -0400 Subject: fix: move findlinks logic to findlinks.go I had written everything inside doc.go by mistake. --- internal/findlinks/doc.go | 44 ---------------------------------------- internal/findlinks/findlinks.go | 45 +++++++++++++++++++++++++++++++++++++++++ 2 files changed, 45 insertions(+), 44 deletions(-) create mode 100644 internal/findlinks/findlinks.go (limited to 'internal') diff --git a/internal/findlinks/doc.go b/internal/findlinks/doc.go index 28573f8..fe847eb 100644 --- a/internal/findlinks/doc.go +++ b/internal/findlinks/doc.go @@ -1,47 +1,3 @@ // Package findlinks iterates over an HTML tree and extracts relevant // data from it. package findlinks - -import ( - "fmt" - "io" - - "golang.org/x/net/html" - "golang.org/x/net/html/atom" -) - -// A Link encapsulates the data harvested from a link. -type Link struct { - Href string - Text string -} - -// findLinks consumes the given [io.Reader], scraping it of anchor -// tags. Each anchor tag is "unmarshalled" into a [Link]. The -// resulting slice of Links is returned, along with an error. -func FindLinks(r io.Reader) ([]Link, error) { - doc, err := html.Parse(r) - if err != nil { - return nil, fmt.Errorf("can't parse html reader: %w", err) - } - - var links []Link - - for n := range doc.Descendants() { - if n.Type == html.ElementNode && n.DataAtom == atom.A { - var link Link - - // Scan the href. - for _, a := range n.Attr { - if a.Key == "href" { - link.Href = a.Val - } - } - - // FIXME: for now, only scan for hrefs. - links = append(links, link) - } - } - - return links, nil -} diff --git a/internal/findlinks/findlinks.go b/internal/findlinks/findlinks.go new file mode 100644 index 0000000..ee26ce2 --- /dev/null +++ b/internal/findlinks/findlinks.go @@ -0,0 +1,45 @@ +package findlinks + +import ( + "fmt" + "io" + + "golang.org/x/net/html" + "golang.org/x/net/html/atom" +) + +// A Link encapsulates the data harvested from a link. +type Link struct { + Href string + Text string +} + +// findLinks consumes the given [io.Reader], scraping it of anchor +// tags. Each anchor tag is "unmarshalled" into a [Link]. The +// resulting slice of Links is returned, along with an error. +func FindLinks(r io.Reader) ([]Link, error) { + doc, err := html.Parse(r) + if err != nil { + return nil, fmt.Errorf("can't parse html reader: %w", err) + } + + var links []Link + + for n := range doc.Descendants() { + if n.Type == html.ElementNode && n.DataAtom == atom.A { + var link Link + + // Scan the href. + for _, a := range n.Attr { + if a.Key == "href" { + link.Href = a.Val + } + } + + // FIXME: for now, only scan for hrefs. + links = append(links, link) + } + } + + return links, nil +} -- cgit v1.2.3