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

Merge pull request #2484 from InfinityPacer/main

Browse Source
This commit is contained in:
jxxghp 2024-07-02 06:12:13 +08:00 committed by GitHub
commit 7f5f31f143
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 25 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
app/api/endpoints/plugin.py
View File

@ -108,13 +108,19 @@ def install(plugin_id: str,
""" """
# 已安装插件 # 已安装插件
install_plugins = SystemConfigOper().get(SystemConfigKey.UserInstalledPlugins) or [] install_plugins = SystemConfigOper().get(SystemConfigKey.UserInstalledPlugins) or []
# 如果是非本地括件，或者强制安装时，则需要下载安装 # 首先检查插件是否已经存在，并且是否强制安装，否则只进行安装统计
if repo_url and (force or plugin_id not in PluginManager().get_plugin_ids()): if not force and plugin_id in PluginManager().get_plugin_ids():
# 下载安装 PluginHelper().install_reg(pid=plugin_id)
else:
# 插件不存在或需要强制安装，下载安装并注册插件
if repo_url:
state, msg = PluginHelper().install(pid=plugin_id, repo_url=repo_url) state, msg = PluginHelper().install(pid=plugin_id, repo_url=repo_url)
# 安装失败则直接响应
if not state: if not state:
# 安装失败
return schemas.Response(success=False, message=msg) return schemas.Response(success=False, message=msg)
else:
# repo_url 为空时，也直接响应
return schemas.Response(success=False, message="没有传入仓库地址，无法正确安装插件，请检查配置")
# 安装插件 # 安装插件
if plugin_id not in install_plugins: if plugin_id not in install_plugins:
install_plugins.append(plugin_id) install_plugins.append(plugin_id)

17
app/core/plugin.py
View File

@ -1,5 +1,6 @@
import concurrent import concurrent
import concurrent.futures import concurrent.futures
import importlib.util
import inspect import inspect
import threading import threading
import time import time
@ -220,8 +221,6 @@ class PluginManager(metaclass=Singleton):
# 清空指定插件 # 清空指定插件
if pid in self._running_plugins: if pid in self._running_plugins:
self._running_plugins.pop(pid) self._running_plugins.pop(pid)
if pid in self._plugins:
self._plugins.pop(pid)
else: else:
# 清空 # 清空
self._plugins = {} self._plugins = {}
@ -748,10 +747,18 @@ class PluginManager(metaclass=Singleton):
@staticmethod @staticmethod
def is_plugin_exists(pid: str) -> bool: def is_plugin_exists(pid: str) -> bool:
""" """
判断插件是否在本地文件系统存在 判断插件是否在本地包中存在
:param pid: 插件ID :param pid: 插件ID
""" """
if not pid: if not pid:
return False return False
plugin_dir = settings.ROOT_PATH / "app" / "plugins" / pid.lower() try:
return plugin_dir.exists() # 构建包名
package_name = f"app.plugins.{pid.lower()}"
# 检查包是否存在
package_exists = importlib.util.find_spec(package_name) is not None
logger.debug(f"{pid} exists: {package_exists}")
return package_exists
except Exception as e:
logger.debug(f"获取插件是否在本地包中存在失败，{e}")
return False