TextHasPrefix; ContainsText => TextContains; EqualText => TextEqual

goplus · Oct 5, 2021 · d48967b · d48967b
1 parent 771d160
commit d48967b
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 5 deletions.
diff --git a/hdq_helper.go b/hdq_helper.go
@@ -53,20 +53,27 @@ func (p NodeSet) ChildEqualText(text string) (ret NodeSet) {
 	})
 }
 
-// EqualText returns NodeSet which node type is TextNode and it's text equals `text`.
-func (p NodeSet) EqualText(text string) (ret NodeSet) {
+// TextEqual returns NodeSet which node type is TextNode and it's text equals `text`.
+func (p NodeSet) TextEqual(text string) (ret NodeSet) {
 	return p.Match(func(node *html.Node) bool {
 		return equalText(node, text)
 	})
 }
 
-// ContainsText returns NodeSet which node type is TextNode and it's text contains `text`.
-func (p NodeSet) ContainsText(text string) (ret NodeSet) {
+// TextContains returns NodeSet which node type is TextNode and it's text contains `text`.
+func (p NodeSet) TextContains(text string) (ret NodeSet) {
 	return p.Match(func(node *html.Node) bool {
 		return containsText(node, text)
 	})
 }
 
+// TextHasPrefix returns NodeSet which node type is TextNode and its prefix is `text`.
+func (p NodeSet) TextHasPrefix(text string) (ret NodeSet) {
+	return p.Match(func(node *html.Node) bool {
+		return hasPrefixText(node, text)
+	})
+}
+
 func (p NodeSet) dataAtom(elem atom.Atom) (ret NodeSet) {
 	return p.Match(func(node *html.Node) bool {
 		return node.DataAtom == elem

diff --git a/html_utils.go b/html_utils.go
@@ -97,6 +97,14 @@ func containsText(node *html.Node, text string) bool {
 	return strings.Contains(node.Data, text)
 }
 
+// hasPrefixText returns true if the type of node is TextNode and its Data has prefix `text`.
+func hasPrefixText(node *html.Node, text string) bool {
+	if node.Type != html.TextNode {
+		return false
+	}
+	return strings.Contains(strings.TrimLeft(node.Data, " \t\r\n"), text)
+}
+
 // exactText returns text of node if the type of node is TextNode.
 func exactText(node *html.Node) (string, error) {
 	if node.Type != html.TextNode {

diff --git a/tutorial/02-GithubRepos/repos.gop b/tutorial/02-GithubRepos/repos.gop
@@ -19,7 +19,7 @@ func newRepo(node hdq.NodeSet) Repo {
 	aRepo := node.any.a.attr("itemprop", "name codeRepository").one
 	repo := aRepo.href!
 	root := aRepo.parentN(3).one
-	forkedFrom := root.any.span.any.containsText("Forked from").one.nextSibling(1).a.href?:""
+	forkedFrom := root.any.span.any.textContains("Forked from").one.nextSibling(1).a.href?:""
 	title := root.any.p.attr("itemprop", "description").text?:""
 	language := root.any.span.attr("itemprop", "programmingLanguage").one.text?:""
 	updateTime := root.any.element("relative-time").one.attr("datetime")?:""