mirrors/django-components
1
0
Fork 0
mirror of https://github.com/django-components/django-components.git synced 2025-08-11 17:57:59 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

refactor: fix clash with autodiscovery

Browse source
This commit is contained in:
Juro Oravec 2024-04-13 21:34:43 +02:00
parent ddc62c7dfc
commit 003c8ba4d5
3 changed files with 31 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

17
src/django_components/utils.py
View file

@ -1,13 +1,18 @@
import glob
from pathlib import Path
from typing import List, Optional, Union
from typing import List, Optional, NamedTuple
from django.template.engine import Engine
from django_components.template_loader import Loader
def search(search_glob: Optional[str] = None, engine: Optional[Engine] = None) -> Union[List[str], List[Path]]:
class SearchResult(NamedTuple):
searched_dirs: List[Path]
matched_files: List[Path]
def search(search_glob: Optional[str] = None, engine: Optional[Engine] = None) -> SearchResult:
"""
Search for directories that may contain components.
@ -22,11 +27,11 @@ def search(search_glob: Optional[str] = None, engine: Optional[Engine] = None) -
dirs = loader.get_dirs()
if search_glob is None:
return dirs
return SearchResult(searched_dirs=dirs, matched_files=[])
component_filenames: List[str] = []
component_filenames: List[Path] = []
for directory in dirs:
for path in glob.iglob(str(Path(directory) / search_glob), recursive=True):
component_filenames.append(path)
component_filenames.append(Path(path))
return component_filenames
return SearchResult(searched_dirs=dirs, matched_files=component_filenames)