Fix: BasicLocalSavegames not using savesDirectory() defined after init() (#208)

Author: ZashIn

basic_features/basic_local_savegames.py

@@ -4,15 +4,20 @@
 
 
 class BasicLocalSavegames(mobase.LocalSavegames):
-    def __init__(self, game_save_dir: QDir):
+    _game: mobase.IPluginGame
+
+    def __init__(self, game: mobase.IPluginGame):
         super().__init__()
-        self._game_saves_dir = game_save_dir.absolutePath()
+        self._game = game
+
+    def game_save_dir(self) -> str:
+        return self._game.savesDirectory().absolutePath()
 
     def mappings(self, profile_save_dir: QDir):
         return [
             mobase.Mapping(
                 source=profile_save_dir.absolutePath(),
-                destination=self._game_saves_dir,
+                destination=self.game_save_dir(),
                 is_directory=True,
                 create_target=True,
             )

games/game_arkhamcity.py

@@ -71,7 +71,7 @@ def savesDirectory(self) -> QDir:
     def init(self, organizer: mobase.IOrganizer) -> bool:
         super().init(organizer)
         self._register_feature(ArkhamCityModDataChecker())
-        self._register_feature(BasicLocalSavegames(self.savesDirectory()))
+        self._register_feature(BasicLocalSavegames(self))
         return True
 
     def executables(self):

games/game_baldursgate3.py

@@ -6,18 +6,11 @@
 from pathlib import Path
 from typing import Any
 
-from PyQt6.QtCore import (
-    QLoggingCategory,
-    qDebug,
-    qInfo,
-)
+from PyQt6.QtCore import QLoggingCategory, qDebug, qInfo
 
 import mobase
 
-from ..basic_features import (
-    BasicGameSaveGameInfo,
-    BasicLocalSavegames,
-)
+from ..basic_features import BasicGameSaveGameInfo, BasicLocalSavegames
 from ..basic_game import BasicGame
 from .baldursgate3 import bg3_file_mapper
 
@@ -54,15 +47,12 @@ def __init__(self):
     def init(self, organizer: mobase.IOrganizer) -> bool:
         super().init(organizer)
         self.utils.init(organizer)
-        from .baldursgate3 import (
-            bg3_data_checker,
-            bg3_data_content,
-        )
+        from .baldursgate3 import bg3_data_checker, bg3_data_content
 
         self._register_feature(bg3_data_checker.BG3ModDataChecker())
         self._register_feature(bg3_data_content.BG3DataContent())
         self._register_feature(BasicGameSaveGameInfo(lambda s: s.with_suffix(".webp")))
-        self._register_feature(BasicLocalSavegames(self.savesDirectory()))
+        self._register_feature(BasicLocalSavegames(self))
         organizer.onAboutToRun(self.utils.construct_modsettings_xml)
         organizer.onFinishedRun(self._on_finished_run)
         organizer.onUserInterfaceInitialized(self.utils.on_user_interface_initialized)

games/game_blackandwhite2.py

@@ -263,7 +263,7 @@ def init(self, organizer: mobase.IOrganizer) -> bool:
         BasicGame.init(self, organizer)
 
         self._register_feature(BlackAndWhite2ModDataChecker())
-        self._register_feature(BasicLocalSavegames(self.savesDirectory()))
+        self._register_feature(BasicLocalSavegames(self))
         self._register_feature(
             BasicGameSaveGameInfo(get_metadata=getMetadata, max_width=400)
         )

games/game_cyberpunk2077.py

@@ -233,7 +233,10 @@ class Cyberpunk2077Game(BasicGame):
 
     def init(self, organizer: mobase.IOrganizer) -> bool:
         super().init(organizer)
-        self._register_feature(BasicLocalSavegames(self.savesDirectory()))
+        print("init")
+        print(f"{self.gameDirectory().absolutePath()=}")
+        print(f"{self._gamePath=}")
+        self._register_feature(BasicLocalSavegames(self))
         self._register_feature(
             BasicGameSaveGameInfo(
                 lambda p: Path(p or "", "screenshot.png"),

games/game_dispatch.py

@@ -51,7 +51,7 @@ def __init__(self):
     def init(self, organizer: mobase.IOrganizer) -> bool:
         super().init(organizer)
         self._register_feature(DispatchModDataChecker())
-        self._register_feature(BasicLocalSavegames(self.savesDirectory()))
+        self._register_feature(BasicLocalSavegames(self))
         return True
 
     def executables(self):

games/game_fantasylifei.py

@@ -51,7 +51,7 @@ def __init__(self):
     def init(self, organizer: mobase.IOrganizer) -> bool:
         super().init(organizer)
         self._register_feature(FantasyLifeIModDataChecker())
-        self._register_feature(BasicLocalSavegames(self.savesDirectory()))
+        self._register_feature(BasicLocalSavegames(self))
         return True
 
     def executables(self):

games/game_mountandblade2.py

@@ -58,7 +58,7 @@ class MountAndBladeIIGame(BasicGame):
     def init(self, organizer: mobase.IOrganizer):
         super().init(organizer)
         self._register_feature(MountAndBladeIIModDataChecker())
-        self._register_feature(BasicLocalSavegames(self.savesDirectory()))
+        self._register_feature(BasicLocalSavegames(self))
         return True
 
     def listSaves(self, folder: QDir) -> list[mobase.ISaveGame]:

games/game_schedule1.py

@@ -96,7 +96,7 @@ def init(self, organizer: mobase.IOrganizer) -> bool:
                 )
             )
         )
-        self._register_feature(BasicLocalSavegames(self.savesDirectory()))
+        self._register_feature(BasicLocalSavegames(self))
         self._register_feature(
             BasicGameSaveGameInfo(
                 None,  # no snapshot to add to the widget

games/game_valheim.py

@@ -365,7 +365,7 @@ def init(self, organizer: mobase.IOrganizer) -> bool:
                 )
             )
         )
-        self._register_feature(BasicLocalSavegames(self.savesDirectory()))
+        self._register_feature(BasicLocalSavegames(self))
         self._overwrite_sync = OverwriteSync(organizer=self._organizer, game=self)
         self._register_event_handler()
         return True