INTEGRITY: Add metadata for set.dat

Author: ShivangNagta

db_functions.py

@@ -107,6 +107,7 @@ def insert_fileset(
     transaction,
     log_text,
     conn,
+    set_dat_metadata="",
     ip="",
     username=None,
     skiplog=None,
@@ -162,7 +163,7 @@ def insert_fileset(
         return (existing_entry, True)
 
     # $game and $key should not be parsed as a mysql string, hence no quotes
-    query = f"INSERT INTO fileset (game, status, src, `key`, megakey, `timestamp`) VALUES ({game}, '{status}', '{src}', {key}, {megakey}, FROM_UNIXTIME(@fileset_time_last))"
+    query = f"INSERT INTO fileset (game, status, src, `key`, megakey, `timestamp`, set_dat_metadata) VALUES ({game}, '{status}', '{src}', {key}, {megakey}, FROM_UNIXTIME(@fileset_time_last), '{escape_string(set_dat_metadata)}')"
     fileset_id = -1
     with conn.cursor() as cursor:
         cursor.execute(query)
@@ -968,6 +969,11 @@ def set_process(
         megakey = ""
         log_text = f"State {source_status}."
 
+        set_dat_metadata = ""
+        for meta in fileset:
+            if meta != "rom":
+                set_dat_metadata += meta + " = " + fileset[meta] + "  ,  "
+
         (fileset_id, existing) = insert_new_fileset(
             fileset,
             conn,
@@ -978,8 +984,10 @@ def set_process(
             transaction_id,
             log_text,
             user,
+            set_dat_metadata=set_dat_metadata,
             skiplog=skiplog,
         )
+
         if existing:
             continue
 
@@ -2030,6 +2038,7 @@ def insert_new_fileset(
     transaction_id,
     log_text,
     user,
+    set_dat_metadata="",
     ip="",
     skiplog=False,
 ):
@@ -2042,6 +2051,7 @@ def insert_new_fileset(
         log_text,
         conn,
         username=user,
+        set_dat_metadata=set_dat_metadata,
         ip=ip,
         skiplog=skiplog,
     )

fileset.py

@@ -155,18 +155,32 @@ def fileset():
                 (id,),
             )
             row = cursor.fetchone()
-            print(row)
             if row:
                 id = row["fileset"]
-            cursor.execute(f"SELECT * FROM fileset WHERE id = {id}")
+            cursor.execute("SELECT status FROM fileset WHERE id = %s", (id,))
+            status = cursor.fetchone()["status"]
+
+            if status == "dat":
+                cursor.execute(
+                    """SELECT id, game, status, src, `key`, megakey, `delete`, timestamp, set_dat_metadata FROM fileset WHERE id = %s""",
+                    (id,),
+                )
+            else:
+                cursor.execute(
+                    """SELECT id, game, status, src, `key`, megakey, `delete`, timestamp, detection_size, user_count FROM fileset WHERE id = %s""",
+                    (id,),
+                )
+
             result = cursor.fetchone()
-            print(result)
             html += "<h3>Fileset details</h3>"
             html += "<table>\n"
             if result["game"]:
-                cursor.execute(
-                    f"SELECT game.name as 'game name', engineid, gameid, extra, platform, language FROM fileset JOIN game ON game.id = fileset.game JOIN engine ON engine.id = game.engine WHERE fileset.id = {id}"
-                )
+                if status == "dat":
+                    query = """SELECT game.name as 'game name', engineid, gameid, extra, platform, language, fileset.set_dat_metadata FROM fileset JOIN game ON game.id = fileset.game JOIN engine ON engine.id = game.engine WHERE fileset.id = %s"""
+                else:
+                    query = """SELECT game.name as 'game name', engineid, gameid, extra, platform, language FROM fileset JOIN game ON game.id = fileset.game JOIN engine ON engine.id = game.engine WHERE fileset.id = %s"""
+                print(query)
+                cursor.execute(query, (id,))
                 result = {**result, **cursor.fetchone()}
             else:
                 # result.pop('key', None)

schema.py

@@ -209,6 +209,15 @@ def init_database():
     except Exception:
         cursor.execute("ALTER TABLE log MODIFY COLUMN `text` varchar(5000);")
 
+    try:
+        cursor.execute(
+            "ALTER TABLE fileset ADD COLUMN set_dat_metadata varchar(5000) DEFAULT 'UTF-8';"
+        )
+    except Exception:
+        cursor.execute(
+            "ALTER TABLE fileset MODIFY COLUMN set_dat_metadata varchar(5000) DEFAULT 'UTF-8';"
+        )
+
     for index, definition in indices.items():
         try:
             cursor.execute(definition)