feat: disableIfAppGroupMatch/ignoreGlobalGroupMatch

Author: lisonge

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

@@ -3,7 +3,7 @@ package li.songe.gkd.data
 class AppRule(
     rule: RawSubscription.RawAppRule,
     g: ResolvedAppGroup,
-    val appInfo: AppInfo?,
+    appInfo: AppInfo?,
 ) : ResolvedRule(
     rule = rule,
     g = g,

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

@@ -18,6 +18,7 @@ class GlobalRule(
     rule = rule,
     g = g,
 ) {
+    val groupExcludeAppIds = g.groupExcludeAppIds
     val group = g.group
     private val matchAnyApp = rule.matchAnyApp ?: group.matchAnyApp ?: true
     private val matchLauncher = rule.matchLauncher ?: group.matchLauncher ?: false
@@ -53,7 +54,10 @@ class GlobalRule(
 
     override val type = "global"
 
-    private val excludeAppIds = apps.filter { e -> !e.value.enable }.keys
+    private val excludeAppIds = apps.filter { e ->
+        !e.value.enable
+    }.keys
+
     private val enableApps = apps.filter { e -> e.value.enable }
 
     /**
@@ -62,7 +66,7 @@ class GlobalRule(
      */
     override fun matchActivity(appId: String, activityId: String?): Boolean {
         // 规则自带禁用
-        if (excludeAppIds.contains(appId)) {
+        if (excludeAppIds.contains(appId) || groupExcludeAppIds.contains(appId)) {
             return false
         }
 

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

@@ -99,6 +99,38 @@ data class RawSubscription(
         appGroups.size + globalGroups.size
     }
 
+    val globalGroupAppGroupNameDisableMap by lazy {
+        globalGroups.mapNotNull { g ->
+            val n = g.disableIfAppGroupMatch
+            if (n != null) {
+                val gName = if (n.isNotEmpty()) {
+                    n
+                } else {
+                    g.name
+                }
+                g.key to apps.filter { a ->
+                    a.groups.any { ag ->
+                        ag.ignoreGlobalGroupMatch != true && ag.name.startsWith(gName)
+                    }
+                }.map { it.id }.toHashSet()
+            } else {
+                null
+            }
+        }.toMap()
+    }
+
+    fun getGlobalGroupInnerDisabled(globalGroup: RawGlobalGroup, appId: String): Boolean {
+        globalGroup.appIdEnable[appId]?.let {
+            if (it == false) return true
+        }
+        globalGroupAppGroupNameDisableMap[globalGroup.key]?.let {
+            if (it.contains(appId)) {
+                return true
+            }
+        }
+        return false
+    }
+
     val numText by lazy {
         val appsSize = apps.size
         val appGroupsSize = appGroups.size
@@ -305,10 +337,11 @@ data class RawSubscription(
         override val matchAnyApp: Boolean?,
         override val matchSystemApp: Boolean?,
         override val matchLauncher: Boolean?,
+        val disableIfAppGroupMatch: String?,
         override val rules: List<RawGlobalRule>,
         override val apps: List<RawGlobalApp>?,
     ) : RawGroupProps, RawGlobalRuleProps {
-        val appIdEnable by lazy {
+        val appIdEnable: Map<String, Boolean> by lazy {
             if (rules.all { r -> r.apps.isNullOrEmpty() }) {
                 apps?.associate { a -> a.id to (a.enable ?: true) } ?: emptyMap()
             } else {
@@ -417,6 +450,7 @@ data class RawSubscription(
         override val excludeVersionNames: List<String>?,
         override val versionCodes: List<Long>?,
         override val excludeVersionCodes: List<Long>?,
+        val ignoreGlobalGroupMatch: Boolean?,
     ) : RawGroupProps, RawAppRuleProps {
         override val cacheMap by lazy { HashMap<String, Selector?>() }
         override val errorDesc by lazy { getErrorDesc() }
@@ -606,11 +640,11 @@ data class RawSubscription(
                     if (p.isString) {
                         p.content
                     } else {
-                        error("Element $p is not a string")
+                        null
                     }
                 }
 
-                else -> error("Element $p is not a string")
+                else -> null
             }
 
         private fun getLong(jsonObject: JsonObject? = null, key: String): Long? =
@@ -620,7 +654,7 @@ data class RawSubscription(
                     p.long
                 }
 
-                else -> error("Element $p is not a long")
+                else -> null
             }
 
         private fun getInt(jsonObject: JsonObject? = null, key: String): Int? =
@@ -630,7 +664,7 @@ data class RawSubscription(
                     p.int
                 }
 
-                else -> error("Element $p is not a int")
+                else -> null
             }
 
         private fun getBoolean(jsonObject: JsonObject? = null, key: String): Boolean? =
@@ -640,7 +674,7 @@ data class RawSubscription(
                     p.boolean
                 }
 
-                else -> error("Element $p is not a boolean")
+                else -> null
             }
 
         private fun jsonToRuleRaw(rulesRawJson: JsonElement): RawAppRule {
@@ -728,6 +762,7 @@ data class RawSubscription(
                 excludeVersionNames = getStringIArray(jsonObject, "excludeVersionNames"),
                 priorityTime = getLong(jsonObject, "priorityTime"),
                 priorityActionMaximum = getInt(jsonObject, "priorityActionMaximum"),
+                ignoreGlobalGroupMatch = getBoolean(jsonObject, "ignoreGlobalGroupMatch"),
             )
         }
 
@@ -839,6 +874,7 @@ data class RawSubscription(
                 forcedTime = getLong(jsonObject, "forcedTime"),
                 priorityTime = getLong(jsonObject, "priorityTime"),
                 priorityActionMaximum = getInt(jsonObject, "priorityActionMaximum"),
+                disableIfAppGroupMatch = getString(jsonObject, "disableIfAppGroupMatch"),
             )
         }
 

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

@@ -31,4 +31,8 @@ class ResolvedGlobalGroup(
 ) : ResolvedGroup(group, subscription, subsItem, config) {
     override val appId: String?
         get() = null
+
+    val groupExcludeAppIds by lazy {
+        subscription.globalGroupAppGroupNameDisableMap[group.key] ?: emptySet()
+    }
 }

app/src/main/kotlin/li/songe/gkd/ui/ActionLogPage.kt

@@ -371,6 +371,7 @@ private fun ActionLogDialog(
                 val group = subs?.globalGroups?.find { g -> g.key == actionLog.groupKey }
                 val appChecked = if (group != null) {
                     getGlobalGroupChecked(
+                        subs,
                         oldExclude,
                         group,
                         actionLog.appId,

app/src/main/kotlin/li/songe/gkd/ui/GlobalGroupExcludePage.kt

@@ -310,7 +310,12 @@ fun GlobalGroupExcludePage(subsItemId: Long, groupKey: Int) {
                     Spacer(modifier = Modifier.width(8.dp))
 
                     if (group != null) {
-                        val checked = getGlobalGroupChecked(excludeData, group, appInfo.id)
+                        val checked = getGlobalGroupChecked(
+                            rawSubs!!,
+                            excludeData,
+                            group,
+                            appInfo.id
+                        )
                         if (checked != null) {
                             key(appInfo.id) {
                                 Switch(
@@ -413,16 +418,16 @@ fun GlobalGroupExcludePage(subsItemId: Long, groupKey: Int) {
 // true - 启用
 // false - 禁用
 fun getGlobalGroupChecked(
+    subscription: RawSubscription,
     excludeData: ExcludeData,
     group: RawSubscription.RawGlobalGroup,
     appId: String,
 ): Boolean? {
-    val enable = group.appIdEnable[appId]
-    if (enable == false) {
+    if (subscription.getGlobalGroupInnerDisabled(group, appId)) {
         return null
     }
     excludeData.appIds[appId]?.let { return !it }
-    if (enable == true) return true
+    if (group.appIdEnable[appId] == true) return true
     if (appId == launcherAppId) {
         return group.matchLauncher ?: false
     }

app/src/main/kotlin/li/songe/gkd/ui/component/GroupNameText.kt

@@ -31,6 +31,7 @@ fun GroupNameText(
     overflow: TextOverflow = TextOverflow.Clip,
     softWrap: Boolean = true,
     maxLines: Int = Int.MAX_VALUE,
+    clickDisabled: Boolean = false,
 ) {
     if (isGlobal) {
         val text = remember(preText, text) {
@@ -43,7 +44,7 @@ fun GroupNameText(
             }
         }
         val fontSize = style.fontSize
-        val inlineContent = remember(fontSize) {
+        val inlineContent = remember(fontSize, clickDisabled) {
             mapOf(
                 "icon" to InlineTextContent(
                     placeholder = Placeholder(
@@ -55,7 +56,9 @@ fun GroupNameText(
                     Icon(
                         imageVector = SportsBasketball,
                         modifier = Modifier
-                            .clickable(onClick = throttle { toast("当前是全局规则组") })
+                            .runIf(!clickDisabled) {
+                                clickable(onClick = throttle { toast("当前是全局规则组") })
+                            }
                             .fillMaxSize(),
                         contentDescription = null,
                     )

app/src/main/kotlin/li/songe/gkd/ui/component/ModifierExt.kt

@@ -0,0 +1,14 @@
+package li.songe.gkd.ui.component
+
+import androidx.compose.ui.Modifier
+
+inline fun Modifier.runIf(
+    enabled: Boolean,
+    block: Modifier.() -> Modifier
+) = run {
+    if (enabled) {
+        block()
+    } else {
+        this
+    }
+}

app/src/main/kotlin/li/songe/gkd/ui/component/RuleGroupCard.kt

@@ -101,7 +101,7 @@ fun RuleGroupCard(
         val excludeData = remember(subsConfig?.exclude) {
             ExcludeData.parse(subsConfig?.exclude)
         }
-        getGlobalGroupChecked(excludeData, group, appId) to excludeData
+        getGlobalGroupChecked(subs, excludeData, group, appId) to excludeData
     } else {
         getGroupEnable(
             group,
@@ -203,6 +203,7 @@ fun RuleGroupCard(
                     maxLines = 1,
                     softWrap = false,
                     overflow = TextOverflow.Ellipsis,
+                    clickDisabled = isSelectedMode,
                 )
                 if (group.valid) {
                     if (!group.desc.isNullOrBlank()) {

app/src/main/kotlin/li/songe/gkd/ui/component/RuleGroupState.kt

@@ -137,7 +137,7 @@ suspend fun batchUpdateGroupEnable(
                 // global rule for some app
                 targetGroup as RawSubscription.RawGlobalGroup
                 val excludeData = ExcludeData.parse(subsConfig?.exclude)
-                getGlobalGroupChecked(excludeData, targetGroup, g.pageAppId).let {
+                getGlobalGroupChecked(subscription, excludeData, targetGroup, g.pageAppId).let {
                     if (it == null) return@map null
                 }
                 (subsConfig ?: SubsConfig(