⚡️ 🎨 🔥 优化代码结构

plugin_book_review/book_review.go

@@ -5,20 +5,38 @@ import (
 	log "github.com/sirupsen/logrus"
 	zero "github.com/wdvxdr1123/ZeroBot"
 	"github.com/wdvxdr1123/ZeroBot/message"
-	"github.com/wdvxdr1123/ZeroBot/utils/helper"
 
+	"github.com/FloatTech/zbputils/binary"
 	"github.com/FloatTech/zbputils/control"
-	"github.com/FloatTech/zbputils/img/text"
-
 	"github.com/FloatTech/zbputils/control/order"
+	"github.com/FloatTech/zbputils/file"
+	"github.com/FloatTech/zbputils/img/text"
 )
 
 func init() {
 	engine := control.Register("bookreview", order.AcquirePrio(), &control.Options{
 		DisableOnDefault: false,
 		Help:             "哀伤雪刃推书记录\n- 书评[xxx]\n- 随机书评",
+		PublicDataFolder: "BookReview",
 	})
 
+	go func() {
+		dbpath := engine.DataFolder()
+		db.DBPath = dbpath + "bookreview.db"
+		defer order.DoneOnExit()()
+		// os.RemoveAll(dbpath)
+		_, _ = file.GetLazyData(db.DBPath, false, true)
+		err := db.Create("bookreview", &book{})
+		if err != nil {
+			panic(err)
+		}
+		n, err := db.Count("bookreview")
+		if err != nil {
+			panic(err)
+		}
+		log.Printf("[bookreview]读取%d条书评", n)
+	}()
+
 	// 中文、英文、数字但不包括下划线等符号
 	engine.OnRegex("^书评([\u4E00-\u9FA5A-Za-z0-9]{1,25})$").SetBlock(true).
 		Handle(func(ctx *zero.Ctx) {
@@ -27,7 +45,7 @@ func init() {
 			if err != nil {
 				log.Println("err:", err)
 			}
-			if id := ctx.SendChain(message.Image("base64://" + helper.BytesToString(data))); id.ID() == 0 {
+			if id := ctx.SendChain(message.Image("base64://" + binary.BytesToString(data))); id.ID() == 0 {
 				ctx.SendChain(message.Text("ERROR: 可能被风控了"))
 			}
 		})
@@ -39,7 +57,7 @@ func init() {
 			if err != nil {
 				log.Println("err:", err)
 			}
-			if id := ctx.SendChain(message.Image("base64://" + helper.BytesToString(data))); id.ID() == 0 {
+			if id := ctx.SendChain(message.Image("base64://" + binary.BytesToString(data))); id.ID() == 0 {
 				ctx.SendChain(message.Text("ERROR: 可能被风控了"))
 			}
 		})

plugin_book_review/data.go

@@ -1,38 +0,0 @@
-package bookreview
-
-import (
-	"os"
-
-	log "github.com/sirupsen/logrus"
-
-	sql "github.com/FloatTech/sqlite"
-	"github.com/FloatTech/zbputils/file"
-	"github.com/FloatTech/zbputils/process"
-
-	"github.com/FloatTech/zbputils/control/order"
-)
-
-const dbpath = "data/BookReview/"
-const dbfile = dbpath + "bookreview.db"
-
-var db = &sql.Sqlite{DBPath: dbfile}
-
-// 加载数据库
-func init() {
-	go func() {
-		defer order.DoneOnExit()()
-		process.SleepAbout1sTo2s()
-		// os.RemoveAll(dbpath)
-		_ = os.MkdirAll(dbpath, 0755)
-		_, _ = file.GetLazyData(dbfile, false, true)
-		err := db.Create("bookreview", &book{})
-		if err != nil {
-			panic(err)
-		}
-		n, err := db.Count("bookreview")
-		if err != nil {
-			panic(err)
-		}
-		log.Printf("[bookreview]读取%d条书评", n)
-	}()
-}

plugin_book_review/model.go

@@ -1,10 +1,14 @@
 package bookreview
 
+import sql "github.com/FloatTech/sqlite"
+
 type book struct {
 	ID         uint64 `db:"id"`
 	BookReview string `db:"bookreview"`
 }
 
+var db = &sql.Sqlite{}
+
 // 暂时随机选择一个书评
 func getBookReviewByKeyword(keyword string) (b book) {
 	_ = db.Find("bookreview", &b, "where bookreview LIKE '%"+keyword+"%'")