Sharedlib: новый фильтр и 2 файла-списка теперь: общий и личный

pkg/sharedlib/lib.go

@@ -1,21 +0,0 @@
-package main
-
-import "strings"
-
-func isBlackListed(s string) bool {
-	for _, b := range *blockedList_case.GetList() {
-		if strings.Contains(s, b) {
-			return true
-		}
-	}
-
-	s_low := strings.ToLower(s)
-	for _, b := range *blockedList.GetList() {
-		b = strings.ToLower(b)
-		if strings.Contains(s_low, b) {
-			return true
-		}
-	}
-
-	return false
-}

pkg/sharedlib/storage.go

@@ -2,31 +2,36 @@ package main
 
 import (
 	"log"
+	"my/ktgo/pkg/filter"
 	"my/ktgo/pkg/storage"
 )
 
 const (
-	DataDir                  = "/data"
-	BlockedListFileName      = DataDir + "/blocked_list.txt"
-	BlockedListFileName_case = DataDir + "/blocked_list_case.txt"
+	DataDir                   = "/data"
+	BlockedListFileName       = DataDir + "/blocked_list.txt"
+	BlockedListFileNameShared = DataDir + "/shared_blocked_list.txt"
 )
 
 var (
-	blockedList, blockedList_case *storage.Storage
+	blockLists []*storage.Storage
 )
 
 func initStorage() {
-	var err error
-
-	blockedList, err = storage.NewStorage(BlockedListFileName)
+	l, err := storage.NewStorage(BlockedListFileName)
 	if err != nil {
 		log.Fatalf("Storage: %v: %v\n", BlockedListFileName, err)
 		return
 	}
+	blockLists = append(blockLists, l)
 
-	blockedList_case, err = storage.NewStorage(BlockedListFileName_case)
+	l, err = storage.NewStorage(BlockedListFileNameShared)
 	if err != nil {
-		log.Fatalf("Storage: %v: %v\n", BlockedListFileName, err)
+		log.Fatalf("Storage: %v: %v\n", BlockedListFileNameShared, err)
 		return
 	}
+	blockLists = append(blockLists, l)
+}
+
+func isBlackListed(s string) bool {
+	return filter.IsListed(&blockLists, s)
 }