继续优化emojimix存储占用

Author: Azusa-Yuan

plugin/emojimix/emoji_test.go

@@ -1,7 +1,7 @@
 package emojimix
 
 import (
-	emoji_map "MiniBot/plugin/emojimix/proto"
+	"encoding/json"
 	"fmt"
 	"io"
 	"net/http"
@@ -13,7 +13,6 @@ import (
 	emoji "github.com/Andrew-M-C/go.emoji"
 	"github.com/rs/zerolog/log"
 	"github.com/tidwall/gjson"
-	"google.golang.org/protobuf/proto"
 )
 
 func TestUnicode(t *testing.T) {
@@ -45,35 +44,28 @@ func TestGenerateMap(t *testing.T) {
 	}
 
 	datas := gjson.ParseBytes(body).Get("data").Map()
-	outer := &emoji_map.OuterMap{OuterMap: map[string]*emoji_map.InnerMap{}}
+	keyMap := map[string]string{}
 
 	for _, data := range datas {
 		collections := data.Get("combinations").Map()
-		cur := data.Get("emoji").String()
-		outer.OuterMap[cur] = &emoji_map.InnerMap{InnerMap: map[string]string{}}
 		for _, endData := range collections {
 			// 只取第一个
 			emojiFirst := endData.Array()[0]
-			leftEmoji := emojiFirst.Get("leftEmoji").String()
-			rightEmoji := emojiFirst.Get("rightEmoji").String()
-			if cur != leftEmoji {
-				leftEmoji, rightEmoji = rightEmoji, leftEmoji
-			}
-			outer.OuterMap[leftEmoji].InnerMap[rightEmoji] = strings.TrimLeft(emojiFirst.Get("gStaticUrl").String(), base_url)
+			addValue(keyMap, emojiFirst.Get("leftEmoji").String(), emojiFirst.Get("rightEmoji").String(),
+				strings.TrimLeft(emojiFirst.Get("gStaticUrl").String(), base_url))
 		}
 	}
-	outFile, err := os.Create(filepath.Join(dataPath, "outer_map.bin"))
+	outFile, err := os.Create(filepath.Join(dataPath, "key_map.json"))
 	if err != nil {
 		log.Error().Err(err).Msg("")
 		return
 	}
 	defer outFile.Close()
 
-	data, err := proto.Marshal(outer)
+	data, err := json.MarshalIndent(&keyMap, "", " ")
 	if err != nil {
 		log.Error().Err(err).Msg("")
 		return
 	}
 	outFile.Write(data)
-
 }

plugin/emojimix/map.proto

@@ -2,8 +2,8 @@
 package emojimix
 
 import (
-	emoji_map "MiniBot/plugin/emojimix/proto"
 	"MiniBot/utils/path"
+	"encoding/json"
 	"os"
 	"path/filepath"
 	"strconv"
@@ -14,22 +14,19 @@ import (
 
 	emoji "github.com/Andrew-M-C/go.emoji"
 	"github.com/rs/zerolog/log"
-	"google.golang.org/protobuf/proto"
 )
 
-var emojiMap = emoji_map.OuterMap{OuterMap: map[string]*emoji_map.InnerMap{}}
+var emojiMap = map[string]string{}
 var pluginName = "emojimix"
 var dataPath = path.GetPluginDataPath()
 
-// const bed = "https://www.gstatic.com/android/keyboard/emojikitchen/%d/u%x/u%x_u%x.png"
-
 func init() {
-	data, err := os.ReadFile(filepath.Join(dataPath, "outer_map.bin"))
+	data, err := os.ReadFile(filepath.Join(dataPath, "key_map.json"))
 	if err != nil {
 		log.Error().Err(err).Str("name", pluginName).Msg("")
 		return
 	}
-	if err := proto.Unmarshal(data, &emojiMap); err != nil {
+	if err := json.Unmarshal(data, &emojiMap); err != nil {
 		log.Error().Err(err).Str("name", pluginName)
 		return
 	}
@@ -70,11 +67,10 @@ func match(ctx *zero.Ctx) bool {
 }
 
 func setUrl(i string, j string, ctx *zero.Ctx) bool {
-	if interMap, ok := emojiMap.OuterMap[i]; ok {
-		if url, ok := interMap.InnerMap[j]; ok {
-			ctx.State["emojimix"] = url
-			return true
-		}
+	url := getValue(emojiMap, i, j)
+	if url != "" {
+		ctx.State["emojimix"] = url
+		return true
 	}
 	return false
 }

plugin/emojimix/mix.go

@@ -0,0 +1,29 @@
+package emojimix
+
+import "fmt"
+
+type KeyPair struct {
+	Key1 string
+	Key2 string
+}
+
+// 实现接口，以便可以用作 map 的键
+func (k KeyPair) String() string {
+	// 确保 Key1 和 Key2 的顺序不影响组合键的唯一性
+	if k.Key1 < k.Key2 {
+		return fmt.Sprintf("%s|%s", k.Key1, k.Key2)
+	}
+	return fmt.Sprintf("%s|%s", k.Key2, k.Key1)
+}
+
+// 添加值的函数
+func addValue(data map[string]string, key1 string, key2 string, value string) {
+	pair := KeyPair{key1, key2}
+	data[pair.String()] = value
+}
+
+// 获取值的函数
+func getValue(data map[string]string, key1 string, key2 string) string {
+	pair := KeyPair{key1, key2}
+	return data[pair.String()]
+}