Skip to content

Commit 6db3411

Browse files
committed
Merge branch 'master' of https://github.com/ModOrganizer2/modorganizer-basic_games into bs_saves
2 parents 8011cb9 + 3303ce5 commit 6db3411

File tree

4 files changed

+12
-3
lines changed

4 files changed

+12
-3
lines changed

basic_game.py

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -613,6 +613,9 @@ def dataDirectory(self) -> QDir:
613613
self.gameDirectory().absoluteFilePath(self._mappings.dataDirectory.get())
614614
)
615615

616+
def secondaryDataDirectories(self) -> Dict[str, QDir]:
617+
return {}
618+
616619
def setGamePath(self, path: Union[Path, str]):
617620
self._gamePath = str(path)
618621

eadesktop_utils.py

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,10 @@ def find_games() -> Dict[str, Path]:
2626
if not ea_desktop_settings_path.exists():
2727
return games
2828

29-
user_ini, *_ = list(ea_desktop_settings_path.glob("user_*.ini"))
29+
try:
30+
user_ini, *_ = list(ea_desktop_settings_path.glob("user_*.ini"))
31+
except ValueError:
32+
return games
3033

3134
# The INI file in its current form has no section headers.
3235
# So we wrangle the input to add it all under a fake section.
@@ -42,6 +45,9 @@ def find_games() -> Dict[str, Path]:
4245
install_path = Path(os.environ["ProgramW6432"]) / "EA Games"
4346
config.set("mod_organizer", "user.downloadinplacedir", install_path.__str__())
4447

48+
if not install_path.exists():
49+
return games
50+
4551
for game_dir in install_path.iterdir():
4652
try:
4753
installer_file = game_dir.joinpath("__Installer", "installerdata.xml")

plugin-requirements.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
psutil==5.8.0
22
vdf==3.4
3-
lzokay==1.0.1
3+
lzokay==1.1.5

setup.cfg

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ deps =
3939
mobase-stubs>=2.5.0.dev9
4040
psutil==5.8.0
4141
vdf==3.4
42-
lzokay==1.0.1
42+
lzokay==1.1.5
4343
black
4444
flake8
4545
flake8-black

0 commit comments

Comments
 (0)