Reduce File I/O

Author: ip2location-com

ChangeLog

@@ -1,3 +1,6 @@
+2.2.0	2019-12-04
+	* Reduced File I/O.
+
 2.1.0	2019-07-03
 	* Added support for 6to4 and Teredo.
 

IP2Proxy.py

@@ -50,7 +50,7 @@ def inet_pton(t, addr):
         return out_addr_p.raw
     socket.inet_pton = inet_pton
 
-_VERSION = '2.1.0' 
+_VERSION = '2.2.0' 
 _NO_IP = 'MISSING IP ADDRESS'
 _FIELD_NOT_SUPPORTED = 'NOT SUPPORTED'
 _INVALID_IP_ADDRESS  = 'INVALID IP ADDRESS'
@@ -303,6 +303,10 @@ def _reads(self, offset):
         n = struct.unpack('B', self._f.read(1))[0]
         return u(self._f.read(n))
         # return self._f.read(n).decode('iso-8859-1').encode('utf-8')
+        # if sys.version < '3':
+            # return str(self._f.read(n).decode('iso-8859-1').encode('utf-8'))
+        # else :
+            # return u(self._f.read(n).decode('iso-8859-1').encode('utf-8')
 
     def _readi(self, offset):
         self._f.seek(offset - 1)
@@ -327,65 +331,69 @@ def _read_record(self, mid, ipv):
         if ipv == 4:
             off = 0
             baseaddr = self._ipv4dbaddr
+            dbcolumn_width = self._dbcolumn * 4 + 4
         elif ipv == 6:
             off = 12
             baseaddr = self._ipv6dbaddr
+            dbcolumn_width = self._dbcolumn * 4
 
         rec.ip = self._readips(baseaddr + (mid) * self._dbcolumn * 4, ipv)
 
         def calc_off(what, mid):
             return baseaddr + mid * (self._dbcolumn * 4 + off) + off + 4 * (what[self._dbtype]-1)
 
-        if _COUNTRY_POSITION[self._dbtype] != 0:
-            rec.country_short = self._reads(self._readi(calc_off(_COUNTRY_POSITION, mid)) + 1)
+        self._f.seek((calc_off(_PROXYTYPE_POSITION, mid)) - 1)
+        raw_positions_row = self._f.read(dbcolumn_width)
 
-            rec.country_long =  self._reads(self._readi(calc_off(_COUNTRY_POSITION, mid)) + 4)
+        if _COUNTRY_POSITION[self._dbtype] != 0:
+            rec.country_short = self._reads(struct.unpack('<I', raw_positions_row[((_COUNTRY_POSITION[self._dbtype]-1) * 4 - 4) : ((_COUNTRY_POSITION[self._dbtype]-1) * 4)])[0] + 1)
+            rec.country_long =  self._reads(struct.unpack('<I', raw_positions_row[((_COUNTRY_POSITION[self._dbtype]-1) * 4 - 4) : ((_COUNTRY_POSITION[self._dbtype]-1) * 4)])[0] + 4)
         elif _COUNTRY_POSITION[self._dbtype] == 0:
             rec.country_short = _FIELD_NOT_SUPPORTED
             rec.country_long = _FIELD_NOT_SUPPORTED
 
         if _REGION_POSITION[self._dbtype] != 0:
-            rec.region = self._reads(self._readi(calc_off(_REGION_POSITION, mid)) + 1)
+            rec.region = self._reads(struct.unpack('<I', raw_positions_row[((_REGION_POSITION[self._dbtype]-1) * 4 - 4) : ((_REGION_POSITION[self._dbtype]-1) * 4)])[0] + 1)
         elif _REGION_POSITION[self._dbtype] == 0:
             rec.region = _FIELD_NOT_SUPPORTED
 
         if _CITY_POSITION[self._dbtype] != 0:
-            rec.city = self._reads(self._readi(calc_off(_CITY_POSITION, mid)) + 1)
+            rec.city = self._reads(struct.unpack('<I', raw_positions_row[((_CITY_POSITION[self._dbtype]-1) * 4 - 4) : ((_CITY_POSITION[self._dbtype]-1) * 4)])[0] + 1)
         elif _CITY_POSITION[self._dbtype] == 0:
             rec.city = _FIELD_NOT_SUPPORTED
 
         if _ISP_POSITION[self._dbtype] != 0:
