From bc6e71bc0b42d83df7678c8b446f24d6b04b0df1 Mon Sep 17 00:00:00 2001 From: cyberrumor Date: Mon, 5 Feb 2024 10:18:22 -0800 Subject: [PATCH] Fix 'find plugins' displaying mods instead of plugins Also fix a few failing tests that were a result of a last second test refactor. --- ammo/mod_controller.py | 4 ++-- test/test_conflict_resolution.py | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/ammo/mod_controller.py b/ammo/mod_controller.py index fe8faad..60fdabb 100755 --- a/ammo/mod_controller.py +++ b/ammo/mod_controller.py @@ -431,7 +431,7 @@ def _stage(self) -> dict: dest = mod.install_dir / corrected_name # Add the sanitized full path to the stage, resolving - # conflicts. Record whether a mod conflicting files. + # conflicts. Record whether a mod has conflicting files. dest = normalize(dest, self.game.directory) if dest in result: conflicting_mod = [ @@ -985,5 +985,5 @@ def find(self, *keyword: str) -> None: if kw == "plugins": for component in self.mods + self.downloads: component.visible = False - for component in self.mods: + for component in self.plugins: component.visible = True diff --git a/test/test_conflict_resolution.py b/test/test_conflict_resolution.py index d5ad078..a8e6d80 100755 --- a/test/test_conflict_resolution.py +++ b/test/test_conflict_resolution.py @@ -10,6 +10,7 @@ from ammo.component import ( ComponentEnum, DeleteEnum, + RenameEnum, ) @@ -295,7 +296,7 @@ def test_conflicting_mods_have_conflict_flag_after_deactivate(): for mod in ["conflict_1", "conflict_2", "normal_mod"]: install_mod(controller, mod) - controller.deactivate(ComponentEnum.MOD, 3) + controller.deactivate(ComponentEnum.MOD, 2) assert ( controller.mods[