From d91e6be26961b05b55b5f45c3931ad6b6363fbaf Mon Sep 17 00:00:00 2001
From: eson <eson.hsm@nonolive.com>
Date: Wed, 12 Aug 2020 17:42:27 +0800
Subject: [PATCH] rename api name xml -> html

---
 .../twitcasting_extractor/twitcasting_extractor.go     |  7 +++++--
 .../twitcasting_extractor_test.go                      |  2 +-
 go.mod                                                 |  2 +-
 go.sum                                                 | 10 ++++------
 tasks/twitcasting/twitcasting_task1/twitcasting.go     |  2 +-
 5 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/extractor/twitcasting_extractor/twitcasting_extractor.go b/extractor/twitcasting_extractor/twitcasting_extractor.go
index 0550e6a..6351c3d 100644
--- a/extractor/twitcasting_extractor/twitcasting_extractor.go
+++ b/extractor/twitcasting_extractor/twitcasting_extractor.go
@@ -49,7 +49,7 @@ func main() {
 			continue
 		}
 		var ldata *LiveData
-		etor := extractor.ExtractXml(resp.Content())
+		etor := extractor.ExtractHtml(resp.Content())
 		ldata = etor.GetObjectByTag(LiveData{}).(*LiveData)
 		ldata.MaxViews = regexp.MustCompile("\\d+").FindString(ldata.MaxViews)
 		coincount := 0
@@ -59,11 +59,14 @@ func main() {
 			giverurl := streamer.LiveUrl.String + "/backers/" + strconv.Itoa(i)
 			resp, err = ses.Get(giverurl).Execute()
 			if err != nil {
+				estore.UpdateError(streamer, err)
 				log.Panic(err)
 			}
-			etor := extractor.ExtractXml(resp.Content())
+
+			etor := extractor.ExtractHtml(resp.Content())
 			xp, err := etor.XPaths("//td[@class='tw-memorial-table-recent-point']")
 			if err != nil {
+				estore.UpdateError(streamer, err)
 				log.Panic(err)
 			}
 
diff --git a/extractor/twitcasting_extractor/twitcasting_extractor_test.go b/extractor/twitcasting_extractor/twitcasting_extractor_test.go
index 811b2d3..3ed48ff 100644
--- a/extractor/twitcasting_extractor/twitcasting_extractor_test.go
+++ b/extractor/twitcasting_extractor/twitcasting_extractor_test.go
@@ -10,7 +10,7 @@ import (
 // 	Follower string `exp:".//span[@class='tw-user-nav-list-count']" method:"Text"`
 // }
 
-func TestMain(t *testing.T) {
+func estMain(t *testing.T) {
 	main()
 }
 
diff --git a/go.mod b/go.mod
index 35e0665..4f1e83b 100644
--- a/go.mod
+++ b/go.mod
@@ -3,7 +3,7 @@ module intimate
 go 1.14
 
 require (
-	github.com/474420502/extractor v0.5.2
+	github.com/474420502/extractor v0.7.1
 	github.com/474420502/focus v0.12.0
 	github.com/474420502/gcurl v0.1.2
 	github.com/474420502/hunter v0.3.4
diff --git a/go.sum b/go.sum
index 32dceb6..3e96929 100644
--- a/go.sum
+++ b/go.sum
@@ -2,16 +2,14 @@ cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMT
 cloud.google.com/go v0.34.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw=
 cloud.google.com/go v0.38.0/go.mod h1:990N+gfupTy94rShfmMCWGDn0LpTmnzTp2qbd1dvSRU=
 cloud.google.com/go v0.41.0/go.mod h1:OauMR7DV8fzvZIl2qg6rkaIhD/vmgk4iwEw/h6ercmg=
-github.com/474420502/extractor v0.5.1 h1:A1heJJSYbV9nEaUHfl3/1HYXcsBQfsTzAHikgwg2IF0=
-github.com/474420502/extractor v0.5.1/go.mod h1:vkqsbi7wXPqyi5Q5dchcGjiaWHbgOJOAEcwonBiAs/E=
-github.com/474420502/extractor v0.5.2 h1:ndgrAkxJjQg0Nrbq3AX2/xAnmIJNxSHRFGQ78wEtWj4=
-github.com/474420502/extractor v0.5.2/go.mod h1:vkqsbi7wXPqyi5Q5dchcGjiaWHbgOJOAEcwonBiAs/E=
+github.com/474420502/extractor v0.7.1 h1:Tdbi5s8wfyw8B3CybW0j/vnbBnrBDM0Q0lJl4AYv0fg=
+github.com/474420502/extractor v0.7.1/go.mod h1:92J6QZKstpAKGhv+DibemhQbR/d6lJ+ftyR/ZHmeJ0w=
 github.com/474420502/focus v0.12.0 h1:+icbmj7IEOefvTegHt5EpcHt6WFbe2miIrceUJx2Evo=
 github.com/474420502/focus v0.12.0/go.mod h1:d0PMjtMxFz1a9HIhwyFPkWa+JF+0LgOrEUfd8iZka6s=
 github.com/474420502/gcurl v0.1.2 h1:ON9Yz3IgAdtDlFlHfkAJ3aIEBDxH0RiViPE5ST5ohKg=
 github.com/474420502/gcurl v0.1.2/go.mod h1:hws5q/Ao64bXLLDnldz9VyTQUndTWc/i5DzdEazFfoM=
-github.com/474420502/htmlquery v1.2.4-0.20200810165859-a0e2c521c7c2 h1:4F1tpJ+sEkb3N+XD+Wb9MFiQmOMm3bHp8QUP+BQvkVk=
-github.com/474420502/htmlquery v1.2.4-0.20200810165859-a0e2c521c7c2/go.mod h1:AoSN890esHwNKecV0tCs+W0ele1xgFL1Jqk6UcrdxgU=
+github.com/474420502/htmlquery v1.2.4-0.20200812072201-e871dd09247a h1:E1T6CYQKsUn7fMvNbeKfISjBLfOJjZX4KpWwStT20Kc=
+github.com/474420502/htmlquery v1.2.4-0.20200812072201-e871dd09247a/go.mod h1:AoSN890esHwNKecV0tCs+W0ele1xgFL1Jqk6UcrdxgU=
 github.com/474420502/hunter v0.3.4 h1:fyLAgI84jWe3IcqsISC53j1w3CXI1FERxX//Potns0M=
 github.com/474420502/hunter v0.3.4/go.mod h1:pe4Xr/I+2agvq339vS/OZV+EiHAWtpXQs75rioSW9oA=
 github.com/474420502/requests v1.6.0 h1:f4h4j40eT0P5whhg9LdkotD8CaKjtuDu/vz9iSUkCgY=
diff --git a/tasks/twitcasting/twitcasting_task1/twitcasting.go b/tasks/twitcasting/twitcasting_task1/twitcasting.go
index 58e2cba..89204c2 100644
--- a/tasks/twitcasting/twitcasting_task1/twitcasting.go
+++ b/tasks/twitcasting/twitcasting_task1/twitcasting.go
@@ -58,7 +58,7 @@ func Execute() {
 			// log.Panic(err)
 		}
 
-		etor := extractor.ExtractXml(resp.Content())
+		etor := extractor.ExtractHtml(resp.Content())
 		result, err := etor.XPaths("//p[@class='taglist']/a[contains(@class, 'tag')]/@href")
 		if err != nil {
 			panic(err)