Recursively search subdirectories in user_data/strategies for a strategy

This commit is contained in:
Sam Germain
2022-03-19 18:54:11 -06:00
parent ddb0254999
commit 6df15a7af9
2 changed files with 17 additions and 6 deletions

View File

@@ -44,7 +44,7 @@ class IResolver:
@classmethod
def build_search_paths(cls, config: Dict[str, Any], user_subdir: Optional[str] = None,
extra_dir: Optional[str] = None) -> List[Path]:
extra_dirs: Optional[List[str]] = None) -> List[Path]:
abs_paths: List[Path] = []
if cls.initial_search_path:
@@ -53,9 +53,10 @@ class IResolver:
if user_subdir:
abs_paths.insert(0, config['user_data_dir'].joinpath(user_subdir))
if extra_dir:
if extra_dirs:
# Add extra directory to the top of the search paths
abs_paths.insert(0, Path(extra_dir).resolve())
for dir in extra_dirs:
abs_paths.insert(0, Path(dir).resolve())
return abs_paths
@@ -164,9 +165,13 @@ class IResolver:
:return: Object instance or None
"""
extra_dirs: List[str] = []
if extra_dir:
extra_dirs.append(extra_dir)
abs_paths = cls.build_search_paths(config,
user_subdir=cls.user_subdir,
extra_dir=extra_dir)
extra_dirs=extra_dirs)
found_object = cls._load_object(paths=abs_paths, object_name=object_name,
kwargs=kwargs)