Added error handling for few cases.

Author: ip2location-com

ip2location_csv_converter/commandline.py

@@ -55,6 +55,20 @@ def main():
         conversion_mode = 'range'
         write_mode = 'replace'
 
+        if (re.search(regex1, input_file) != None):
+            print (f"Invalid input {input_file} detected for input filename. Please check again.")
+            sys.exit(1)
+        if (re.search(regex2, input_file) != None):
+            print (f"Invalid input {input_file} detected for input filename. Please check again.")
+            sys.exit(1)
+        
+        if (re.search(regex1, output_file) != None):
+            print (f"Invalid input {output_file} detected for input filename. Please check again.")
+            sys.exit(1)
+        if (re.search(regex2, output_file) != None):
+            print (f"Invalid input {output_file} detected for input filename. Please check again.")
+            sys.exit(1)
+        
         if ((os.path.isfile(input_file)) is False):
             print ("File doesn't exist! Please check again.")
             sys.exit(1)
@@ -67,6 +81,9 @@ def main():
             if param2 == '':
                 print ("Please provide the database type of the CSV file.")
                 sys.exit(1)
+            elif (re.search(regex2, param2) != None):
+                print ("Please provide the database type of the CSV file.")
+                sys.exit(1)
             print(f'Converting {input_file} to {output_file} now...')
             csv_to_parquet(input_file, output_file, param2)
             print(f'Conversion done.')

ip2location_csv_converter/ip2location_csv_converter.py

@@ -305,9 +305,13 @@ def csv_to_parquet(input_file, output_file, db_type):
     last_line = get_last_row(csv_file)
 
     df_last = pd.read_csv(StringIO(last_line), header=None)
+    
+    # Check the number of column against the header row
+    if len(column_names) != df_last.shape[1]:
+        print(f"Column numbers not matching, aborting now...")
+        sys.exit(1)
+    
     ip_value = df_last.iloc[0, 0]  # Replace with actual index
-    # print("Is IPv6?", is_ipv6(ip_value))
-    # print(f"{ip_value} is {detect_ip_version_from_number(ip_value)}")
     ip_ver = detect_ip_version_from_number(ip_value)
 
     if column_names != '':

setup.py

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