Minor updates

- Added supports for DB25.
- Added new BIN file open mode.

Author: ip2location

ChangeLog

@@ -1,3 +1,7 @@
+1.1.0	2021-08-24
+	* Added supports for DB25.
+	* Added new BIN file open mode.
+
 1.0.0	2019-04-05
 	* Initial release
 	* Support IP2Location IPv6

README.md

@@ -1,6 +1,6 @@
 # IP2Location-Python-C
 
-This is a IP2Location Python-C library that enables the user to find the country, region or state, city, latitude and longitude, ZIP code, time zone, Internet Service Provider (ISP) or company name, domain name, net speed, area code, weather station code, weather station name, mobile country code (MCC), mobile network code (MNC) and carrier brand, elevation, and usage type by IP address or hostname originates from. The library used the **IP2Location C Library** to read the geo location information from **IP2Location BIN data** file.
+This is a IP2Location Python-C library that enables the user to find the country, region or state, city, latitude and longitude, ZIP code, time zone, Internet Service Provider (ISP) or company name, domain name, net speed, area code, weather station code, weather station name, mobile country code (MCC), mobile network code (MNC) and carrier brand, elevation, usage type, address type and IAB category by IP address or hostname originates from. The library used the **IP2Location C Library** to read the geo location information from **IP2Location BIN data** file.
 
 Supported IPv4 and IPv6 address.
 

data/IP-COUNTRY.BIN

