version 1.5.0

Author: ilsanbao

example.py

@@ -3,6 +3,13 @@
 
 import pandas as pd
 
+def test_city_district():
+    db = ipdb.City("c:/work/ipdb/test.ipdb")
+    print(db.fields())
+    city = db.find_info(u"111.199.81.160", "CN")
+    qx = city.get_district()
+    if qx != None:
+        print(qx.city_name, qx.district_name)
 
 def test_free():
     db = ipdb.City("c:/work/ipdb/mydata4vipweek2.ipdb")
@@ -100,5 +107,5 @@ def test_idc_list():
 # test_city_ipv4()
 # test_city_ipv6_test()
 # test_base_station()
-test_city_ipv6()
+test_city_district()
 # test_city_ipv4()

ipdb/city.py

@@ -4,7 +4,8 @@
 """
 
 from .database import Reader
-
+from .district import DistrictInfo
+import json
 
 class CityInfo:
     country_name = ""
@@ -27,12 +28,23 @@ class CityInfo:
     currency_code = ""
     currency_name = ""
     anycast = ""
+    line = ""
+    district_info = ""
 
     def __init__(self, **kwargs):
         self._map = kwargs
         for key in self._map:
             self.__dict__[key] = self._map[key]
 
+    def get_district(self):
+        if len(self.district_info) == 0:
+            return None
+        o = json.loads(self.district_info)
+        o["country_name"] = self.country_name
+        o["region_name"] = self.region_name
+        o["city_name"] = self.city_name
+        return DistrictInfo(**o)
+
 
 class City:
 

setup.py

@@ -4,7 +4,7 @@
 
 setup(
     name='ipip-ipdb',
-    version="1.3.2",
+    version="1.5.0",
     description=(
         'IPIP.net officially supported IP database ipdb format parsing library'
     ),