Merge branch 'dev' of github.com:TruthHun/BookStack into dev

Author: TruthHun88

models/book.go

@@ -657,3 +657,29 @@ func (n *Book) SearchBook(wd string, page, size int) (books []Book, cnt int, err
 
 	return
 }
+
+// search books with labels
+func (b *Book) SearchBookByLabel(labels []string, limit int, excludeIds []int) (bookIds []int, err error) {
+	bookIds = []int{}
+	if len(labels) == 0 {
+		return
+	}
+
+	rawRegex := strings.Join(labels, "|")
+
+	excludeClause := ""
+	if len(excludeIds) == 1 {
+		excludeClause = fmt.Sprintf("book_id != %d AND", excludeIds[0])
+	} else if len(excludeIds) > 1 {
+		excludeVal := strings.Replace(strings.Trim(fmt.Sprint(excludeIds), "[]"), " ", ",", -1)
+		excludeClause = fmt.Sprintf("book_id NOT IN (%s) AND", excludeVal)
+	}
+
+	sql := fmt.Sprintf("SELECT book_id FROM md_books WHERE %v label REGEXP ? ORDER BY star DESC LIMIT ?", excludeClause)
+	o := orm.NewOrm()
+	_, err = o.Raw(sql, rawRegex, limit).QueryRows(&bookIds)
+	if err != nil {
+		logs.Error("failed to execute sql: %s, err: %s", sql, err.Error())
+	}
+	return
+}

models/releate_book.go

@@ -1,7 +1,7 @@
 package models
 
 import (
-	"fmt"
+	"encoding/json"
 	"strconv"
 	"strings"
 	"time"
@@ -22,22 +22,18 @@ func NewRelateBook() *RelateBook {
 	return &RelateBook{}
 }
 
+// Get the related books for a given book
 func (r *RelateBook) Lists(bookId int, limit ...int) (books []Book) {
+	day, _ := strconv.Atoi(GetOptionValue("RELATE_BOOK", "0"))
+	if day <= 0 {
+		return
+	}
 
 	length := 6
 	if len(limit) > 0 && limit[0] > 0 {
 		length = limit[0]
 	}
 
-	if GetOptionValue("ELASTICSEARCH_ON", "false") != "true" {
-		return
-	}
-
-	day, _ := strconv.Atoi(GetOptionValue("RELATE_BOOK", "0"))
-	if day <= 0 {
-		return
-	}
-
 	var rb RelateBook
 	var ids []int
 
@@ -50,13 +46,13 @@ func (r *RelateBook) Lists(bookId int, limit ...int) (books []Book) {
 	fields := []string{"book_id", "book_name", "cover", "identify"}
 
 	if rb.BookId > 0 && rb.Expire > now {
-		if slice := strings.Split(rb.BookIds, ","); len(slice) > 0 {
-			for _, item := range slice {
-				id, _ := strconv.Atoi(item)
-				if id > 0 && len(ids) < length {
-					ids = append(ids, id)
-				}
-			}
+		bookIds := rb.BookIds
+		if !strings.HasPrefix(bookIds, "[") {
+			bookIds = "[" + bookIds + "]"
+		}
+
+		err := json.Unmarshal([]byte(bookIds), &ids)
+		if err == nil && len(ids) > 0 {
 			books, _ = bookModel.GetBooksById(ids, fields...)
 			return
 		}
@@ -67,36 +63,65 @@ func (r *RelateBook) Lists(bookId int, limit ...int) (books []Book) {
 		return
 	}
 
+	if GetOptionValue("ELASTICSEARCH_ON", "false") == "true" {
+		ids = listByES(book, length)
+	} else {
+		ids = listByDBWithLabel(book, length)
+	}
+
+	books, _ = bookModel.GetBooksById(ids, fields...)
+	rb.BookId = bookId
+	if ids == nil {
+		ids = []int{}
+	}
+	relatedIdBytes, _ := json.Marshal(ids)
+	rb.BookIds = string(relatedIdBytes)
+	rb.Expire = now + day*24*3600
+	if rb.Id > 0 {
+		o.Update(&rb)
+	} else {
+		o.Insert(&rb)
+	}
+	return
+}
+
+// Use ES to get the related books
+func listByES(book *Book, length int) (ids []int) {
 	client := NewElasticSearchClient()
 	client.IsRelateSearch = true
 	client.Timeout = 1 * time.Second
-	wd := book.Label
-	if len(wd) == 0 {
-		wd = book.BookName
+	keyWord := book.Label
+	if len(keyWord) == 0 {
+		keyWord = book.BookName
 	}
-	res, err := client.Search(wd, 1, 12, false)
+	res, err := client.Search(keyWord, 1, 12, false)
 	if err != nil {
 		beego.Error(err.Error())
 		return
 	}
 
-	var bookIds []string
+	bookId := book.BookId
 	for _, item := range res.Hits.Hits {
-		if item.Source.Id != bookId {
-			if len(ids) < length {
-				ids = append(ids, item.Source.Id)
-			}
-			bookIds = append(bookIds, fmt.Sprint(item.Source.Id))
+		if len(ids) >= length {
+			break
+		}
+		if item.Source.Id == bookId {
+			continue
 		}
+		ids = append(ids, item.Source.Id)
 	}
-	books, _ = bookModel.GetBooksById(ids, fields...)
-	rb.BookId = bookId
-	rb.BookIds = strings.Join(bookIds, ",")
-	rb.Expire = now + day*24*3600
-	if rb.Id > 0 {
-		o.Update(&rb)
-	} else {
-		o.Insert(&rb)
+
+	return ids
+}
+
+// Get the related books directly from DB by SQL composed with Labels
+func listByDBWithLabel(book *Book, length int) (ids []int) {
+	rawKeyWords := book.Label
+	if rawKeyWords == "" {
+		return
 	}
+
+	bookModel := NewBook()
+	ids, _ = bookModel.SearchBookByLabel(strings.Split(rawKeyWords, ","), length, []int{book.BookId})
 	return
 }