INTEGRITY: Continue with user.dat

apache2-config/gamesdb.sev.zone.conf

@@ -4,12 +4,24 @@
     ServerAdmin webmaster@localhost
     CustomLog ${APACHE_LOG_DIR}/integrity-access.log combined
     ErrorLog ${APACHE_LOG_DIR}/integrity-error.log
-    DocumentRoot /home/ubuntu/projects/python/scummvm-sites
-    WSGIDaemonProcess scummvm-sites user=www-data group=www-data threads=5
-    WSGIScriptAlias / /home/ubuntu/projects/python/scummvm-sites/app.wsgi
+    DocumentRoot /home/ubuntu/projects/python/scummvm_sites_2025/scummvm-sites
+    WSGIDaemonProcess scummvm-sites \
+        user=www-data group=www-data threads=5 \
+        python-home=/home/ubuntu/projects/python/scummvm_sites_2025/scummvm-sites/venv
+    WSGIProcessGroup scummvm-sites
+    WSGIScriptAlias / /home/ubuntu/projects/python/scummvm_sites_2025/scummvm-sites/app.wsgi
 
-    <Directory /home/ubuntu/projects/python/scummvm-sites>
-        Require all granted
+    <Directory /home/ubuntu/projects/python/scummvm_sites_2025/scummvm-sites>
+        AuthType Basic
+	    AuthName "nope"
+	    AuthUserFile /home/ubuntu/projects/python/scummvm_sites_2025/.htpasswd
+	    Require valid-user
     </Directory>
 
+    <Location "/validate">
+        AuthType None
+        Require all granted
+        Satisfy Any
+    </Location>
+
 </VirtualHost>

app.wsgi

@@ -0,0 +1,12 @@
+import sys
+import logging
+
+sys.path.insert(0, "/home/ubuntu/projects/python/scummvm_sites_2025/scummvm-sites")
+
+from fileset import app as application
+
+logging.basicConfig(stream=sys.stderr)
+sys.stderr = sys.stdout
+
+if __name__ == "__main__":
+    application.run()

compute_hash.py

@@ -553,7 +553,8 @@ def extract_macbin_filename_from_header(file):
         header = f.read(128)
         name_len = header[1]
         filename_bytes = header[2 : 2 + name_len]
-        return filename_bytes.decode("utf-8")
+        filename = filename_bytes.decode("mac_roman")
+        return filename
 
 
 def file_classification(filepath):
@@ -562,7 +563,8 @@ def file_classification(filepath):
 
     # 1. Macbinary
     if is_macbin(filepath):
-        return [FileType.MAC_BINARY, extract_macbin_filename_from_header(filepath)]
+        base_name = extract_macbin_filename_from_header(filepath)
+        return [FileType.MAC_BINARY, base_name]
 
     # 2. Appledouble .rsrc
     if is_appledouble_rsrc(filepath):
@@ -816,7 +818,7 @@ def create_dat_file(hash_of_dirs, path, checksum_size=0):
                 timestamp,
             ) in hash_of_dir.items():
                 filename = encode_path_components(filename)
-                data = f"name '{filename}' size {size} size-r {size_r} size-rd {size_rd} modification-time {timestamp}"
+                data = f"""name "{filename}" size {size} size-r {size_r} size-rd {size_rd} modification-time {timestamp}"""
                 for key, value in hashes:
                     data += f" {key} {value}"
 

dat_parser.py

@@ -1,5 +1,6 @@
 import re
 import os
+import sys
 from db_functions import db_insert, match_fileset
 import argparse
 
@@ -79,21 +80,40 @@ def match_outermost_brackets(input):
     depth = 0
     inside_quotes = False
     cur_index = 0
+    line_number = 1
+    index_line = 1
 
-    for i in range(len(input)):
-        char = input[i]
+    for i, char in enumerate(input):
+        if char == "\n":
+            line_number += 1
+            inside_quotes = False
 
-        if char == "(" and not inside_quotes:
+        if char == '"' and input[i - 1] != "\\":
+            inside_quotes = not inside_quotes
+
+        elif char == "(" and not inside_quotes:
             if depth == 0:
+                if "rom" in input[i - 4 : i]:
+                    raise ValueError(
+                        f"Missing an opening '(' for the game. Look near line {line_number}."
+                    )
+                index_line = line_number
                 cur_index = i
             depth += 1
+
         elif char == ")" and not inside_quotes:
+            if depth == 0:
+                print(f"Warning: unmatched ')' at line {line_number}")
+                continue
             depth -= 1
             if depth == 0:
                 match = input[cur_index : i + 1]
                 matches.append((match, cur_index))
-        elif char == '"' and input[i - 1] != "\\":
-            inside_quotes = not inside_quotes
+
+    if depth != 0:
+        raise ValueError(
+            f"Unmatched '(' starting at line {index_line}: possibly an unclosed block."
+        )
 
     return matches
 
