diff --git a/Dockerfile b/Dockerfile index 4fcd490..b9d4094 100644 --- a/Dockerfile +++ b/Dockerfile @@ -11,6 +11,7 @@ WORKDIR /app COPY --from=builder /app/.venv /app/.venv COPY --from=builder /app/ffmpeg /app/ffmpeg COPY xiaomusic/ ./xiaomusic/ +COPY plugins/ ./plugins/ COPY xiaomusic.py . ENV XDG_CONFIG_HOME=/config ENV XIAOMUSIC_HOSTNAME=192.168.2.5 diff --git a/xiaomusic/plugin.py b/xiaomusic/plugin.py index 1ebf058..f667c07 100644 --- a/xiaomusic/plugin.py +++ b/xiaomusic/plugin.py @@ -1,8 +1,6 @@ import importlib import inspect -import os import pkgutil -import sys class PluginManager: @@ -10,14 +8,8 @@ class PluginManager: self.xiaomusic = xiaomusic self.log = xiaomusic.log self._funcs = {} - self._add_plugin_dir_to_path(plugin_dir) self._load_plugins(plugin_dir) - def _add_plugin_dir_to_path(self, plugin_dir): - plugin_dir_path = os.path.join(os.path.dirname(__file__), plugin_dir) - if plugin_dir_path not in sys.path: - sys.path.append(plugin_dir_path) - def _load_plugins(self, plugin_dir): # 假设 plugins 已经在搜索路径上 package_name = plugin_dir