summaryrefslogtreecommitdiffstats
path: root/integrations/html_helper.go
diff options
context:
space:
mode:
authorLauris BH <lauris@nix.lv>2017-05-07 17:40:31 +0300
committerBo-Yi Wu <appleboy.tw@gmail.com>2017-05-07 22:40:31 +0800
commit79494047b062069fd8e692152d29773a22877d76 (patch)
tree59f8f66828e25ee9f9c13f2baf50494e5474bbcd /integrations/html_helper.go
parentc864ccf9b1414dfdae1fd271511853e058b9e7c9 (diff)
downloadgitea-79494047b062069fd8e692152d29773a22877d76.tar.gz
gitea-79494047b062069fd8e692152d29773a22877d76.zip
Show commit status icon in commits table (#1688)
* Show commit status icon in commits table * Add comments * Fix icons * Few more places where commit table is displayed * Change integration test to use goquery for parsing html * Add integration tests for commit table and status icons * Fix status to return lates status correctly on all databases * Rewrote lates commit status selects
Diffstat (limited to 'integrations/html_helper.go')
-rw-r--r--integrations/html_helper.go90
1 files changed, 7 insertions, 83 deletions
diff --git a/integrations/html_helper.go b/integrations/html_helper.go
index db4e2953e6..63f7340c5c 100644
--- a/integrations/html_helper.go
+++ b/integrations/html_helper.go
@@ -7,16 +7,15 @@ package integrations
import (
"bytes"
- "golang.org/x/net/html"
+ "github.com/PuerkitoBio/goquery"
)
type HtmlDoc struct {
- doc *html.Node
- body *html.Node
+ doc *goquery.Document
}
func NewHtmlParser(content []byte) (*HtmlDoc, error) {
- doc, err := html.Parse(bytes.NewReader(content))
+ doc, err := goquery.NewDocumentFromReader(bytes.NewReader(content))
if err != nil {
return nil, err
}
@@ -24,87 +23,12 @@ func NewHtmlParser(content []byte) (*HtmlDoc, error) {
return &HtmlDoc{doc: doc}, nil
}
-func (doc *HtmlDoc) GetBody() *html.Node {
- if doc.body == nil {
- var b *html.Node
- var f func(*html.Node)
- f = func(n *html.Node) {
- if n.Type == html.ElementNode && n.Data == "body" {
- b = n
- return
- }
- for c := n.FirstChild; c != nil; c = c.NextSibling {
- f(c)
- }
- }
- f(doc.doc)
- if b != nil {
- doc.body = b
- } else {
- doc.body = doc.doc
- }
- }
- return doc.body
-}
-
-func (doc *HtmlDoc) GetAttribute(n *html.Node, key string) (string, bool) {
- for _, attr := range n.Attr {
- if attr.Key == key {
- return attr.Val, true
- }
- }
- return "", false
-}
-
-func (doc *HtmlDoc) checkAttr(n *html.Node, attr, val string) bool {
- if n.Type == html.ElementNode {
- s, ok := doc.GetAttribute(n, attr)
- if ok && s == val {
- return true
- }
- }
- return false
-}
-
-func (doc *HtmlDoc) traverse(n *html.Node, attr, val string) *html.Node {
- if doc.checkAttr(n, attr, val) {
- return n
- }
-
- for c := n.FirstChild; c != nil; c = c.NextSibling {
- result := doc.traverse(c, attr, val)
- if result != nil {
- return result
- }
- }
-
- return nil
-}
-
-func (doc *HtmlDoc) GetElementById(id string) *html.Node {
- return doc.traverse(doc.GetBody(), "id", id)
-}
-
func (doc *HtmlDoc) GetInputValueById(id string) string {
- inp := doc.GetElementById(id)
- if inp == nil {
- return ""
- }
-
- val, _ := doc.GetAttribute(inp, "value")
- return val
-}
-
-func (doc *HtmlDoc) GetElementByName(name string) *html.Node {
- return doc.traverse(doc.GetBody(), "name", name)
+ text, _ := doc.doc.Find("#" + id).Attr("value")
+ return text
}
func (doc *HtmlDoc) GetInputValueByName(name string) string {
- inp := doc.GetElementByName(name)
- if inp == nil {
- return ""
- }
-
- val, _ := doc.GetAttribute(inp, "value")
- return val
+ text, _ := doc.doc.Find("input[name=\"" + name + "\"]").Attr("value")
+ return text
}