Cleanup.

Fixed Stalker Anomaly Content Indexing.

Author: TsunaMoo

games/game_cassettebeasts.py

@@ -23,7 +23,7 @@
 from ..basic_game import BasicGame
 
 
-def json_get_me(value: Any, path: Sequence[str | int], /, default: Any) -> Any:
+def jsonGetMe(value: Any, path: Sequence[str | int], /, default: Any) -> Any:
     for part in path:
         if type(part) not in (str, int) or type(value) not in (dict, list):
             return default
@@ -120,10 +120,10 @@ def __init__(self, filepath: Path):
                 err.__class__.__name__, s
             )
             return
-        x = json_get_me(save_data, ["party", "player", "custom", "name"], None)
+        x = jsonGetMe(save_data, ["party", "player", "custom", "name"], None)
         if type(x) is str:
             self.name = x
-        x = json_get_me(save_data, ["saved_datetime"], None)
+        x = jsonGetMe(save_data, ["saved_datetime"], None)
         if type(x) in (int, float):
             try:
                 dt = datetime.fromtimestamp(float(x))
@@ -135,14 +135,14 @@ def __init__(self, filepath: Path):
                         dt.year, dt.month, dt.day, dt.hour, dt.minute, dt.second
                     )
                 )
-        x = json_get_me(save_data, ["play_time"], None)
+        x = jsonGetMe(save_data, ["play_time"], None)
         if type(x) in (int, float):
             a = [0, 0, 0, int(x * 10)]
             a[2:4] = divmod(a[3], 10)
             a[1:3] = divmod(a[2], 60)
             a[0:2] = divmod(a[1], 60)
             self.elapsed = "{0:02d}:{1:02d}:{2:02d}.{3:01d}".format(*a)
-        x = json_get_me(save_data, ["has_cheated"], None)
+        x = jsonGetMe(save_data, ["has_cheated"], None)
         if type(x) is bool:
             self.cheated = "Yes" if x else "No"
 
@@ -219,7 +219,7 @@ def listSaves(self, folder: QDir) -> list[mobase.ISaveGame]:
         ]
 
     @cached_property
-    def _base_dlls(self) -> set[str]:
+    def baseDlls(self) -> set[str]:
         base_dir = Path(self.gameDirectory().absolutePath())
         return {str(f.relative_to(base_dir)) for f in base_dir.glob("*.dll")}
 
@@ -236,7 +236,7 @@ def executableForcedLoads(self) -> list[mobase.ExecutableForcedLoadSetting]:
             return efls
         for e in tree:
             relpath = e.pathFrom(tree)
