yenru0/EhViewer
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Cleanup filter

Browse Source
This commit is contained in:
tarsin committed 2023-07-01 11:07:29 +08:00
1 parent 459dd50e91
commit e428695052
1 file changed
+7 -6
Download Patch File Download Diff File Expand all files Collapse all files
app/src/main/java/com/hippo/ehviewer/client/EhFilter.kt
+7 -6
View File
@@ -23,6 +23,7 @@ import com.hippo.ehviewer.client.data.GalleryInfo
import com.hippo.ehviewer.dao.Filter
private val regex = { p: Filter -> Regex(p.text) }.memoize()
private inline fun List<Filter>.anyActive(predicate: (Filter) -> Boolean) = any { it.enable && predicate(it) }
object EhFilter {
val titleFilterList = mutableStateListOf<Filter>()
@@ -113,10 +114,10 @@ object EhFilter {
}
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) }
fun filterTitle(info: GalleryInfo) = titleFilterList.anyActive { it.text in info.title.orEmpty().lowercase() }
fun filterUploader(info: GalleryInfo) = uploaderFilterList.anyActive { it.text == info.uploader }
fun filterTag(info: GalleryInfo) = info.simpleTags?.any { tag -> tagFilterList.anyActive { matchTag(tag, it.text) } } ?: false
fun filterTagNamespace(info: GalleryInfo) = info.simpleTags?.any { tag -> tagNamespaceFilterList.anyActive { matchTagNamespace(tag, it.text) } } ?: false
fun filterCommenter(commenter: String) = commenterFilterList.anyActive { it.text == commenter }
fun filterComment(comment: String) = commentFilterList.anyActive { regex(it).containsMatchIn(comment) }
}