codfrm/MoviePilot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix bug

Browse Source
This commit is contained in:
jxxghp 2023-11-02 08:19:41 +08:00
parent 8e8a587bca
commit 8e842c385d
2 changed files with 15 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
app/helper/module.py
View File

@ -21,14 +21,17 @@ class ModuleHelper:
packages = importlib.import_module(package_path) packages = importlib.import_module(package_path)
importlib.reload(packages) importlib.reload(packages)
for importer, package_name, _ in pkgutil.iter_modules(packages.__path__): for importer, package_name, _ in pkgutil.iter_modules(packages.__path__):
if package_name.startswith('_'): try:
continue if package_name.startswith('_'):
full_package_name = f'{package_path}.{package_name}'
module = importlib.import_module(full_package_name)
for name, obj in module.__dict__.items():
if name.startswith('_'):
continue continue
if isinstance(obj, type) and filter_func(name, obj): full_package_name = f'{package_path}.{package_name}'
submodules.append(obj) module = importlib.import_module(full_package_name)
for name, obj in module.__dict__.items():
if name.startswith('_'):
continue
if isinstance(obj, type) and filter_func(name, obj):
submodules.append(obj)
except Exception as err:
print(f'加载模块 {package_name} 失败：{err}')
return submodules return submodules

6
app/helper/plugin.py
View File

@ -79,10 +79,11 @@ class PluginHelper(metaclass=Singleton):
f.write(res.text) f.write(res.text)
else: else:
# 递归下载子目录 # 递归下载子目录
l, m = __get_filelist(f"{_p}/{item.get('name')}") p = f"{_p}/{item.get('name')}"
l, m = __get_filelist(p)
if not l: if not l:
return False, m return False, m
return __download_files(_p, _l) return __download_files(p, l)
return True, "" return True, ""
if not pid or not repo_url: if not pid or not repo_url:
@ -119,3 +120,4 @@ class PluginHelper(metaclass=Singleton):
shutil.rmtree(plugin_dir, ignore_errors=True) shutil.rmtree(plugin_dir, ignore_errors=True)
# 下载所有文件 # 下载所有文件
__download_files(pid.lower(), file_list) __download_files(pid.lower(), file_list)
return True, ""