⚡️ 🎨 🔥 优化代码结构

plugin_reborn/born.go

@@ -4,7 +4,13 @@ import (
 	wr "github.com/mroth/weightedrand"
 )
 
+type rate []struct {
+	Name   string  `json:"name"`
+	Weight float64 `json:"weight"`
+}
+
 var (
+	areac     *wr.Chooser
 	gender, _ = wr.NewChooser(
 		wr.Choice{Item: "男孩子", Weight: 50707},
 		wr.Choice{Item: "女孩子", Weight: 48292},

plugin_reborn/load.go

@@ -2,59 +2,12 @@ package reborn
 
 import (
 	"encoding/json"
-	"os"
-
-	wr "github.com/mroth/weightedrand"
-	log "github.com/sirupsen/logrus"
 
 	"github.com/FloatTech/zbputils/file"
-	"github.com/FloatTech/zbputils/process"
-
-	"github.com/FloatTech/zbputils/control/order"
 )
 
-const (
-	datapath = "data/Reborn"
-	jsonfile = datapath + "/rate.json"
-)
-
-type rate []struct {
-	Name   string  `json:"name"`
-	Weight float64 `json:"weight"`
-}
-
-var (
-	areac *wr.Chooser
-)
-
-func init() {
-	go func() {
-		defer order.DoneOnExit()()
-		process.SleepAbout1sTo2s()
-		err := os.MkdirAll(datapath, 0755)
-		if err != nil {
-			panic(err)
-		}
-		area := make(rate, 226)
-		err = load(&area)
-		if err != nil {
-			panic(err)
-		}
-		choices := make([]wr.Choice, len(area))
-		for i, a := range area {
-			choices[i].Item = a.Name
-			choices[i].Weight = uint(a.Weight * 1e9)
-		}
-		areac, err = wr.NewChooser(choices...)
-		if err != nil {
-			panic(err)
-		}
-		log.Printf("[Reborn]读取%d个国家/地区", len(area))
-	}()
-}
-
 // load 加载rate数据
-func load(area *rate) error {
+func load(area *rate, jsonfile string) error {
 	data, err := file.GetLazyData(jsonfile, true, true)
 	if err != nil {
 		return err

plugin_reborn/main.go

@@ -4,9 +4,10 @@ package reborn
 import (
 	"fmt"
 	"math/rand"
-	"time"
 
 	control "github.com/FloatTech/zbputils/control"
+	wr "github.com/mroth/weightedrand"
+	"github.com/sirupsen/logrus"
 	zero "github.com/wdvxdr1123/ZeroBot"
 	"github.com/wdvxdr1123/ZeroBot/message"
 
@@ -14,11 +15,32 @@ import (
 )
 
 func init() {
-	rand.Seed(time.Now().UnixNano())
-	control.Register("reborn", order.AcquirePrio(), &control.Options{
+	en := control.Register("reborn", order.AcquirePrio(), &control.Options{
 		DisableOnDefault: false,
 		Help:             "投胎\n- reborn",
-	}).OnFullMatch("reborn").SetBlock(true).
+		PublicDataFolder: "Reborn",
+	})
+	go func() {
+		datapath := en.DataFolder()
+		jsonfile := datapath + "rate.json"
+		defer order.DoneOnExit()()
+		area := make(rate, 226)
+		err := load(&area, jsonfile)
+		if err != nil {
+			panic(err)
+		}
+		choices := make([]wr.Choice, len(area))
+		for i, a := range area {
+			choices[i].Item = a.Name
+			choices[i].Weight = uint(a.Weight * 1e9)
+		}
+		areac, err = wr.NewChooser(choices...)
+		if err != nil {
+			panic(err)
+		}
+		logrus.Printf("[Reborn]读取%d个国家/地区", len(area))
+	}()
+	en.OnFullMatch("reborn").SetBlock(true).
 		Handle(func(ctx *zero.Ctx) {
 			if rand.Int31() > 1<<27 {
 				ctx.SendChain(message.At(ctx.Event.UserID), message.Text(fmt.Sprintf("投胎成功！\n您出生在 %s, 是 %s。", randcoun(), randgen())))