refactor trie

Tohrusky · Aug 24, 2023 · d514e45 · d514e45
1 parent aabfeb7
commit d514e45
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 7 deletions.
diff --git a/sensitive/filter.go b/sensitive/filter.go
@@ -4,6 +4,7 @@ import (
 	"bufio"
 	"fmt"
 	"github.com/Tohrusky/sensitive-go/sdict"
+	"github.com/Tohrusky/sensitive-go/sensitive/trie"
 	"io"
 	"net/http"
 	"os"
@@ -13,7 +14,7 @@ import (
 
 // Filter 敏感词过滤器
 type Filter struct {
-	trie  *Trie
+	trie  *trie.Trie
 	noise *regexp.Regexp
 }
 
@@ -34,7 +35,7 @@ func NewWithBossSDict() *Filter {
 // New 返回一个敏感词过滤器
 func New() *Filter {
 	return &Filter{
-		trie:  NewTrie(),
+		trie:  trie.NewTrie(),
 		noise: regexp.MustCompile(`[|\s&%$@*！!#^~_—｜'";.。，,?<>《》：:]+`),
 	}
 }

diff --git a/sensitive/filter_test.go b/sensitive/filter_test.go
@@ -2,6 +2,7 @@ package sensitive
 
 import (
 	"fmt"
+	"github.com/Tohrusky/sensitive-go/sensitive/trie"
 	"io"
 	"reflect"
 	"regexp"
@@ -336,7 +337,7 @@ func TestDeleteWord2(t *testing.T) {
 
 func TestFilter_LoadWordDict(t *testing.T) {
 	type fields struct {
-		trie  *Trie
+		trie  *trie.Trie
 		noise *regexp.Regexp
 	}
 	type args struct {
@@ -363,7 +364,7 @@ func TestFilter_LoadWordDict(t *testing.T) {
 
 func TestFilter_LoadNetWordDict(t *testing.T) {
 	type fields struct {
-		trie  *Trie
+		trie  *trie.Trie
 		noise *regexp.Regexp
 	}
 	type args struct {
@@ -390,7 +391,7 @@ func TestFilter_LoadNetWordDict(t *testing.T) {
 
 func TestFilter_Load(t *testing.T) {
 	type fields struct {
-		trie  *Trie
+		trie  *trie.Trie
 		noise *regexp.Regexp
 	}
 	type args struct {

diff --git a/sensitive/trie_tree.go → sensitive/trie/trie_tree.go b/sensitive/trie_tree.go → sensitive/trie/trie_tree.go
@@ -1,4 +1,4 @@
-package sensitive
+package trie
 
 // Trie 短语组成的Trie树.
 type Trie struct {

diff --git a/sensitive/trie_tree_test.go → sensitive/trie/trie_tree_test.go b/sensitive/trie_tree_test.go → sensitive/trie/trie_tree_test.go
@@ -1,4 +1,4 @@
-package sensitive
+package trie
 
 import (
 	"testing"