-            if relpath and e.hasSuffix("dll") and relpath not in self._base_dlls:
+            if relpath and e.hasSuffix("dll") and relpath not in self.baseDlls:
                 libs.add(relpath)
         exes = self.executables()
         efls = efls + [

games/game_crimeboss.py

@@ -71,10 +71,10 @@ class CrimeBossModDataChecker(mobase.ModDataChecker):
     def __init__(self, organizer: mobase.IOrganizer):
         super().__init__()
         self.organizer: mobase.IOrganizer = organizer
-        self.organizer.modList().onModInstalled(self._Fix_Installed_Mod)
+        self.organizer.modList().onModInstalled(self.fixInstalledMod)
         self.needsNameFix = False
 
-    def move_overwrite_merge(self, source: str, destination: str):
+    def moveOverwriteMerge(self, source: str, destination: str):
         if not os.path.exists(destination):
             shutil.move(source, destination)
             return
@@ -84,10 +84,10 @@ def move_overwrite_merge(self, source: str, destination: str):
         for item in os.listdir(source):
             s_item = os.path.join(source, item)
             d_item = os.path.join(destination, item)
-            self.move_overwrite_merge(s_item, d_item)
+            self.moveOverwriteMerge(s_item, d_item)
         os.rmdir(source)
 
-    def _Fix_Installed_Mod(self, mod: mobase.IModInterface):
+    def fixInstalledMod(self, mod: mobase.IModInterface):
         if not self.needsNameFix:
             return
         GameDataNativeMods = getattr(
@@ -102,7 +102,7 @@ def _Fix_Installed_Mod(self, mod: mobase.IModInterface):
             path = mod.absolutePath()
             old_path = os.path.join(path, GameDataNativeMods + "/FOLDERNAME")
             new_path = os.path.join(path, GameDataNativeMods + f"/{modname}")
-            self.move_overwrite_merge(old_path, new_path)
+            self.moveOverwriteMerge(old_path, new_path)
             fixed = True
         if not fixed:
             return
@@ -265,10 +265,10 @@ def init(self, organizer: mobase.IOrganizer) -> bool:
         self.dataChecker = CrimeBossModDataChecker(organizer)
         self._register_feature(self.dataChecker)
         self._register_feature(CrimeBossModDataContent())
-        organizer.onUserInterfaceInitialized(self.init_tab)
+        organizer.onUserInterfaceInitialized(self.initTab)
         return True
 
-    def init_tab(self, main_window: QMainWindow):
+    def initTab(self, main_window: QMainWindow):
         if self._organizer.managedGame() != self:
             return
         self._main_window = main_window
@@ -294,7 +294,7 @@ def executables(self):
         ]
 
     @cached_property
-    def _base_dlls(self) -> set[str]:
+    def baseDlls(self) -> set[str]:
         base_dir = Path(self.gameDirectory().absolutePath())
         return {str(f.relative_to(base_dir)) for f in base_dir.glob("*.dll")}
 
@@ -311,7 +311,7 @@ def executableForcedLoads(self) -> list[mobase.ExecutableForcedLoadSetting]:
             return efls
         for e in tree:
             relpath = e.pathFrom(tree)
-            if relpath and e.hasSuffix("dll") and relpath not in self._base_dlls:
+            if relpath and e.hasSuffix("dll") and relpath not in self.baseDlls:
                 libs.add(relpath)
         exes = self.executables()
         efls = efls + [
@@ -332,7 +332,7 @@ def ue4ssDirectory(self) -> QDir:
     def nativeDirectory(self) -> QDir:
         return QDir(self.dataDirectory().absolutePath() + "/" + self.GameDataNativeMods)
 
-    def write_default_mods(self, profile: QDir):
+    def writeDefaultMods(self, profile: QDir):
         ue4ss_mods_txt = QFileInfo(profile.absoluteFilePath("mods.txt"))
         ue4ss_mods_json = QFileInfo(profile.absoluteFilePath("mods.json"))
         if not ue4ss_mods_txt.exists():
@@ -350,7 +350,7 @@ def iniFiles(self):
         return ["GameUserSettings.ini", "Input.ini"]
 
     def initializeProfile(self, directory: QDir, settings: mobase.ProfileSetting):
-        self.write_default_mods(directory)
+        self.writeDefaultMods(directory)
         if not self.paksDirectory().exists():
             os.makedirs(self.paksDirectory().absolutePath())
         if not self.ue4ssDirectory().exists():

games/game_emuvr.py

@@ -96,7 +96,7 @@ def iniFiles(self):
         return ["settings.ini"]
 
     @cached_property
-    def _base_dlls(self) -> set[str]:
+    def baseDlls(self) -> set[str]:
         base_dir = Path(self.gameDirectory().absolutePath())
         return {str(f.relative_to(base_dir)) for f in base_dir.glob("*.dll")}
 
@@ -113,7 +113,7 @@ def executableForcedLoads(self) -> list[mobase.ExecutableForcedLoadSetting]:
             return efls
         for e in tree:
             relpath = e.pathFrom(tree)
-            if relpath and e.hasSuffix("dll") and relpath not in self._base_dlls:
+            if relpath and e.hasSuffix("dll") and relpath not in self.baseDlls:
                 libs.add(relpath)
         exes = self.executables()
         efls = efls + [

games/game_hitman3.py

@@ -15,10 +15,10 @@ class Hitman3ModDataChecker(mobase.ModDataChecker):
     def __init__(self, organizer: mobase.IOrganizer):
         super().__init__()
         self.organizer: mobase.IOrganizer = organizer
-        self.organizer.modList().onModInstalled(self._Fix_Installed_Mod)
+        self.organizer.modList().onModInstalled(self.fixInstalledMod)
         self.needsNameFix = False
 
-    def move_overwrite_merge(self, source: str, destination: str):
+    def moveOverwriteMerge(self, source: str, destination: str):
         if not os.path.exists(destination):
             shutil.move(source, destination)
             return
@@ -28,10 +28,10 @@ def move_overwrite_merge(self, source: str, destination: str):
         for item in os.listdir(source):
             s_item = os.path.join(source, item)
             d_item = os.path.join(destination, item)
-            self.move_overwrite_merge(s_item, d_item)
+            self.moveOverwriteMerge(s_item, d_item)
         os.rmdir(source)
 
-    def _Fix_Installed_Mod(self, mod: mobase.IModInterface):
+    def fixInstalledMod(self, mod: mobase.IModInterface):
         if not self.needsNameFix:
             return
         GameSMMPath = getattr(self.organizer.managedGame(), "GameSMMPath", "")
@@ -51,7 +51,7 @@ def _Fix_Installed_Mod(self, mod: mobase.IModInterface):
             modname = mod_data["id"]
             old_path = os.path.join(path, GameSMMPath + "/Mods/FOLDERNAME")
             new_path = os.path.join(path, GameSMMPath + f"/Mods/{modname}")
-            self.move_overwrite_merge(old_path, new_path)
+            self.moveOverwriteMerge(old_path, new_path)
             fixed = True
         if not fixed:
             return
@@ -85,7 +85,7 @@ def allMoveTo(
         targettree.remove(sourcetree)
         return retVal
 
-    def first_tree(self, filetree: mobase.IFileTree) -> mobase.IFileTree | None:
+    def firstTree(self, filetree: mobase.IFileTree) -> mobase.IFileTree | None:
         for e in filetree:
             if isinstance(e, mobase.IFileTree) and e.isDir():
                 return e
@@ -103,7 +103,7 @@ def fix(self, filetree: mobase.IFileTree) -> mobase.IFileTree | None:
             if treefixed == 1:
                 self.needsNameFix = True
         elif len(filetree) == 1:
-            firsttreelayer: mobase.IFileTree | None = self.first_tree(filetree)
+            firsttreelayer: mobase.IFileTree | None = self.firstTree(filetree)
             if firsttreelayer is not None:
                 if firsttreelayer.exists("manifest.json", mobase.IFileTree.FILE):
                     print(GameSMMPath + "/Mods/FOLDERNAME/")
@@ -130,10 +130,10 @@ def init(self, organizer: mobase.IOrganizer) -> bool:
         super().init(organizer)
         self.dataChecker = Hitman3ModDataChecker(organizer)
         self._register_feature(self.dataChecker)
-        organizer.modList().onModStateChanged(self.update_smm_meta)
+        organizer.modList().onModStateChanged(self.updateSmmMeta)
         return True
 
-    def update_smm_meta(self, mods: dict[str, mobase.ModState]):
+    def updateSmmMeta(self, mods: dict[str, mobase.ModState]):
         SMM_Path = os.path.join(self.dataDirectory().absolutePath(), self.GameSMMPath)
         SMM_Config_Json = SMM_Path + "/config.json"
         for key, value in mods.items():
@@ -232,7 +232,7 @@ def executables(self):
         ]
 
     @cached_property
-    def _base_dlls(self) -> set[str]:
+    def baseDlls(self) -> set[str]:
         base_dir = Path(self.gameDirectory().absolutePath())
         return {str(f.relative_to(base_dir)) for f in base_dir.glob("*.dll")}
 
@@ -249,7 +249,7 @@ def executableForcedLoads(self) -> list[mobase.ExecutableForcedLoadSetting]:
             return efls
         for e in tree:
             relpath = e.pathFrom(tree)
-            if relpath and e.hasSuffix("dll") and relpath not in self._base_dlls:
+            if relpath and e.hasSuffix("dll") and relpath not in self.baseDlls:
                 libs.add(relpath)
         exes = self.executables()
         efls = efls + [

games/game_noita.py

@@ -14,10 +14,10 @@ class NoitaModDataChecker(mobase.ModDataChecker):
     def __init__(self, organizer: mobase.IOrganizer):
         super().__init__()
         self.organizer: mobase.IOrganizer = organizer
-        self.organizer.modList().onModInstalled(self._Fix_Installed_Mod)
+        self.organizer.modList().onModInstalled(self.fixInstalledMod)
         self.needsNameFix = False
 
-    def move_overwrite_merge(self, source: str, destination: str):
+    def moveOverwriteMerge(self, source: str, destination: str):
         if not os.path.exists(destination):
             shutil.move(source, destination)
             return
@@ -27,10 +27,10 @@ def move_overwrite_merge(self, source: str, destination: str):
         for item in os.listdir(source):
             s_item = os.path.join(source, item)
             d_item = os.path.join(destination, item)
-            self.move_overwrite_merge(s_item, d_item)
+            self.moveOverwriteMerge(s_item, d_item)
         os.rmdir(source)
 
-    def _Fix_Installed_Mod(self, mod: mobase.IModInterface):
+    def fixInstalledMod(self, mod: mobase.IModInterface):
         if not self.needsNameFix:
             return
         GameModsPath = getattr(self.organizer.managedGame(), "GameModsPath", "")
@@ -41,7 +41,7 @@ def _Fix_Installed_Mod(self, mod: mobase.IModInterface):
             path = mod.absolutePath()
             old_path = os.path.join(path, GameModsPath + "/FOLDERNAME")
             new_path = os.path.join(path, GameModsPath + f"/{modname}")
-            self.move_overwrite_merge(old_path, new_path)
+            self.moveOverwriteMerge(old_path, new_path)
             fixed = True
         if not fixed:
             return
@@ -119,7 +119,7 @@ def executables(self):
         ]
 
     @cached_property
-    def _base_dlls(self) -> set[str]:
+    def baseDlls(self) -> set[str]:
         base_dir = Path(self.gameDirectory().absolutePath())
         return {str(f.relative_to(base_dir)) for f in base_dir.glob("*.dll")}
 
@@ -136,7 +136,7 @@ def executableForcedLoads(self) -> list[mobase.ExecutableForcedLoadSetting]:
             return efls
         for e in tree:
             relpath = e.pathFrom(tree)
-            if relpath and e.hasSuffix("dll") and relpath not in self._base_dlls:
+            if relpath and e.hasSuffix("dll") and relpath not in self.baseDlls:
                 libs.add(relpath)
         exes = self.executables()
         efls = efls + [

games/game_oblivion_remaster.py

@@ -111,10 +111,10 @@ def init(self, organizer: mobase.IOrganizer) -> bool:
         self._register_feature(OblivionRemasteredScriptExtender(self))
         self._register_feature(OblivionRemasteredDataContent())
 
-        organizer.onUserInterfaceInitialized(self.init_tab)
+        organizer.onUserInterfaceInitialized(self.initTab)
         return True
 
-    def init_tab(self, main_window: QMainWindow):
+    def initTab(self, main_window: QMainWindow):
         """
         Initializes tabs unique to Oblivion Remastered.
         The "UE4SS Mods" tab and "Paks" tab.
@@ -261,7 +261,7 @@ def initializeProfile(
                     else:
                         Path(profile_ini).touch()
         # Initialize a default UE4SS mods.ini and mods.json with the core mods included
-        self.write_default_mods(directory)
+        self.writeDefaultMods(directory)
         # Bootstrap common mod directories used by the USVFS map
         if (
             self._organizer.managedGame()
@@ -274,7 +274,7 @@ def initializeProfile(
             if not self.ue4ssDirectory().exists():
                 os.makedirs(self.ue4ssDirectory().absolutePath())
 
-    def write_default_mods(self, profile: QDir):
+    def writeDefaultMods(self, profile: QDir):
         """
         Writer for the default UE4SS 'mods.txt' and 'mods.json' profile files.
         """

games/game_ovkwalkingdead.py

@@ -72,7 +72,7 @@ def __init__(self, organizer: mobase.IOrganizer):
         super().__init__()
         self.organizer: mobase.IOrganizer = organizer
 
-    def move_overwrite_merge(self, source: str, destination: str):
+    def moveOverwriteMerge(self, source: str, destination: str):
         if not os.path.exists(destination):
             shutil.move(source, destination)
             return
@@ -82,7 +82,7 @@ def move_overwrite_merge(self, source: str, destination: str):
         for item in os.listdir(source):
             s_item = os.path.join(source, item)
             d_item = os.path.join(destination, item)
-            self.move_overwrite_merge(s_item, d_item)
+            self.moveOverwriteMerge(s_item, d_item)
         os.rmdir(source)
 
     def dataLooksValid(
@@ -231,10 +231,10 @@ def init(self, organizer: mobase.IOrganizer) -> bool:
         self.dataChecker = OTWDModDataChecker(organizer)
         self._register_feature(self.dataChecker)
         self._register_feature(OTWDModDataContent())
-        organizer.onUserInterfaceInitialized(self.init_tab)
+        organizer.onUserInterfaceInitialized(self.initTab)
         return True
 
-    def init_tab(self, main_window: QMainWindow):
+    def initTab(self, main_window: QMainWindow):
         if self._organizer.managedGame() != self:
             return
         self._main_window = main_window
@@ -260,7 +260,7 @@ def executables(self):
         ]
 
     @cached_property
-    def _base_dlls(self) -> set[str]:
+    def baseDlls(self) -> set[str]:
         base_dir = Path(self.gameDirectory().absolutePath())
         return {str(f.relative_to(base_dir)) for f in base_dir.glob("*.dll")}
 
@@ -277,7 +277,7 @@ def executableForcedLoads(self) -> list[mobase.ExecutableForcedLoadSetting]:
             return efls
         for e in tree:
             relpath = e.pathFrom(tree)
-            if relpath and e.hasSuffix("dll") and relpath not in self._base_dlls:
+            if relpath and e.hasSuffix("dll") and relpath not in self.baseDlls:
                 libs.add(relpath)
         exes = self.executables()
         efls = efls + [
@@ -289,7 +289,7 @@ def executableForcedLoads(self) -> list[mobase.ExecutableForcedLoadSetting]:
         ]
         return efls
 
-    def write_default_mods(self, profile: QDir):
+    def writeDefaultMods(self, profile: QDir):
         ue4ss_mods_txt = QFileInfo(profile.absoluteFilePath("mods.txt"))
         ue4ss_mods_json = QFileInfo(profile.absoluteFilePath("mods.json"))
         if not ue4ss_mods_txt.exists():
@@ -307,7 +307,7 @@ def iniFiles(self):
         return ["GameUserSettings.ini", "Input.ini"]
 
     def initializeProfile(self, directory: QDir, settings: mobase.ProfileSetting):
-        self.write_default_mods(directory)
+        self.writeDefaultMods(directory)
 
         base_data_dir = self.dataDirectory().absolutePath()