feat: excludeAllMatches

Author: lisonge

app/src/main/kotlin/li/songe/gkd/data/RawSubscription.kt

@@ -220,8 +220,13 @@ data class RawSubscription(
         val action: String?
         val position: Position?
         val matches: List<String>?
-        val excludeMatches: List<String>?
         val anyMatches: List<String>?
+        val excludeMatches: List<String>?
+        val excludeAllMatches: List<String>?
+
+        fun getAllSelectorStrings(): List<String> {
+            return listOfNotNull(matches, excludeMatches, anyMatches, excludeAllMatches).flatten()
+        }
     }
 
     sealed interface RawGroupProps : RawCommonProps {
@@ -376,6 +381,7 @@ data class RawSubscription(
         override val position: Position?,
         override val matches: List<String>?,
         override val excludeMatches: List<String>?,
+        override val excludeAllMatches: List<String>?,
         override val anyMatches: List<String>?,
         override val matchAnyApp: Boolean?,
         override val matchSystemApp: Boolean?,
@@ -435,6 +441,7 @@ data class RawSubscription(
         override val position: Position?,
         override val matches: List<String>?,
         override val excludeMatches: List<String>?,
+        override val excludeAllMatches: List<String>?,
         override val anyMatches: List<String>?,
 
         override val actionCdKey: Int?,
@@ -468,7 +475,7 @@ data class RawSubscription(
 
         private fun RawGroupProps.getErrorDesc(): String? {
             val allSelectorStrings = rules.map { r ->
-                listOfNotNull(r.matches, r.excludeMatches, r.anyMatches).flatten()
+                r.getAllSelectorStrings()
             }.flatten()
             allSelectorStrings.forEach { source ->
                 try {
@@ -650,6 +657,7 @@ data class RawSubscription(
                 excludeActivityIds = getStringIArray(jsonObject, "excludeActivityIds"),
                 matches = getStringIArray(jsonObject, "matches"),
                 excludeMatches = getStringIArray(jsonObject, "excludeMatches"),
+                excludeAllMatches = getStringIArray(jsonObject, "excludeAllMatches"),
                 anyMatches = getStringIArray(jsonObject, "anyMatches"),
                 key = getInt(jsonObject, "key"),
                 name = getString(jsonObject, "name"),
@@ -788,6 +796,7 @@ data class RawSubscription(
                 action = getString(jsonObject, "action"),
                 preKeys = getIntIArray(jsonObject, "preKeys"),
                 excludeMatches = getStringIArray(jsonObject, "excludeMatches"),
+                excludeAllMatches = getStringIArray(jsonObject, "excludeAllMatches"),
                 matches = getStringIArray(jsonObject, "matches"),
                 anyMatches = getStringIArray(jsonObject, "anyMatches"),
                 order = getInt(jsonObject, "order"),

app/src/main/kotlin/li/songe/gkd/data/ResolvedRule.kt

@@ -15,17 +15,18 @@ sealed class ResolvedRule(
     private val group = g.group
     val subsItem = g.subsItem
     val rawSubs = g.subscription
-    val config = g.config
     val key = rule.key
     val index = group.rules.indexOfFirst { r -> r === rule }
     val excludeData = g.excludeData
     private val preKeys = (rule.preKeys ?: emptyList()).toSet()
     val matches =
         (rule.matches ?: emptyList()).map { s -> group.cacheMap[s] ?: Selector.parse(s) }
-    val excludeMatches =
-        (rule.excludeMatches ?: emptyList()).map { s -> group.cacheMap[s] ?: Selector.parse(s) }
     val anyMatches =
         (rule.anyMatches ?: emptyList()).map { s -> group.cacheMap[s] ?: Selector.parse(s) }
+    val excludeMatches =
+        (rule.excludeMatches ?: emptyList()).map { s -> group.cacheMap[s] ?: Selector.parse(s) }
+    val excludeAllMatches =
+        (rule.excludeAllMatches ?: emptyList()).map { s -> group.cacheMap[s] ?: Selector.parse(s) }
 
     private val resetMatch = rule.resetMatch ?: group.resetMatch
     val matchDelay = rule.matchDelay ?: group.matchDelay ?: 0L
@@ -53,7 +54,7 @@ sealed class ResolvedRule(
     } ?: group.actionMaximum
 
     private val hasSlowSelector by lazy {
-        (matches + excludeMatches + anyMatches).any { s -> s.isSlow(matchOption) }
+        (matches + excludeMatches + anyMatches + excludeAllMatches).any { s -> s.isSlow(matchOption) }
     }
     val priorityTime = rule.priorityTime ?: group.priorityTime ?: 0
     val priorityActionMaximum = rule.priorityActionMaximum ?: group.priorityActionMaximum ?: 1

app/src/main/kotlin/li/songe/gkd/service/A11yContext.kt

@@ -552,6 +552,18 @@ class A11yContext(
                     rule.matchOption,
                 )?.let { return null }
             }
+            if (rule.excludeAllMatches.isNotEmpty()) {
+                val allExclude = rule.excludeAllMatches.all {
+                    a11yContext.querySelfOrSelector(
+                        queryNode,
+                        it,
+                        rule.matchOption,
+                    ) == null
+                }
+                if (!allExclude) {
+                    return null
+                }
+            }
             return resultNode
         } finally {
             currentRule = null