factor out Database

Author: dylan4224

ipdb/base_station.py

@@ -3,7 +3,7 @@
     :copyright: ©2018 by IPIP.net
 """
 
-from .database import Reader
+from .database import Database
 
 
 class BaseStationInfo:
@@ -20,44 +20,6 @@ def __init__(self, **kwargs):
             self.__dict__[key] = self._map[key]
 
 
-class BaseStation:
+class BaseStation(Database):
 
-    db = None
-
-    def __init__(self, name):
-        self.db = Reader(name)
-
-    def reload(self, name):
-        try:
-            db = Reader(name)
-            self.db = db
-            return True
-        except:
-            return False            
-
-    def find(self, addr, language):
-        return self.db.find(addr, language)
-
-    def find_map(self, addr, language):
-        return self.db.find_map(addr, language)
-
-    def find_info(self, addr, language):
-        m = self.db.find_map(addr, language)
-        if m is None:
-            return None
-        return BaseStationInfo(**m)
-
-    def is_ipv4(self):
-        return self.db.is_support_ipv4()
-
-    def is_ipv6(self):
-        return self.db.is_support_ipv6()
-
-    def languages(self):
-        return self.db.support_languages()
-
-    def fields(self):
-        return self.db.support_fields()
-
-    def build_time(self):
-        return self.db.build_utc_time()
+    info = BaseStationInfo

ipdb/city.py

@@ -3,7 +3,7 @@
     :copyright: ©2018 by IPIP.net
 """
 
-from .database import Reader
+from .database import Database
 
 
 class CityInfo:
@@ -34,44 +34,6 @@ def __init__(self, **kwargs):
             self.__dict__[key] = self._map[key]
 
 
-class City:
+class City(Database):
 
-    db = None
-
-    def __init__(self, name):
-        self.db = Reader(name)
-
-    def reload(self, name):
-        try:
-            db = Reader(name)
-            self.db = db
-            return True
-        except:
-            return False            
-
-    def find(self, addr, language):
-        return self.db.find(addr, language)
-
-    def find_map(self, addr, language):
-        return self.db.find_map(addr, language)
-
-    def find_info(self, addr, language):
-        m = self.db.find_map(addr, language)
-        if m is None:
-            return None
-        return CityInfo(**m)
-
-    def is_ipv4(self):
-        return self.db.is_support_ipv4()
-
-    def is_ipv6(self):
-        return self.db.is_support_ipv6()
-
-    def languages(self):
-        return self.db.support_languages()
-
-    def fields(self):
-        return self.db.support_fields()
-
-    def build_time(self):
-        return self.db.build_utc_time()
+    info = CityInfo

ipdb/database.py

@@ -162,3 +162,47 @@ def is_support_ipv6(self):
 
     def build_utc_time(self):
         return self._meta.build
+
+
+class Database:
+
+    db = None
+    info = None
+
+    def __init__(self, name):
+        self.db = Reader(name)
+
+    def reload(self, name):
+        try:
+            db = Reader(name)
+            self.db = db
+            return True
+        except:
+            return False
+
+    def find(self, addr, language):
+        return self.db.find(addr, language)
+
+    def find_map(self, addr, language):
+        return self.db.find_map(addr, language)
+
+    def find_info(self, addr, language):
+        m = self.db.find_map(addr, language)
+        if m is None:
+            return None
+        return self.info(**m)
+
+    def is_ipv4(self):
+        return self.db.is_support_ipv4()
+
+    def is_ipv6(self):
+        return self.db.is_support_ipv6()
+
+    def languages(self):
+        return self.db.support_languages()
+
+    def fields(self):
+        return self.db.support_fields()
+
+    def build_time(self):
+        return self.db.build_utc_time()

ipdb/district.py

@@ -3,7 +3,7 @@
     :copyright: ©2018 by IPIP.net
 """
 
-from .database import Reader
+from .database import Database
 
 
 class DistrictInfo:
@@ -22,44 +22,6 @@ def __init__(self, **kwargs):
             self.__dict__[key] = self._map[key]
 
 
-class District:
+class District(Database):
 
-    db = None
-
-    def __init__(self, name):
-        self.db = Reader(name)
-
-    def reload(self, name):
-        try:
-            db = Reader(name)
-            self.db = db
-            return True
-        except:
-            return False            
-
-    def find(self, addr, language):
-        return self.db.find(addr, language)
-
-    def find_map(self, addr, language):
-        return self.db.find_map(addr, language)
-
-    def find_info(self, addr, language):
-        m = self.db.find_map(addr, language)
-        if m is None:
-            return None
-        return DistrictInfo(**m)
-
-    def is_ipv4(self):
-        return self.db.is_support_ipv4()
-
-    def is_ipv6(self):
-        return self.db.is_support_ipv6()
-
-    def languages(self):
-        return self.db.support_languages()
-
-    def fields(self):
-        return self.db.support_fields()
-
-    def build_time(self):
-        return self.db.build_utc_time()
+    info = DistrictInfo

ipdb/idc.py

@@ -3,7 +3,7 @@
     :copyright: ©2018 by IPIP.net
 """
 
-from .database import Reader
+from .database import Database
 
 
 class IDCInfo:
@@ -20,44 +20,6 @@ def __init__(self, **kwargs):
             self.__dict__[key] = self._map[key]
 
 
-class IDC:
+class IDC(Database):
 
-    db = None
-
-    def __init__(self, name):
-        self.db = Reader(name)
-
-    def reload(self, name):
-        try:
-            db = Reader(name)
-            self.db = db
-            return True
-        except:
-            return False
-
-    def find(self, addr, language):
-        return self.db.find(addr, language)
-
-    def find_map(self, addr, language):
-        return self.db.find_map(addr, language)
-
-    def find_info(self, addr, language):
-        m = self.db.find_map(addr, language)
-        if m is None:
-            return None
-        return IDCInfo(**m)
-
-    def is_ipv4(self):
-        return self.db.is_support_ipv4()
-
-    def is_ipv6(self):
-        return self.db.is_support_ipv6()
-
-    def languages(self):
-        return self.db.support_languages()
-
-    def fields(self):
-        return self.db.support_fields()
-
-    def build_time(self):
-        return self.db.build_utc_time()
+    info = IDCInfo