@@ -104,61 +124,102 @@ def parse_dat(dat_filepath):
     associated arrays
     """
     if not os.path.isfile(dat_filepath):
-        print("File not readable")
-        return
+        print(f"Error: File does not exist or is unreadable: {dat_filepath}.")
+        return None
 
-    with open(dat_filepath, "r", encoding="utf-8") as dat_file:
-        content = dat_file.read()
+    try:
+        with open(dat_filepath, "r", encoding="utf-8") as dat_file:
+            content = dat_file.read()
+    except (IOError, UnicodeDecodeError) as e:
+        print(f"Error: Failed to read file {dat_filepath}: {e}")
+        return None
 
     header = {}
     game_data = []
     resources = {}
 
-    matches = match_outermost_brackets(content)
-    # print(matches)
+    try:
+        matches = match_outermost_brackets(content)
+    except Exception as e:
+        print(f"Error: Failed to parse outer brackets in {dat_filepath}: {e}")
+        return None
     if matches:
         for data_segment in matches:
-            if (
-                "clrmamepro" in content[data_segment[1] - 11 : data_segment[1]]
-                or "scummvm" in content[data_segment[1] - 8 : data_segment[1]]
-            ):
-                header = map_key_values(data_segment[0], header)
-            elif "game" in content[data_segment[1] - 5 : data_segment[1]]:
-                temp = {}
-                temp = map_key_values(data_segment[0], temp)
-                game_data.append(temp)
-            elif "resource" in content[data_segment[1] - 9 : data_segment[1]]:
-                temp = {}
-                temp = map_key_values(data_segment[0], temp)
-                resources[temp["name"]] = temp
-    # print(header, game_data, resources, dat_filepath)
+            try:
+                if (
+                    "clrmamepro" in content[data_segment[1] - 11 : data_segment[1]]
+                    or "scummvm" in content[data_segment[1] - 8 : data_segment[1]]
+                ):
+                    header = map_key_values(data_segment[0], header)
+                elif "game" in content[data_segment[1] - 5 : data_segment[1]]:
+                    temp = {}
+                    temp = map_key_values(data_segment[0], temp)
+                    game_data.append(temp)
+                elif "resource" in content[data_segment[1] - 9 : data_segment[1]]:
+                    temp = {}
+                    temp = map_key_values(data_segment[0], temp)
+                    resources[temp["name"]] = temp
+            except Exception as e:
+                print(f"Error: Failed to parse a data_segment: {e}")
+                return None
+
     return header, game_data, resources, dat_filepath
 
 
 def main():
-    parser = argparse.ArgumentParser(
-        description="Process DAT files and interact with the database."
-    )
-    parser.add_argument(
-        "--upload", nargs="+", help="Upload DAT file(s) to the database"
-    )
-    parser.add_argument(
-        "--match", nargs="+", help="Populate matching games in the database"
-    )
-    parser.add_argument("--user", help="Username for database")
-    parser.add_argument("-r", help="Recurse through directories", action="store_true")
-    parser.add_argument("--skiplog", help="Skip logging dups", action="store_true")
-
-    args = parser.parse_args()
-
-    if args.upload:
-        for filepath in args.upload:
-            db_insert(parse_dat(filepath), args.user, args.skiplog)
-
-    if args.match:
-        for filepath in args.match:
-            # print(parse_dat(filepath)[2])
-            match_fileset(parse_dat(filepath), args.user, args.skiplog)
+    try:
+        parser = argparse.ArgumentParser(
+            description="Process DAT files and interact with the database."
+        )
+        parser.add_argument(
+            "--upload", nargs="+", help="Upload DAT file(s) to the database"
+        )
+        parser.add_argument(
+            "--match", nargs="+", help="Populate matching games in the database"
+        )
+        parser.add_argument("--user", help="Username for database")
+        parser.add_argument(
+            "-r", help="Recurse through directories", action="store_true"
+        )
+        parser.add_argument("--skiplog", help="Skip logging dups", action="store_true")
+
+        args = parser.parse_args()
+
+        if not args.upload and not args.match:
+            print("Error: No action specified. Use --upload or --match")
+            parser.print_help()
+            sys.exit(1)
+
+        if args.upload:
+            for filepath in args.upload:
+                try:
+                    parsed_data = parse_dat(filepath)
+                    if parsed_data is not None:
+                        db_insert(parsed_data, args.user, args.skiplog)
+                    else:
+                        print(f"Error: Failed to parse file for upload: {filepath}")
+                except Exception as e:
+                    print(f"Error uploading {filepath}: {e}")
+                    continue
+
+        if args.match:
+            for filepath in args.match:
+                try:
+                    parsed_data = parse_dat(filepath)
+                    if parsed_data[0] is not None:
+                        match_fileset(parsed_data, args.user, args.skiplog)
+                    else:
+                        print(f"Error: Failed to parse file for matching: {filepath}")
+                except Exception as e:
+                    print(f"Error matching {filepath}: {e}")
+                    continue
+
+    except KeyboardInterrupt:
+        print("Operation cancelled by user")
+        sys.exit(0)
+    except Exception as e:
+        print(f"Error: Unexpected error in main: {e}")
+        sys.exit(1)
 
 
 if __name__ == "__main__":