arcanis/ahriman
1
0
Fork 0
mirror of https://github.com/arcan1s/ahriman.git synced 2025-04-24 07:17:17 +00:00
Code Issues Projects Releases Wiki Activity

fix case when provided trigger path is directory

Browse Source 
If trigger is directory and we have permissions to read it, the loaded
will try to load this from it and will fail with IsADirectoryError
This commit is contained in:
Evgenii Alekseev 2022-05-12 07:22:50 +03:00
parent f42c2c57fb
commit 04dcaa93ab
2 changed files with 18 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/ahriman/core/triggers/trigger_loader.py
View File

@ -104,6 +104,9 @@ class TriggerLoader:
Returns: Returns:
ModuleType: module loaded from the imported module ModuleType: module loaded from the imported module
Raises:
InvalidExtension: in case if module cannot be loaded from specified package
""" """
self.logger.info("load module from package %s", package) self.logger.info("load module from package %s", package)
try: try:
@ -119,13 +122,17 @@ class TriggerLoader:
module_path(str): module import path to load module_path(str): module import path to load
Returns: Returns:
Trigger: loaded trigger based on settings Trigger: loaded trigger based on settings
Raises:
InvalidExtension: in case if module cannot be loaded from the specified module path or is not a trigger
""" """
*package_path_parts, class_name = module_path.split(".") *package_path_parts, class_name = module_path.split(".")
package_or_path = ".".join(package_path_parts) package_or_path = ".".join(package_path_parts)
# it works for both missing permission and file does not exist # it works for both missing permission and file does not exist
if os.access(Path(package_or_path), os.R_OK): path_like = Path(package_or_path)
if os.access(path_like, os.R_OK) and path_like.is_file():
module = self._load_module_from_file(package_or_path, class_name) module = self._load_module_from_file(package_or_path, class_name)
else: else:
module = self._load_module_from_package(package_or_path) module = self._load_module_from_package(package_or_path)

9
tests/ahriman/core/triggers/test_trigger_loader.py
View File

@ -58,6 +58,15 @@ def test_load_trigger_path(trigger_loader: TriggerLoader, resource_path_root: Pa
assert trigger_loader._load_trigger(f"{path}.ReportTrigger") assert trigger_loader._load_trigger(f"{path}.ReportTrigger")
def test_load_trigger_path_directory(trigger_loader: TriggerLoader, resource_path_root: Path) -> None:
"""
must raise InvalidExtension if provided import path is directory
"""
path = resource_path_root.parent.parent / "src" / "ahriman" / "core" / "report"
with pytest.raises(InvalidExtension):
trigger_loader._load_trigger(f"{path}.ReportTrigger")
def test_load_trigger_path_not_found(trigger_loader: TriggerLoader) -> None: def test_load_trigger_path_not_found(trigger_loader: TriggerLoader) -> None:
""" """
must raise InvalidExtension if file cannot be found must raise InvalidExtension if file cannot be found