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

---
 .../com/hippo/ehviewer/client/EhFilter.kt     | 54 ++++---------------
 1 file changed, 11 insertions(+), 43 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 cbbc9543b..6c95e6769 100644
--- a/app/src/main/java/com/hippo/ehviewer/client/EhFilter.kt
+++ b/app/src/main/java/com/hippo/ehviewer/client/EhFilter.kt
@@ -40,7 +40,9 @@ object EhFilter {
     const val MODE_COMMENT = 5
     private const val TAG = "EhFilter"
 
-    init { EhDB.allFilter.forEach(::memorizeFilter) }
+    init {
+        EhDB.allFilter.forEach(::memorizeFilter)
+    }
 
     private fun memorizeFilter(filter: Filter) {
         when (filter.mode) {
@@ -74,10 +76,7 @@ object EhFilter {
         return true
     }
 
-    @Synchronized
-    fun triggerFilter(filter: Filter) {
-        EhDB.triggerFilter(filter)
-    }
+    fun triggerFilter(filter: Filter) = EhDB.triggerFilter(filter)
 
     @Synchronized
     fun deleteFilter(filter: Filter) {
@@ -93,23 +92,6 @@ object EhFilter {
         }
     }
 
-    @Synchronized
-    fun needTags(): Boolean {
-        return 0 != tagFilterList.size || 0 != tagNamespaceFilterList.size
-    }
-
-    @Synchronized
-    fun filterTitle(info: GalleryInfo): Boolean {
-        val title = info.title ?: return false
-        return titleFilterList.any { it.enable!! && it.text!! in title.lowercase() }
-    }
-
-    @Synchronized
-    fun filterUploader(info: GalleryInfo): Boolean {
-        val uploader = info.uploader ?: return false
-        return uploaderFilterList.any { it.enable!! && it.text == uploader }
-    }
-
     private fun spiltTag(tag: String) = tag.run {
         val index = indexOf(':')
         if (index < 0) null to this else substring(0, index) to substring(index + 1)
@@ -125,30 +107,16 @@ object EhFilter {
         }
     }
 
-    @Synchronized
-    fun filterTag(info: GalleryInfo): Boolean {
-        val tags = info.simpleTags ?: return false
-        return tags.any { tag -> tagFilterList.any { it.enable!! && matchTag(tag, it.text!!) } }
-    }
-
     private fun matchTagNamespace(tag: String, filter: String): Boolean {
         val (nameSpace, _) = spiltTag(tag)
         return nameSpace == filter
     }
 
-    @Synchronized
-    fun filterTagNamespace(info: GalleryInfo): Boolean {
-        val tags = info.simpleTags ?: return false
-        return tags.any { tag -> tagNamespaceFilterList.any { it.enable!! && matchTagNamespace(tag, it.text!!) } }
-    }
-
-    @Synchronized
-    fun filterCommenter(commenter: String): Boolean {
-        return commenterFilterList.any { it.enable!! && it.text == commenter }
-    }
-
-    @Synchronized
-    fun filterComment(comment: String): Boolean {
-        return commentFilterList.any { it.enable!! && regex(it).containsMatchIn(comment) }
-    }
+    fun needTags() = tagFilterList.isNotEmpty() || tagNamespaceFilterList.isNotEmpty()
+    fun filterTitle(info: GalleryInfo) = titleFilterList.any { it.enable!! && it.text!! in info.title.orEmpty().lowercase() }
+    fun filterUploader(info: GalleryInfo) = uploaderFilterList.any { it.enable!! && it.text == info.uploader }
+    fun filterTag(info: GalleryInfo) = info.simpleTags?.any { tag -> tagFilterList.any { it.enable!! && matchTag(tag, it.text!!) } } ?: false
+    fun filterTagNamespace(info: GalleryInfo) = info.simpleTags?.any { tag -> tagNamespaceFilterList.any { it.enable!! && matchTagNamespace(tag, it.text!!) } } ?: false
+    fun filterCommenter(commenter: String) = commenterFilterList.any { it.enable!! && it.text == commenter }
+    fun filterComment(comment: String) = commentFilterList.any { it.enable!! && regex(it).containsMatchIn(comment) }
 }