feat(subscribe): optimze performance

bot/service.go

@@ -10,9 +10,15 @@ import (
 func registFeed(chat *telebot.Chat, url string) {
 	msg, _ := B.Send(chat, "处理中...")
 
-	source, _ := model.FindOrNewSourceByUrl(url)
-	err := model.RegistFeed(chat.ID, source.ID)
-	log.Printf("%d subscribe %s %s", chat.ID, source.Title, source.Link)
+	source, err := model.FindOrNewSourceByUrl(url)
+
+	if err != nil {
+		msg, _ = B.Edit(msg, fmt.Sprintf("%s，订阅失败", err))
+		return
+	}
+
+	err = model.RegistFeed(chat.ID, source.ID)
+	log.Printf("%d subscribe [%d]%s %s", chat.ID, source.ID, source.Title, source.Link)
 
 	if err == nil {
 		msg, _ = B.Edit(msg, fmt.Sprintf("<%s> 订阅成功", source.Title))

model/source.go

@@ -1,6 +1,7 @@
 package model
 
 import (
+	"errors"
 	"github.com/SlyMarbo/rss"
 	"log"
 )
@@ -15,11 +16,13 @@ type Source struct {
 }
 
 func (s *Source) appendContents(items []*rss.Item) error {
+	db := getConnect()
+	defer db.Close()
 	for _, item := range items {
 		c, _ := getContentByFeedItem(s, item)
 		s.Content = append(s.Content, c)
 	}
-
+	db.Save(&s)
 	return nil
 }
 
@@ -48,17 +51,16 @@ func FindOrNewSourceByUrl(url string) (*Source, error) {
 			// parsing task
 			feed, err := rss.Fetch(url)
 			if err != nil {
-				log.Println("Unable to make request: ", err)
-				return nil, err
+				return nil, errors.New("Feed 抓取错误")
 			}
 
 			source.Title = feed.Title
 			source.ErrorCount = 0
 
 			// Get contents and insert
 			items := feed.Items
-			source.appendContents(items)
 			db.Create(&source)
+			go source.appendContents(items)
 			return &source, nil
 		}
 		return nil, err