From 8f884ca28a4a202ef76672fcea8f647cab08842c Mon Sep 17 00:00:00 2001 From: Andre Marianiello Date: Fri, 22 Feb 2019 13:44:05 -0500 Subject: [PATCH 1/2] Update test hashes --- tests/expected_output.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/expected_output.txt b/tests/expected_output.txt index 7f06b47..3b08cee 100644 --- a/tests/expected_output.txt +++ b/tests/expected_output.txt @@ -10,7 +10,7 @@ a92e50c09cd56970625ac3b74efbddb83b2731bb table li 66950e746590d7f4e9cfe3d1adef42cd0addcf1d table li:last-of-type 0a37d612cd4c67a42bd147b1edc5a1128456b017 table a[title="The Practice of Programming"] 0d3918d54f868f13110262ffbb88cbb0b083057d table a[title="The Practice of Programming"] text{} -ecb542a30fc75c71a0c6380692cbbc4266ccbce4 json{} +199188dc8f1522426a628e41d96264bffb8beb0f json{} 95ef88ded9dab22ee3206cca47b9c3a376274bda text{} e4f7358fbb7bb1748a296fa2a7e815fa7de0a08b .after-portlet da39a3ee5e6b4b0d3255bfef95601890afd80709 .after @@ -34,7 +34,7 @@ d314e83b059bb876b0e5ee76aa92d54987961f9a .navbox-list li:nth-last-child(1) 613bf65ac4042b6ee0a7a47f08732fdbe1b5b06b #toc da39a3ee5e6b4b0d3255bfef95601890afd80709 #toc li + a da39a3ee5e6b4b0d3255bfef95601890afd80709 #toc li + a text{} -97d170e1550eee4afc0af065b78cda302a97674c #toc li + a json{} +cd0d4cc32346750408f7d4f5e78ec9a6e5b79a0d #toc li + a json{} da39a3ee5e6b4b0d3255bfef95601890afd80709 #toc li + a + span da39a3ee5e6b4b0d3255bfef95601890afd80709 #toc li + span da39a3ee5e6b4b0d3255bfef95601890afd80709 #toc li > li From f811b2e55a5d8c5c0fceda11dc6696039854ae40 Mon Sep 17 00:00:00 2001 From: Andre Marianiello Date: Sat, 23 Feb 2019 14:48:31 -0500 Subject: [PATCH 2/2] Allow selectors to work with unknown tags See https://godoc.org/golang.org/x/net/html#Node for more information --- display.go | 2 +- selector.go | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/display.go b/display.go index 0be946c..8fffd82 100644 --- a/display.go +++ b/display.go @@ -272,7 +272,7 @@ func jsonify(node *html.Node) map[string]interface{} { } } } - vals["tag"] = node.DataAtom.String() + vals["tag"] = node.Data children := []interface{}{} for child := node.FirstChild; child != nil; child = child.NextSibling { switch child.Type { diff --git a/selector.go b/selector.go index 6249f77..693430e 100644 --- a/selector.go +++ b/selector.go @@ -86,7 +86,7 @@ func (s CSSSelector) Match(node *html.Node) bool { return false } if s.Tag != "" { - if s.Tag != node.DataAtom.String() { + if s.Tag != node.Data { return false } }