fix delete level

Author: noisecode3

database/.gitignore

@@ -1,3 +1,4 @@
+tombll.db.bak
 data.json
 file_info.json
 __pycache__

database/tombll_common.py

@@ -9,7 +9,7 @@ def get_tombll_json(path):
     """Load and parse a JSON file from a specified path.
 
     Attempts to open and read a JSON file, parsing its content into a dictionary.
-    Handles errors for file not found, JSON decoding issues, and other I/O problems.
+    Exit on errors for file not found, JSON decoding issues, and other I/O problems.
 
     Args:
         path (str): The path to the JSON file.
@@ -52,7 +52,7 @@ def query_return_everything(query, params, con):
 
     Args:
         query (str): The SQL query to execute. Expected to be a SELECT or similar.
-        params (tuple): A tuple of parameters to safely bind to the query.
+        params (tuple or None): A tuple of parameters to safely bind to the query.
         con (sqlite3.Connection): An open SQLite database connection.
 
     Returns:
@@ -92,9 +92,12 @@ def query_return_id(query, params, con):
     For other queries, it fetches and returns the first integer result, if it exists and is
     non-negative.
 
+    If a database error occurs, the error is logged, any open transaction is rolled back,
+    and the program exits with an error status.
+
     Args:
         query (str): SQL query to execute.
-        params (tuple): Parameters for the query.
+        params (tuple or None): Parameters for the query.
         con (sqlite3.Connection): SQLite database connection.
 
     Returns:
@@ -105,8 +108,12 @@ def query_return_id(query, params, con):
     """
     cursor = con.cursor()
     try:
-        # Execute the query with provided parameters
-        cursor.execute(query, params)
+        if params:
+            # Execute the query with the given parameters
+            cursor.execute(query, params)
+        else:
+            # Execute the query without parameters
+            cursor.execute(query)
 
         # Check if it's an INSERT query to return the last inserted row ID
         if query.strip().upper().startswith("INSERT"):
@@ -129,18 +136,26 @@ def query_return_id(query, params, con):
 def query_run(query, params, con):
     """Execute a SQL query with the provided parameters.
 
+    If a database error occurs, the error is logged, any open transaction is rolled back,
+    and the program exits with an error status.
+
     Args:
         query (str): The SQL query to execute.
-        params (tuple): Parameters to substitute in the SQL query.
+        params (tuple or None): Parameters to substitute in the SQL query.
         con (sqlite3.Connection): SQLite database connection.
 
     Exits:
         Logs an error and exits if a database error occurs.
     """
     cursor = con.cursor()
     try:
-        # Execute the query with provided parameters
-        cursor.execute(query, params)
+        if params:
+            # Execute the query with the given parameters
+            cursor.execute(query, params)
+        else:
+            # Execute the query without parameters
+            cursor.execute(query)
+
     except sqlite3.DatabaseError as db_error:
         # Log the database error and exit the program
         logging.error("Database error occurred: %s", db_error)
@@ -157,6 +172,6 @@ def make_empty_null(value):
     Returns:
         None if the value is an empty string or exactly 0.0; otherwise, returns the original value.
     """
-    if value in ("", 0.0):
+    if value in ("", 0.0, 0):
         return None
     return value

database/tombll_create.py

@@ -291,14 +291,14 @@ def database_info(data, con):
         VALUES (?, ?, ?, ?, ?, ?, ?, ?)
     '''
     arg = (
-        data.get('title'),          # Title of the level
-        data.get('release'),        # Release date
-        info_difficulty_id,         # Retrieved or NULL difficulty ID
-        info_duration_id,           # Retrieved or NULL duration ID
-        info_type_id,               # Retrieved or NULL type ID
-        info_class_id,              # Retrieved or NULL class ID
-        data.get('trle_id'),        # TRLE ID if available
-        data.get('trcustoms_id')    # TRCustoms ID if available
+        data.get('title'),      # Title of the level
+        data.get('release'),    # Release date
+        info_difficulty_id,     # Retrieved or NULL difficulty ID
+        info_duration_id,       # Retrieved or NULL duration ID
+        info_type_id,           # Retrieved or NULL type ID
+        info_class_id,          # Retrieved or NULL class ID
+        tombll_common.make_empty_null(data.get('trle_id')),        # TRLE ID if available
+        tombll_common.make_empty_null(data.get('trcustoms_id'))    # TRCustoms ID if available
     )
 
     return tombll_common.query_return_id(query, arg, con)