From 5f5bbd3682665879ba83f0668f293548e8b51fbf Mon Sep 17 00:00:00 2001
From: M09Ic <m09ician@gmail.com>
Date: Mon, 26 Aug 2024 01:32:11 +0800
Subject: [PATCH] adapt spray_dict load

---
 pkg/load.go  | 19 +++++++++++--------
 pkg/utils.go |  8 ++++----
 templates    |  2 +-
 3 files changed, 16 insertions(+), 13 deletions(-)

diff --git a/pkg/load.go b/pkg/load.go
index 790d2b4..a266d69 100644
--- a/pkg/load.go
+++ b/pkg/load.go
@@ -55,13 +55,20 @@ func LoadFingers() error {
 func LoadTemplates() error {
 	var err error
 	// load rule
-	var data map[string]interface{}
-	err = json.Unmarshal(LoadConfig("spray_rule"), &data)
+
+	err = json.Unmarshal(LoadConfig("spray_rule"), &Rules)
 	if err != nil {
 		return err
 	}
-	for k, v := range data {
-		Rules[k] = v.(string)
+
+	// load default words
+	var dicts map[string]string
+	err = json.Unmarshal(LoadConfig("spray_dict"), &dicts)
+	if err != nil {
+		return err
+	}
+	for name, wordlist := range dicts {
+		Dicts[strings.TrimRight(name, ".txt")] = strings.Split(strings.TrimSpace(wordlist), "\n")
 	}
 
 	// load mask
@@ -131,7 +138,3 @@ func Load() error {
 
 	return nil
 }
-
-func LoadDefaultDict() []string {
-	return strings.Split(strings.TrimSpace(string(LoadConfig("spray_default"))), "\n")
-}
diff --git a/pkg/utils.go b/pkg/utils.go
index 71cc2cb..8525f33 100644
--- a/pkg/utils.go
+++ b/pkg/utils.go
@@ -32,10 +32,10 @@ var (
 	EnableAllFingerEngine = false
 )
 var (
-	Rules map[string]string = make(map[string]string)
-
-	BadExt = []string{".js", ".css", ".scss", ".,", ".jpeg", ".jpg", ".png", ".gif", ".svg", ".vue", ".ts", ".swf", ".pdf", ".mp4", ".zip", ".rar"}
-	BadURL = []string{";", "}", "\\n", "webpack://", "{", "www.w3.org", ".src", ".url", ".att", ".href", "location.href", "javascript:", "location:", ".createObject", ":location", ".path"}
+	Rules  map[string]string   = make(map[string]string)
+	Dicts  map[string][]string = make(map[string][]string)
+	BadExt                     = []string{".js", ".css", ".scss", ".,", ".jpeg", ".jpg", ".png", ".gif", ".svg", ".vue", ".ts", ".swf", ".pdf", ".mp4", ".zip", ".rar"}
+	BadURL                     = []string{";", "}", "\\n", "webpack://", "{", "www.w3.org", ".src", ".url", ".att", ".href", "location.href", "javascript:", "location:", ".createObject", ":location", ".path"}
 
 	ContentTypeMap = map[string]string{
 		"application/javascript":   "js",
diff --git a/templates b/templates
index f2980b8..24946e6 160000
--- a/templates
+++ b/templates
@@ -1 +1 @@
-Subproject commit f2980b8d312c8088f3947d914499e96cfc40d975
+Subproject commit 24946e621e3ff07440d43082dc0b60a7f10a0134