🎨 优化代码结构

plugin/bilibili/info.go

@@ -146,19 +146,21 @@ func init() {
 				}
 			}
 			facePath := cachePath + id + "vupFace.png"
-			initFacePic(facePath, u.Face)
+			err = initFacePic(facePath, u.Face)
+			if err != nil {
+				ctx.SendChain(message.Text("ERROR:", err))
+				return
+			}
 			var backX int
 			var backY int
 			back, err := gg.LoadImage(facePath)
 			if err != nil {
 				ctx.SendChain(message.Text("ERROR:", err))
-				backX = 500
-				backY = 500
-			} else {
-				back = img.Limit(back, 500, 500)
-				backX = back.Bounds().Size().X
-				backY = back.Bounds().Size().Y
+				return
 			}
+			back = img.Limit(back, 500, 500)
+			backX = back.Bounds().Size().X
+			backY = back.Bounds().Size().Y
 			if len(vups) > 50 {
 				ctx.SendChain(message.Text(u.Name + "关注的up主太多了，只展示前50个up"))
 				vups = vups[:50]
@@ -264,22 +266,27 @@ func init() {
 	engine.OnFullMatch("更新vup", zero.SuperUserPermission).SetBlock(true).
 		Handle(func(ctx *zero.Ctx) {
 			ctx.SendChain(message.Text("少女祈祷中..."))
-			updateVup()
+			err := updateVup()
+			if err != nil {
+				ctx.SendChain(message.Text("ERROR:", err))
+				return
+			}
 			ctx.SendChain(message.Text("vup已更新"))
 		})
 }
 
-func initFacePic(filename, faceURL string) {
+func initFacePic(filename, faceURL string) error {
 	if file.IsNotExist(filename) {
 		data, err := web.GetData(faceURL)
 		if err != nil {
-			log.Errorln("[bilibili]", err)
+			return err
 		}
 		err = os.WriteFile(filename, data, 0666)
 		if err != nil {
-			log.Errorln("[bilibili]", err)
+			return err
 		}
 	}
+	return nil
 }
 
 func int2rbg(t int64) (int64, int64, int64) {

plugin/bilibili/model.go

@@ -7,7 +7,6 @@ import (
 	"github.com/FloatTech/zbputils/web"
 	_ "github.com/fumiama/sqlite3" // use sql
 	"github.com/jinzhu/gorm"
-	log "github.com/sirupsen/logrus"
 	"github.com/tidwall/gjson"
 )
 
@@ -84,11 +83,11 @@ func (vdb *vupdb) filterVup(ids []int64) (vups []vup, err error) {
 	return
 }
 
-func updateVup() {
+func updateVup() error {
 	for _, v := range vtbURLs {
 		data, err := web.GetData(v)
 		if err != nil {
-			log.Errorln("[bilibili]:", err)
+			return err
 		}
 		gjson.Get(binary.BytesToString(data), "@this").ForEach(func(key, value gjson.Result) bool {
 			mid := value.Get("mid").Int()
@@ -96,11 +95,15 @@ func updateVup() {
 			roomid := value.Get("roomid").Int()
 			err = vdb.insertVupByMid(mid, uname, roomid)
 			if err != nil {
-				log.Errorln("[bilibili]:", err)
+				return false
 			}
 			return true
 		})
+		if err != nil {
+			return err
+		}
 	}
+	return nil
 }
 
 func (vdb *vupdb) setBilibiliCookie(cookie string) (err error) {