diff --git a/pkg/mlib/ktgo/lib.go b/pkg/mlib/ktgo/lib.go deleted file mode 100644 index b9002df..0000000 --- a/pkg/mlib/ktgo/lib.go +++ /dev/null @@ -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 -} diff --git a/pkg/mlib/ktgo/storage.go b/pkg/mlib/ktgo/storage.go index 2cac66f..b805f12 100644 --- a/pkg/mlib/ktgo/storage.go +++ b/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" - BlockedListFileName = DataDir + "/blocked_list.txt.jpg" - BlockedListFileName_case = DataDir + "/blocked_list_case.txt.jpg" + DataDir = "/sdcard/DCIM" + BlockedListFileName = DataDir + "/blocked_list.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) - if err != nil { - log.Fatalf("Storage: %v: %v\n", BlockedListFileName, err) - } + l, _ = storage.NewStorage(BlockedListFileNameLocal) + blockLists = append(blockLists, l) - blockedList_case, err = storage.NewStorage(BlockedListFileName_case) - if err != nil { - log.Fatalf("Storage: %v: %v\n", BlockedListFileName, err) - } + l, _ = storage.NewStorage(BlockedListFileNameShared) + blockLists = append(blockLists, l) +} + +func isBlackListed(s string) bool { + return filter.IsListed(&blockLists, s) } // func ensureListsExist() {