style: rule_set for dns

purofle · purofle · commit b46dbc8c46ff · 2024-03-03T11:35:25.000+08:00
diff --git a/app/src/main/java/io/nekohasekai/sagernet/fmt/ConfigBuilder.kt b/app/src/main/java/io/nekohasekai/sagernet/fmt/ConfigBuilder.kt
@@ -535,7 +535,7 @@ fun buildConfig(
                     makeSingBoxRule(rule.ip.listByLineOrComma(), true)
                 }
 
-                if (rule_set != null) generateRuleSet(ruleSets)
+                if (rule_set != null) generateRuleSet(rule_set, ruleSets)
 
                 if (rule.port.isNotBlank()) {
                     port = mutableListOf<Int>()
diff --git a/app/src/main/java/moe/matsuri/nb4a/SingBoxOptions.java b/app/src/main/java/moe/matsuri/nb4a/SingBoxOptions.java
@@ -4418,8 +4418,7 @@ public static class DNSRule_DefaultOptions extends DNSRule {
         // Generate note: Listable
         public List<String> domain_regex;
 
-        // Generate note: Listable
-        public List<String> geosite;
+        public List<String> rule_set;
 
         // Generate note: Listable
         public List<String> source_ip_cidr;
diff --git a/app/src/main/java/moe/matsuri/nb4a/SingBoxOptionsUtil.kt b/app/src/main/java/moe/matsuri/nb4a/SingBoxOptionsUtil.kt
@@ -30,14 +30,14 @@ object SingBoxOptionsUtil {
 }
 
 fun SingBoxOptions.DNSRule_DefaultOptions.makeSingBoxRule(list: List<String>) {
-    geosite = mutableListOf<String>()
+    rule_set = mutableListOf<String>()
     domain = mutableListOf<String>()
     domain_suffix = mutableListOf<String>()
     domain_regex = mutableListOf<String>()
     domain_keyword = mutableListOf<String>()
     list.forEach {
         if (it.startsWith("geosite:")) {
-            geosite.plusAssign(it.removePrefix("geosite:"))
+            rule_set.plusAssign(it)
         } else if (it.startsWith("full:")) {
             domain.plusAssign(it.removePrefix("full:").lowercase())
         } else if (it.startsWith("domain:")) {
@@ -51,20 +51,20 @@ fun SingBoxOptions.DNSRule_DefaultOptions.makeSingBoxRule(list: List<String>) {
             domain.plusAssign(it.lowercase())
         }
     }
-    geosite?.removeIf { it.isNullOrBlank() }
+    rule_set?.removeIf { it.isNullOrBlank() }
     domain?.removeIf { it.isNullOrBlank() }
     domain_suffix?.removeIf { it.isNullOrBlank() }
     domain_regex?.removeIf { it.isNullOrBlank() }
     domain_keyword?.removeIf { it.isNullOrBlank() }
-    if (geosite?.isEmpty() == true) geosite = null
+    if (rule_set?.isEmpty() == true) rule_set = null
     if (domain?.isEmpty() == true) domain = null
     if (domain_suffix?.isEmpty() == true) domain_suffix = null
     if (domain_regex?.isEmpty() == true) domain_regex = null
     if (domain_keyword?.isEmpty() == true) domain_keyword = null
 }
 
 fun SingBoxOptions.DNSRule_DefaultOptions.checkEmpty(): Boolean {
-    if (geosite?.isNotEmpty() == true) return false
+    if (rule_set?.isNotEmpty() == true) return false
     if (domain?.isNotEmpty() == true) return false
     if (domain_suffix?.isNotEmpty() == true) return false
     if (domain_regex?.isNotEmpty() == true) return false
@@ -73,8 +73,8 @@ fun SingBoxOptions.DNSRule_DefaultOptions.checkEmpty(): Boolean {
     return true
 }
 
-fun SingBoxOptions.Rule_DefaultOptions.generateRuleSet(ruleSet: MutableList<RuleSet>) {
-    rule_set?.forEach {
+fun generateRuleSet(ruleSetString: List<String>, ruleSet: MutableList<RuleSet>) {
+    ruleSetString.forEach {
         when {
             it.startsWith("geoip") -> {
                 val geoipPath = GeoipUtils.generateRuleSet(country = it.removePrefix("geoip:"))

Original file line number	Diff line number	Diff line change
`@@ -535,7 +535,7 @@ fun buildConfig(`
`535`	`535`	`makeSingBoxRule(rule.ip.listByLineOrComma(), true)`
`536`	`536`	`}`
`537`	`537`
`538`		`- if (rule_set != null) generateRuleSet(ruleSets)`
	`538`	`+ if (rule_set != null) generateRuleSet(rule_set, ruleSets)`
`539`	`539`
`540`	`540`	`if (rule.port.isNotBlank()) {`
`541`	`541`	`port = mutableListOf<Int>()`