五一快乐，隔离一时爽，一直隔离一直爽

QuinnDK · May 2, 2020 · e2b9f78 · e2b9f78
1 parent 8523b7c
commit e2b9f78
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 7 deletions.
diff --git a/main.go b/main.go
@@ -7,8 +7,8 @@ import (
 
 func main() {
 	engine.Run(engine.Request{
-		Url:       "https://book.douban.com/subject/34907964/",
-		ParseFunc: parse.ParseBookDetail,
+		Url:       "https://book.douban.com",
+		ParseFunc: parse.ParseTag,
 	})
 
 	//result, _ := fetcher.Fetch("https://book.douban.com")

diff --git a/model/bookdetails.go b/model/bookdetails.go
@@ -13,5 +13,5 @@ type Bookdetail struct {
 }
 
 func (b Bookdetail) String() string {
-	return "书名: " + b.Title + " 作者: " + b.Author + " 出版社:" + b.Public + " 页数: " + strconv.Itoa(b.Booktages) + "  价格: " + b.Price + " 评分:" + b.Score + " 内容简介:" + b.Into
+	return "书名: " + b.Title + " 作者: " + b.Author + " 出版社:" + b.Public + " 页数: " + strconv.Itoa(b.Booktages) + "  价格: " + b.Price + " 评分:" + b.Score + " \n内容简介:" + b.Into
 }
diff --git a/parse/booklist.go b/parse/booklist.go
@@ -18,10 +18,14 @@ func ParseBookList(contents []byte) engine.ParseResult {
 	result := engine.ParseResult{}
 
 	for _, m := range matches {
+
+		bookname := string(m[2])
 		result.Items = append(result.Items, string(m[2]))
 		result.Requesrts = append(result.Requesrts, engine.Request{
-			Url:       string(m[1]),
-			ParseFunc: engine.NilParse,
+			Url: string(m[1]),
+			ParseFunc: func(c []byte) engine.ParseResult {
+				return ParseBookDetail(c, bookname)
+			},
 		})
 
 	}

diff --git a/parse/parsebookdetail.go b/parse/parsebookdetail.go
@@ -15,7 +15,7 @@ var priceRe = regexp.MustCompile(`<span class="pl">定价:</span> ([^<]+)<br/>`)
 var scoreRe = regexp.MustCompile(`<strong class="ll rating_num " property="v:average">([^<]+ )</strong>`)
 var intoRe = regexp.MustCompile(`<div class="intro">[\d\D]*?<p>([^<]+)</p>[\d\D]*?<p>([^<]+)</p></div>`)
 
-func ParseBookDetail(contents []byte) engine.ParseResult {
+func ParseBookDetail(contents []byte, bookname string) engine.ParseResult {
 
 	bookedetail := model.Bookdetail{}
 

diff --git a/parse/parsetag.go b/parse/parsetag.go
@@ -18,7 +18,7 @@ func ParseTag(content []byte) engine.ParseResult {
 		result.Items = append(result.Items, m[2])
 		result.Requesrts = append(result.Requesrts, engine.Request{
 			Url:       "https://book.douban.com" + string(m[1]),
-			ParseFunc: engine.NilParse,
+			ParseFunc: ParseBookList,
 		})
 	}