MMDB supports country code filtering

Author: KotaHv

src/deserialize/mmdb.py

@@ -5,10 +5,16 @@
 from model import RuleModel
 
 
-def deserialize(filepath: Path) -> RuleModel:
+def deserialize(filepath: Path, country_code: str | None = None) -> RuleModel:
     rules = RuleModel()
     with maxminddb.open_database(filepath) as reader:
-        for ip, _ in reader:
-            ip_cidr_list = rules.ip_cidr if ip.version == 4 else rules.ip_cidr6
-            ip_cidr_list.add(str(ip))
+        if country_code is None:
+            for ip, _ in reader:
+                ip_cidr_list = rules.ip_cidr if ip.version == 4 else rules.ip_cidr6
+                ip_cidr_list.add(str(ip))
+        else:
+            for ip, info in reader:
+                if info["country"]["iso_code"] == country_code:
+                    ip_cidr_list = rules.ip_cidr if ip.version == 4 else rules.ip_cidr6
+                    ip_cidr_list.add(str(ip))
     return rules

src/main.py

@@ -63,7 +63,7 @@ def deserialize_data(
         )
         return de.deserialize()
     elif format == ResourceFormat.MaxMindDB:
-        return mmdb.deserialize(data)
+        return mmdb.deserialize(data, country_code=option.geo_ip_country_code)
     raise Exception(f"Unknown format: {format}")
 
 

src/source.py

@@ -18,28 +18,13 @@
             "https://ruleset.skk.moe/List/ip/reject.conf",
         ],
         target_path="Sukka-ad",
-        include=[SerializeFormat.Surge, SerializeFormat.Loon],
     ),
     SourceModel(
-        resources=[
-            "https://ruleset.skk.moe/List/non_ip/reject-no-drop.conf",
-            ("https://ruleset.skk.moe/List/domainset/reject.conf", "DOMAIN-SET"),
-            "https://ruleset.skk.moe/List/non_ip/reject.conf",
-            "https://ruleset.skk.moe/List/ip/reject.conf",
-        ],
-        target_path="Sukka-ad",
-        include=SerializeFormat.Clash,
-    ),
-    SourceModel(
-        resources=[
-            "https://ruleset.skk.moe/List/non_ip/reject-no-drop.conf",
-            "https://ruleset.skk.moe/List/non_ip/reject-drop.conf",
-            ("https://ruleset.skk.moe/List/domainset/reject.conf", "DOMAIN-SET"),
-            "https://ruleset.skk.moe/List/non_ip/reject.conf",
-            "https://ruleset.skk.moe/List/ip/reject.conf",
-        ],
-        target_path="Sukka-ad",
-        include=[SerializeFormat.Egern, SerializeFormat.Sing_Box],
+        resources=(
+            "https://ruleset.skk.moe/List/domainset/reject_extra.conf",
+            "DOMAIN-SET",
+        ),
+        target_path="Sukka-ad-extra",
     ),
     SourceModel(
         resources="https://raw.githubusercontent.com/Cats-Team/AdRules/main/adrules.list",
@@ -279,6 +264,22 @@
         target_path="CN",
         option=Option(no_resolve=False, geo_ip_country_code="CN"),
     ),
+    SourceModel(
+        resources=(
+            "https://github.com/xream/geoip/releases/latest/download/ipinfo.country.mmdb",
+            "MaxMind DB",
+        ),
+        target_path="CN-IPinfo",
+        option=Option(no_resolve=False, geo_ip_country_code="CN"),
+    ),
+    SourceModel(
+        resources=(
+            "https://github.com/xream/geoip/releases/latest/download/ip2location.country.mmdb",
+            "MaxMind DB",
+        ),
+        target_path="CN-IP2Location",
+        option=Option(no_resolve=False, geo_ip_country_code="CN"),
+    ),
     SourceModel(
         resources="https://raw.githubusercontent.com/blackmatrix7/ios_rule_script/master/rule/Surge/OneDrive/OneDrive.list",
         target_path="OneDrive",