broodjeaap/go-watch
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fixed xpath/css innerHTML

Browse source
This commit is contained in:
BroodjeAap 2023-01-15 11:10:18 +00:00
parent aef43ed2ee
commit ec4f16e274
1 changed files with 6 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
scraping.go
View file

@ -354,16 +354,14 @@ func getFilterResultXPath(filter *Filter) {
switch selectType { switch selectType {
case "inner": case "inner":
{ {
// if the child is a text node, theres nothing else (?), so just append that if node.FirstChild == nil {
if node.FirstChild != nil && node.FirstChild.Type == html.TextNode {
filter.Results = append(filter.Results, html.UnescapeString(node.FirstChild.Data))
continue continue
} }
// else, theres more nodes, turn them all into a string and add that as a result
var result bytes.Buffer var result bytes.Buffer
for child := node.FirstChild; child != nil; child = child.NextSibling { for child := node.FirstChild; child != nil; child = child.NextSibling {
var b bytes.Buffer var b bytes.Buffer
html.Render(&b, node) html.Render(&b, child)
result.WriteString(b.String()) result.WriteString(b.String())
} }
filter.Results = append(filter.Results, html.UnescapeString(result.String())) filter.Results = append(filter.Results, html.UnescapeString(result.String()))
@ -421,16 +419,14 @@ func getFilterResultCSS(filter *Filter) {
switch selectType { switch selectType {
case "inner": case "inner":
{ {
// if the child is a text node, theres nothing else (?), so just append that if node.FirstChild == nil {
if node.FirstChild != nil && node.FirstChild.Type == html.TextNode {
filter.Results = append(filter.Results, html.UnescapeString(node.FirstChild.Data))
continue continue
} }
// else, theres more nodes, turn them all into a string and add that as a result
var result bytes.Buffer var result bytes.Buffer
for child := node.FirstChild; child != nil; child = child.NextSibling { for child := node.FirstChild; child != nil; child = child.NextSibling {
var b bytes.Buffer var b bytes.Buffer
html.Render(&b, node) html.Render(&b, child)
result.WriteString(b.String()) result.WriteString(b.String())
} }
filter.Results = append(filter.Results, html.UnescapeString(result.String())) filter.Results = append(filter.Results, html.UnescapeString(result.String()))