@@ -1,6 +1,6 @@
 '''
  * IP2Location C library is distributed under MIT license
- * Copyright (c) 2013-2019 IP2Location.com. support@ip2location.com
+ * Copyright (c) 2013-2021 IP2Location.com. support@ip2location.com
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the MIT license
@@ -9,12 +9,17 @@
 from ctypes import *
 from ctypes.util import find_library
 
+class IP2Location_lookup_mode :
+    IP2LOCATION_FILE_IO = 0
+    IP2LOCATION_CACHE_MEMORY = 1
+    IP2LOCATION_SHARED_MEMORY = 2
+
 
 class C_IP2LocationRecord(Structure):
     '''
         Define the IP2Location Record result structure.
     '''
-    _fields_=[("country_short",c_char_p),("country_long",c_char_p),("region",c_char_p),("city",c_char_p),("isp",c_char_p),("latitude",c_float),("longitude",c_float),("domain",c_char_p),("zipcode",c_char_p),("timezone",c_char_p),("netspeed",c_char_p),("idd_code",c_char_p),("area_code",c_char_p),("weather_code",c_char_p),("weather_name",c_char_p),("mcc",c_char_p),("mnc",c_char_p),("mobile_brand",c_char_p),("elevation",c_float),("usage_type",c_char_p)]
+    _fields_=[("country_short",c_char_p),("country_long",c_char_p),("region",c_char_p),("city",c_char_p),("isp",c_char_p),("latitude",c_float),("longitude",c_float),("domain",c_char_p),("zipcode",c_char_p),("timezone",c_char_p),("netspeed",c_char_p),("idd_code",c_char_p),("area_code",c_char_p),("weather_code",c_char_p),("weather_name",c_char_p),("mcc",c_char_p),("mnc",c_char_p),("mobile_brand",c_char_p),("elevation",c_float),("usage_type",c_char_p),("address_type",c_char_p),("category",c_char_p)]
 
 
 class IP2LocationRecord:
@@ -40,6 +45,8 @@ class IP2LocationRecord:
     mobile_brand = None
     elevation = None
     usage_type = None
+    address_type = None
+    category = None
 
 
 class IP2Location(object):
@@ -57,19 +64,23 @@ def __init__(self, filename=None, libraryname = None):
                 self.ip2location_c = CDLL(find_library('IP2Location'))
 
     def load(self, libraryname):
-    '''
-        Function to load the IP2Location C Library if user choose to load their own copy of IP2Location C Library.
-    '''
+        '''
+            Function to load the IP2Location C Library if user choose to load their own copy of IP2Location C Library.
+        '''
         self.ip2location_c = CDLL(libraryname)
 
-    def open(self, filename):
+    def open(self, filename, mode=None):
         ''' 
             Function to pass the database name and path to IP2Location_open in IP2Location C library.
             Set the argument and response types of the function to avoid data compatibility issue. 
         '''
+        if (mode == None):
+            mode = IP2Location_lookup_mode.IP2LOCATION_FILE_IO
         self.ip2location_c.IP2Location_open.argtypes = [c_char_p]
         self.ip2location_c.IP2Location_open.restype = c_void_p
+        self.ip2location_c.IP2Location_open_mem.argtypes = [c_void_p, c_int]
         self.ip2location_database_pointer = self.ip2location_c.IP2Location_open(filename)
+        self.ip2location_c.IP2Location_open_mem(self.ip2location_database_pointer, mode)
 
     def get_country_short(self, ip):
         ''' Get country_short '''
@@ -151,6 +162,14 @@ def get_usage_type(self, ip):
         ''' Get usage_type '''
         rec = self.get_all(ip)
         return rec and rec.usage_type
+    def get_address_type(self, ip):
+        ''' Get address_type '''
+        rec = self.get_all(ip)
+        return rec and rec.address_type
+    def get_category(self, ip):
+        ''' Get category '''
+        rec = self.get_all(ip)
+        return rec and rec.category
 
     def get_all(self, ip):
         ''' set the argument and response types of the function for data compatibility issue. '''
@@ -179,6 +198,8 @@ def get_all(self, ip):
         self.rec.mobile_brand = self.result.contents.mobile_brand
         self.rec.elevation = self.result.contents.elevation
         self.rec.usage_type = self.result.contents.usage_type
+        self.rec.address_type = self.result.contents.address_type
+        self.rec.category = self.result.contents.category
         return self.rec
 
     def close(self):

data/IP2LOCATION-LITE-DB1.BIN

@@ -11,30 +11,41 @@
 
 database = ip2location_python_c.IP2Location()
 
-database.open(os.path.join("data", "IP-COUNTRY.BIN"))
+"""
+    Cache the database into memory to accelerate lookup speed.
+    WARNING: Please make sure your system have sufficient RAM to use this feature.
+    Choose either one from below to load the database.
+"""
+# database.open(os.path.join("data", "IP2LOCATION-LITE-DB1.BIN"), ip2location_python_c.IP2Location_lookup_mode.IP2LOCATION_SHARED_MEMORY)
+# database.open(os.path.join("data", "IP2LOCATION-LITE-DB1.BIN"), ip2location_python_c.IP2Location_lookup_mode.IP2LOCATION_CACHE_MEMORY)
+
+# Load the database using FILE I/O mode.
+database.open(os.path.join("data", "IP2LOCATION-LITE-DB1.BIN"))
 
 rec = database.get_all(ip)
 
-print rec.country_short
-print rec.country_long
-print rec.region
-print rec.city
-print rec.isp
-print rec.latitude
-print rec.longitude
-print rec.domain
-print rec.zipcode
-print rec.timezone
-print rec.netspeed
-print rec.idd_code
-print rec.area_code
-print rec.weather_code
-print rec.weather_name
-print rec.mcc
-print rec.mnc
-print rec.mobile_brand
-print rec.elevation
-print rec.usage_type
-print("\nYou may download the DB24 sample BIN at https://www.ip2location.com/downloads/sample6.bin.db24.zip for full data display.")
+print("Country Code          : " + rec.country_short)
+print("Country Name          : " + rec.country_long)
+print("Region Name           : " + rec.region)
+print("City Name             : " + rec.city)
+print("ISP Name              : " + rec.isp)
+print("Latitude              : " + str(rec.latitude))
+print("Longitude             : " + str(rec.longitude))
+print("Domain Name           : " + rec.domain)
+print("ZIP Code              : " + rec.zipcode)
+print("Time Zone             : " + rec.timezone)
+print("Net Speed             : " + rec.netspeed)
+print("Area Code             : " + rec.idd_code)
+print("IDD Code              : " + rec.area_code)
+print("Weather Station Code  : " + rec.weather_code)
+print("Weather Station Name  : " + rec.weather_name)
+print("MCC                   : " + rec.mcc)
+print("MNC                   : " + rec.mnc)
+print("Mobile Carrier        : " + rec.mobile_brand)
+print("Elevation             : " + str(rec.elevation))
+print("Usage Type            : " + rec.usage_type)
+print("Address Type          : " + rec.address_type)
+print("Category              : " + rec.category)
+print("\nYou may download the DB25 sample BIN at https://www.ip2location.com/downloads/sample6.bin.db25.zip for full data display.")
 
 database.close()

data/IP2LOCATION-LITE-DB1.IPV6.BIN

@@ -4,7 +4,7 @@
 
 setup(
     name='ip2location_python_c',
-    version='1.0.0',
+    version='1.1.0',
     description='IP2Location Python library with C module to read geolocation information from IP2Location database',
     author='IP2Location',
     author_email='support@ip2location.com',