cleaned up the Silent Hill 2 Remake plugin. It's more robust now.

Author: Jim

games/game_silenthill2remake.py

@@ -1,20 +1,82 @@
 from ..basic_game import BasicGame
 import mobase
+from ..basic_features import BasicModDataChecker, GlobPatterns
+from typing import Tuple
 
-class SilentHill2RemakeModDataChecker(mobase.ModDataChecker):
+class SilentHill2RemakeModDataChecker(BasicModDataChecker):
     def __init__(self):
-        super().__init__()
-        self.validDirNames = [
-            "."
-        ]
+        super().__init__(
+            GlobPatterns(
+                delete=[
+                    "*.txt",
+                    "*.md",
+                    "manifest.json",
+                    "icon.png",
+                ],
+            )
+        )
+        self.mod_path = ["SHProto", "Content", "Paks", "~mod"]
+        self.mod_path_lower = [name.lower() for name in self.mod_path]
 
-    def dataLooksValid(self, filetree: mobase.IFileTree) -> mobase.ModDataChecker.CheckReturn:
+    def _find_tree(self, filetree: mobase.IFileTree) -> Tuple[str | None, mobase.IFileTree | None]:
+        """
+        Search the given filetree for a directory name that matches any component
+        of self.mod_path (case-insensitive).
+
+        Returns:
+            (prefix, entry)
+            prefix: The missing part before the match (e.g. 'SHProto/Content/')
+            entry:  The IFileTree entry that matched (e.g. the 'Paks' directory)
+            (None, None) if nothing matches.
+        """
         for entry in filetree:
             if not entry.isDir():
                 continue
-            if entry.name().casefold() in (name.casefold() for name in self.validDirNames):
-                return mobase.ModDataChecker.VALID
+
+            name_lower = entry.name().lower()
+            for i, component in enumerate(self.mod_path_lower):
+                if name_lower == component:
+                    # Build the prefix string for everything *before* this match
+                    prefix_parts = self.mod_path[:i]
+                    prefix = "/".join(prefix_parts) + ("/" if prefix_parts else "")
+                    return (prefix, entry)
+
+        # No matches found
+        return (None, None)
+
+
+    def dataLooksValid(self, filetree: mobase.IFileTree) -> mobase.ModDataChecker.CheckReturn:
+        # Check for fully valid layout
+        has_entry,_ = self._find_tree(filetree)
+        if has_entry is None:
+            for entry in filetree:
+                if entry.name().lower().endswith(".pak") and entry.isFile():
+                    return mobase.ModDataChecker.FIXABLE
+        elif has_entry is "":
+            return mobase.ModDataChecker.VALID
+        else:
+            return mobase.ModDataChecker.FIXABLE
+
+        # Otherwise, not recognizable
         return mobase.ModDataChecker.INVALID
+    
+    def fix(self, filetree: mobase.IFileTree) -> mobase.IFileTree:
+        filetree = super().fix(filetree)
+        prefix, item = self._find_tree(filetree)
+        if prefix is None:
+            foundAPak = False
+            # Move all top-level items to BepInEx/plugins/
+            items_to_move = list(filetree)
+            for item in items_to_move:
+                if item.name().lower().endswith(".pak"):
+                    foundAPak = True
+                filetree.move(item, f"SHProto/Content/Paks/~mod/{item.name()}")
+            return filetree if foundAPak else None
+        elif prefix is "":
+            return filetree
+        else:
+            filetree.move(item, f"{prefix}{item.name()}")
+            return filetree
 
 class SilentHill2RemakeGame(BasicGame):
     def init(self, organizer: mobase.IOrganizer) -> bool:
@@ -32,19 +94,7 @@ def init(self, organizer: mobase.IOrganizer) -> bool:
 
     GameBinary = "SHProto/Binaries/Win64/SHProto-Win64-Shipping.exe"
     GameLauncher = "SHProto.exe"
-    #GameDataPath = "%GAME_PATH%/SHProto/Content/Paks/~mods"
-    GameDataPath = "%GAME_PATH%/SHProto/Content"
+    GameDataPath = "%GAME_PATH%"
     GameSupportURL = "https://github.com/ModOrganizer2/modorganizer-basic_games/wiki/Game:-Silent-Hill-2-Remake"
 
-    GameGogId = [1225972913, 2051029707]
-
-    # def executables(self):
-    #     return [
-    #         {
-    #             "name": "Silent Hill 2 Remake",
-    #             "binary": self.GameBinary,
-    #         }
-    #     ]
-
-    # def dataDirectory(self):
-    #     return self._gamePath + "/SHProto/Content/Paks"
+    GameGogId = [1225972913, 2051029707]