Several updates

- Fixed the issue where the command line will throw unexpected error if the input parameter is not sufficient.
- Improved a few messages to be more informative.
- Added a ValueError error handling to handle possible error when converting IP number to IP address.

Author: ip2location-com

ip2location_csv_converter/commandline.py

@@ -19,10 +19,10 @@ def print_usage():
 "  IP numbers will be converted into hexadecimal format. (auto padding)\n"
 "\n"
 "  -hex4\n"
-"  	IP numbers will be converted into hexadecimal format. (pad IPv4)\n"
+"  IP numbers will be converted into hexadecimal format. (pad IPv4)\n"
 "\n"
 "  -hex6\n"
-"  	IP numbers will be converted into hexadecimal format. (pad IPv6)\n"
+"  IP numbers will be converted into hexadecimal format. (pad IPv6)\n"
 "\n"
 "  -replace\n"
 "  The IP numbers in will be replaced to the selected format.\n"
@@ -35,6 +35,8 @@ def print_usage():
     )
 
 def main():
+    param1 = ''
+    param2 = ''
     if (len(sys.argv) > 2):
         # print (sys.argv)
         if (len(sys.argv) == 3):
@@ -50,15 +52,16 @@ def main():
             input_file = sys.argv[3]
             output_file = sys.argv[4]
 
+        conversion_mode = 'range'
+        write_mode = 'replace'
+        
         if ((os.path.isfile(input_file)) is False):
             print ("File doesn't exist! Please check again.")
             sys.exit(1)
         else:
             if (check_data_validity(input_file)  is False):
                 print ("Please make sure the columns had comma as separator.")
                 sys.exit(1)
-        regex1 = r"^\-(range|cidr|hex|hex4|hex6)$"
-        regex2 = r"^\-(replace|append)$"
         if (re.search(regex1, param1) != None):
             conversion_mode = re.findall(regex1, param1)[0]
         elif (re.search(regex2, param1) != None):
@@ -74,4 +77,5 @@ def main():
 
     else :
         print ("You must enter at least 2 parameters.")
+        print ("Run \"ip2location-csv-converter -help\" to learn on the available parameters.")
         sys.exit(1)

ip2location_csv_converter/ip2location_csv_converter.py

@@ -9,13 +9,17 @@
 # chunk_size = 10000
 
 def no2ip(iplong):
-    if (int(iplong) > 4294967295):
-        if sys.version < '3':
-            return ipaddress.ip_address(long(iplong)).__str__()
+    try:
+        if (int(iplong) > 4294967295):
+            if sys.version < '3':
+                return ipaddress.ip_address(long(iplong)).__str__()
+            else:
+                return ipaddress.ip_address(int(iplong)).__str__()
         else:
-            return ipaddress.ip_address(int(iplong)).__str__()
-    else:
-        return (socket.inet_ntoa(struct.pack('!I', int(iplong))))
+            return (socket.inet_ntoa(struct.pack('!I', int(iplong))))
+    except ValueError:
+        print(f'Invalid IP number value {iplong} detected. Please fix it before continue.')
+        sys.exit(1)
 
 def check_data_validity(file):
     with open(file, newline = "") as csvfile:
@@ -28,7 +32,7 @@ def check_data_validity(file):
 def range_number_to_ip(row, write_mode):
     from_ip = no2ip(row[0])
     to_ip = no2ip(row[1])
-    # print (from_ip, to_ip)
+    print (from_ip, to_ip)
     total_row = len(row)
     remaining_columns = ''
     for i in range(2, total_row):
@@ -163,7 +167,7 @@ def convert_to_csv(input_file, output_file, conversion_mode, write_mode):
                     my_list.append(new_row.decode('utf-8'))
                 else:
                     # detect_eol(new_row)
-                    print(repr(new_row))
+                    # print(repr(new_row))
                     my_list.append(new_row)
 
             if (len(my_list) > 0):

setup.py

@@ -10,7 +10,7 @@
 
 setuptools.setup(
     name="ip2location-python-csv-converter",
-    version="1.2.6",
+    version="1.2.7",
     description="Python script to converts IP2Location CSV database into IP range or CIDR format.",
     long_description_content_type="text/markdown",
     long_description=long_description,