Frame13/ayon-core
1
0
Fork 1
mirror of https://github.com/ynput/ayon-core.git synced 2025-12-24 21:04:40 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

moved validation much earlier

Browse source
This commit is contained in:
Jakub Trllo 2022-05-03 12:41:17 +02:00
parent 80c7d177a6
commit 16af1a2347
1 changed files with 16 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

27
openpype/modules/base.py
View file

@ -326,11 +326,25 @@ def _load_modules():
fullpath = os.path.join(dirpath, filename)
basename, ext = os.path.splitext(filename)
# Validations
if os.path.isdir(fullpath):
# Check existence of init file
init_path = os.path.join(fullpath, "__init__.py")
if not os.path.exists(init_path):
log.debug((
"Module directory does not contan __init__.py"
" file {}"
).format(fullpath))
continue
elif ext not in (".py", ):
continue
# TODO add more logic how to define if folder is module or not
# - check manifest and content of manifest
try:
# Don't import dynamically current directory modules
if is_in_current_dir:
# Don't import dynamically
import_str = "openpype.modules.{}".format(basename)
new_import_str = "{}.{}".format(modules_key, basename)
default_module = __import__(import_str, fromlist=("", ))
@ -338,18 +352,9 @@ def _load_modules():
setattr(openpype_modules, basename, default_module)
elif os.path.isdir(fullpath):
# Check existence of init file
init_path = os.path.join(fullpath, "__init__.py")
if not os.path.exists(init_path):
log.debug((
"Module directory does not contan __init__.py"
" file {}"
).format(fullpath))
continue
import_module_from_dirpath(dirpath, filename, modules_key)
elif ext in (".py", ):
else:
module = import_filepath(fullpath)
setattr(openpype_modules, basename, module)