From 184f803b47bbcaa6494be8bcfaa2f43a03f40530 Mon Sep 17 00:00:00 2001
From: Softonik <softonik@ro.ru>
Date: Sat, 2 Mar 2024 04:34:53 +0300
Subject: [PATCH] =?UTF-8?q?Mobilelib:=20=D0=BD=D0=BE=D0=B2=D1=8B=D0=B9=20?=
 =?UTF-8?q?=D1=84=D0=B8=D0=BB=D1=8C=D1=82=D1=80=20=D0=B8=203=20=D1=84?=
 =?UTF-8?q?=D0=B0=D0=B9=D0=BB=D0=B0-=D1=81=D0=BF=D0=B8=D1=81=D0=BA=D0=B0?=
 =?UTF-8?q?=20=D1=82=D0=B5=D0=BF=D0=B5=D1=80=D1=8C:=20=D0=BE=D0=B1=D1=89?=
 =?UTF-8?q?=D0=B8=D0=B9,=20=D0=BB=D0=B8=D1=87=D0=BD=D1=8B=D0=B9=20=D0=B8?=
 =?UTF-8?q?=20=D0=BB=D0=BE=D0=BA=D0=B0=D0=BB=D1=8C=D0=BD=D1=8B=D0=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pkg/mlib/ktgo/lib.go     | 23 -----------------------
 pkg/mlib/ktgo/storage.go | 30 ++++++++++++++++--------------
 2 files changed, 16 insertions(+), 37 deletions(-)
 delete mode 100644 pkg/mlib/ktgo/lib.go

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() {