⚡️ 🎨 🔥 优化代码结构

plugin_cpstory/cpstory.go

@@ -4,11 +4,13 @@ package cpstory
 import (
 	"strings"
 
+	"github.com/sirupsen/logrus"
 	zero "github.com/wdvxdr1123/ZeroBot"
 	"github.com/wdvxdr1123/ZeroBot/message"
 
 	control "github.com/FloatTech/zbputils/control"
 	"github.com/FloatTech/zbputils/ctxext"
+	"github.com/FloatTech/zbputils/file"
 	"github.com/FloatTech/zbputils/math"
 
 	"github.com/FloatTech/zbputils/control/order"
@@ -18,7 +20,26 @@ func init() {
 	engine := control.Register("cpstory", order.AcquirePrio(), &control.Options{
 		DisableOnDefault: false,
 		Help:             "cp短打\n- 组cp[@xxx][@xxx]\n- 磕cp大老师 雪乃",
+		PublicDataFolder: "CpStory",
 	})
+
+	go func() {
+		dbpath := engine.DataFolder()
+		db.DBPath = dbpath + "cp.db"
+		defer order.DoneOnExit()()
+		// os.RemoveAll(dbpath)
+		_, _ = file.GetLazyData(db.DBPath, false, true)
+		err := db.Create("cp_story", &cpstory{})
+		if err != nil {
+			panic(err)
+		}
+		n, err := db.Count("cp_story")
+		if err != nil {
+			panic(err)
+		}
+		logrus.Printf("[cpstory]读取%d条故事", n)
+	}()
+
 	engine.OnRegex("^组cp.*?(\\d+).*?(\\d+)", zero.OnlyGroup).SetBlock(true).Handle(func(ctx *zero.Ctx) {
 		cs := getRandomCpStory()
 		gong := ctxext.CardOrNickName(ctx, math.Str2Int64(ctx.State["regex_matched"].([]string)[1]))

plugin_cpstory/data.go

@@ -1,40 +0,0 @@
-package cpstory
-
-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/CpStory/"
-	dbfile = dbpath + "cp.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("cp_story", &cpstory{})
-		if err != nil {
-			panic(err)
-		}
-		n, err := db.Count("cp_story")
-		if err != nil {
-			panic(err)
-		}
-		log.Printf("[cpstory]读取%d条故事", n)
-	}()
-}

plugin_cpstory/model.go

@@ -1,5 +1,7 @@
 package cpstory
 
+import sql "github.com/FloatTech/sqlite"
+
 type cpstory struct {
 	ID    int64  `db:"id"`
 	Gong  string `db:"gong"`
@@ -7,6 +9,8 @@ type cpstory struct {
 	Story string `db:"story"`
 }
 
+var db = &sql.Sqlite{}
+
 func getRandomCpStory() (cs cpstory) {
 	_ = db.Pick("cp_story", &cs)
 	return