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

pkg/mlib/ktgo/lib.go

@@ -1,23 +0,0 @@
-package ktgo
-
-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/mlib/ktgo/storage.go

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