-            rec.isp = self._reads(self._readi(calc_off(_ISP_POSITION, mid)) + 1)
+            rec.isp = self._reads(struct.unpack('<I', raw_positions_row[((_ISP_POSITION[self._dbtype]-1) * 4 - 4) : ((_ISP_POSITION[self._dbtype]-1) * 4)])[0] + 1)
         elif _ISP_POSITION[self._dbtype] == 0:
             rec.isp = _FIELD_NOT_SUPPORTED
 
         if _PROXYTYPE_POSITION[self._dbtype] != 0:
-            rec.proxy_type = self._reads(self._readi(calc_off(_PROXYTYPE_POSITION, mid)) + 1)
+            rec.proxy_type = self._reads(struct.unpack('<I', raw_positions_row[0 : ((_PROXYTYPE_POSITION[self._dbtype]-1) * 4)])[0] + 1)
         elif _PROXYTYPE_POSITION[self._dbtype] == 0:
             rec.proxy_type = _FIELD_NOT_SUPPORTED
 
         if _DOMAIN_POSITION[self._dbtype] != 0:
-            rec.domain = self._reads(self._readi(calc_off(_DOMAIN_POSITION, mid)) + 1)
+            rec.domain = self._reads(struct.unpack('<I', raw_positions_row[((_DOMAIN_POSITION[self._dbtype]-1) * 4 - 4) : ((_DOMAIN_POSITION[self._dbtype]-1) * 4)])[0] + 1)
         elif _DOMAIN_POSITION[self._dbtype] == 0:
             rec.domain = _FIELD_NOT_SUPPORTED
 
         if _USAGETYPE_POSITION[self._dbtype] != 0:
-            rec.usage_type = self._reads(self._readi(calc_off(_USAGETYPE_POSITION, mid)) + 1)
+            rec.usage_type = self._reads(struct.unpack('<I', raw_positions_row[((_USAGETYPE_POSITION[self._dbtype]-1) * 4 - 4) : ((_USAGETYPE_POSITION[self._dbtype]-1) * 4)])[0] + 1)
         elif _USAGETYPE_POSITION[self._dbtype] == 0:
             rec.usage_type = _FIELD_NOT_SUPPORTED
 
         if _ASN_POSITION[self._dbtype] != 0:
-            rec.asn = self._reads(self._readi(calc_off(_ASN_POSITION, mid)) + 1)
+            rec.asn = self._reads(struct.unpack('<I', raw_positions_row[((_ASN_POSITION[self._dbtype]-1) * 4 - 4) : ((_ASN_POSITION[self._dbtype]-1) * 4)])[0] + 1)
         elif _ASN_POSITION[self._dbtype] == 0:
             rec.asn = _FIELD_NOT_SUPPORTED
 
         if _AS_POSITION[self._dbtype] != 0:
-            rec.as_name = self._reads(self._readi(calc_off(_AS_POSITION, mid)) + 1)
+            rec.as_name = self._reads(struct.unpack('<I', raw_positions_row[((_AS_POSITION[self._dbtype]-1) * 4 - 4) : ((_AS_POSITION[self._dbtype]-1) * 4)])[0] + 1)
         elif _AS_POSITION[self._dbtype] == 0:
             rec.as_name = _FIELD_NOT_SUPPORTED
 
         if _LASTSEEN_POSITION[self._dbtype] != 0:
-            rec.last_seen = self._reads(self._readi(calc_off(_LASTSEEN_POSITION, mid)) + 1)
+            rec.last_seen = self._reads(struct.unpack('<I', raw_positions_row[((_LASTSEEN_POSITION[self._dbtype]-1) * 4 - 4) : ((_LASTSEEN_POSITION[self._dbtype]-1) * 4)])[0] + 1)
         elif _LASTSEEN_POSITION[self._dbtype] == 0:
             rec.last_seen = _FIELD_NOT_SUPPORTED
 

PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 1.0
 Name: IP2Proxy
-Version: 2.1.0
+Version: 2.2.0
 Summary: Python API for IP2Proxy database
 Home-page: http://www.ip2location.com
 Author: IP2Location

setup.py

@@ -5,7 +5,7 @@
 
 setuptools.setup(
 	name="IP2Proxy",
-	version="2.1.0", 
+	version="2.2.0", 
 	author="IP2Location",
 	author_email="support@ip2location.com",
 	description="Python API for IP2Proxy database. It can be used to query an IP address if it was being used as open proxy, web proxy, VPN anonymizer and TOR exits.",