Update main.py

main.py

@@ -135,7 +135,6 @@ def get_addr(ip, mask):
     network = ipaddress.ip_network(f"{ip}/{mask}", strict=False)
     first_ip = network.network_address
     return f"{first_ip}/{mask}"
-
 def get_maxmind(ip: str):
     ret = {"ip":ip}
     asn_info = asn_reader.get(ip)
@@ -154,35 +153,64 @@ def get_maxmind(ip: str):
     # 添加经纬度和时区信息
     if "location" in city_info:
         location = city_info["location"]
-        ret["location"] = {
-            "latitude": location.get("latitude"),
-            "longitude": location.get("longitude"),
-            "timezone": location.get("time_zone")
-        }
+        loc_data = {}
+        if "latitude" in location:
+            loc_data["latitude"] = location["latitude"]
+        if "longitude" in location:
+            loc_data["longitude"] = location["longitude"]
+        if "time_zone" in location:
+            loc_data["timezone"] = location["time_zone"]
+        if loc_data:
+            ret["location"] = loc_data
 
     # 添加大洲信息
-    if "continent" in city_info:
-        ret["continent"] = {
-            "code": city_info["continent"]["code"],
-            "name": get_des(city_info["continent"])
-        }
+    if "continent" in city_info and city_info["continent"]:
+        try:
+            ret["continent"] = {
+                "code": city_info["continent"].get("code"),
+                "name": get_des(city_info["continent"]) if "names" in city_info["continent"] else None
+            }
+        except Exception:
+            pass
   
     # 添加邮政编码
-    if "postal" in city_info:
-        ret["postal"] = city_info["postal"].get("code")
+    if "postal" in city_info and city_info["postal"]:
+        postal_code = city_info["postal"].get("code")
+        if postal_code:
+            ret["postal"] = postal_code
 
     # 添加网络特征
-    if "traits" in city_info:
+    if "traits" in city_info and city_info["traits"]:
         traits = city_info["traits"]
-        ret["traits"] = {
-            "is_anonymous_proxy": traits.get("is_anonymous_proxy", False),
-            "is_satellite_provider": traits.get("is_satellite_provider", False)
-        }
+        traits_data = {}
+        if "is_anonymous_proxy" in traits:
+            traits_data["is_anonymous_proxy"] = traits["is_anonymous_proxy"]
+        if "is_satellite_provider" in traits:
+            traits_data["is_satellite_provider"] = traits["is_satellite_provider"]
+        if traits_data:
+            ret["traits"] = traits_data
   
     if "country" in city_info:
         country_code = city_info["country"]["iso_code"]
         country_name = get_country(city_info["country"])
         ret["country"] = {"code":country_code,"name":country_name}
+  
+    if "registered_country" in city_info:
+        registered_country_code = city_info["registered_country"]["iso_code"]
+        ret["registered_country"] = {"code":registered_country_code,"name":get_country(city_info["registered_country"])}
+      
+    regions = [get_des(i) for i in city_info.get('subdivisions', [])]
+
+    if "city" in city_info:
+        c = get_des(city_info["city"])
+        if (not regions or c not in regions[-1])and c not in country_name:
+            regions.append(c)
+          
+    regions = de_duplicate(regions)
+    if regions:
+        ret["regions"] = regions
+  
+    return ret
 
 def get_cn(ip:str, info={}):
     ret, prefix = cn_reader.get_with_prefix_len(ip)