From ef891ea23dc99fe69408af3947553eb8814a0a71 Mon Sep 17 00:00:00 2001
From: tarsin <yuanqingxiang233@163.com>
Date: Sat, 1 Jul 2023 11:29:10 +0800
Subject: [PATCH] Cleanup EhFilter

---
 .../com/hippo/ehviewer/client/EhFilter.kt     | 34 ++++---------------
 1 file changed, 6 insertions(+), 28 deletions(-)

diff --git a/app/src/main/java/com/hippo/ehviewer/client/EhFilter.kt b/app/src/main/java/com/hippo/ehviewer/client/EhFilter.kt
index d316b8451..74e98b073 100644
--- a/app/src/main/java/com/hippo/ehviewer/client/EhFilter.kt
+++ b/app/src/main/java/com/hippo/ehviewer/client/EhFilter.kt
@@ -15,7 +15,6 @@
  */
 package com.hippo.ehviewer.client
 
-import android.util.Log
 import androidx.compose.runtime.mutableStateListOf
 import arrow.core.memoize
 import com.hippo.ehviewer.EhDB
@@ -39,7 +38,6 @@ object EhFilter {
     const val MODE_TAG_NAMESPACE = 3
     const val MODE_COMMENTER = 4
     const val MODE_COMMENT = 5
-    private const val TAG = "EhFilter"
 
     init {
         EhDB.allFilter.forEach(::memorizeFilter)
@@ -47,39 +45,19 @@ object EhFilter {
 
     private fun memorizeFilter(filter: Filter) {
         when (filter.mode) {
-            MODE_TITLE -> {
-                filter.text = filter.text.lowercase()
-                titleFilterList.add(filter)
-            }
-
-            MODE_TAG -> {
-                filter.text = filter.text.lowercase()
-                tagFilterList.add(filter)
-            }
-
-            MODE_TAG_NAMESPACE -> {
-                filter.text = filter.text.lowercase()
-                tagNamespaceFilterList.add(filter)
-            }
-
+            MODE_TITLE -> titleFilterList.add(filter.apply { text = text.lowercase() })
+            MODE_TAG -> tagFilterList.add(filter.apply { text = text.lowercase() })
+            MODE_TAG_NAMESPACE -> tagNamespaceFilterList.add(filter.apply { text = text.lowercase() })
             MODE_UPLOADER -> uploaderFilterList.add(filter)
             MODE_COMMENTER -> commenterFilterList.add(filter)
             MODE_COMMENT -> commentFilterList.add(filter)
-            else -> Log.d(TAG, "Unknown mode: " + filter.mode)
+            else -> error("Unknown mode: " + filter.mode)
         }
     }
 
-    @Synchronized
-    fun addFilter(filter: Filter): Boolean {
-        filter.enable = true
-        if (!EhDB.addFilter(filter)) return false
-        memorizeFilter(filter)
-        return true
-    }
-
+    fun addFilter(filter: Filter) = EhDB.addFilter(filter).also { if (it) memorizeFilter(filter) }
     fun triggerFilter(filter: Filter) = EhDB.triggerFilter(filter)
 
-    @Synchronized
     fun deleteFilter(filter: Filter) {
         EhDB.deleteFilter(filter)
         when (filter.mode) {
@@ -89,7 +67,7 @@ object EhFilter {
             MODE_UPLOADER -> uploaderFilterList.remove(filter)
             MODE_COMMENTER -> commenterFilterList.remove(filter)
             MODE_COMMENT -> commentFilterList.remove(filter)
-            else -> Log.d(TAG, "Unknown mode: " + filter.mode)
+            else -> error("Unknown mode: " + filter.mode)
         }
     }