diff --git a/Dockerfile b/Dockerfile index 140fabd4..9a28aa97 100644 --- a/Dockerfile +++ b/Dockerfile @@ -9,6 +9,7 @@ ENV LANG="C.UTF-8" \ API_TOKEN="moviepilot" \ SUPERUSER="admin" \ SUPERUSER_PASSWORD="password" \ + AUTH_SITE="iyuu" \ LIBRARY_PATH="" \ DOWNLOAD_PATH="/downloads" \ TORRENT_TAG="MOVIEPILOT" \ diff --git a/app/core/config.py b/app/core/config.py index 5e464535..bbce7f30 100644 --- a/app/core/config.py +++ b/app/core/config.py @@ -59,6 +59,8 @@ class Settings(BaseSettings): INDEXER: str = "builtin" # 索引站点,站点域名关键字使用,分隔 INDEXER_SITES: str = "" + # 用户认证站点 hhclub/audiences/hddolby/zmpt/freefarm/hdfans/wintersakura/leaves/1ptba/icc2022/iyuu + AUTH_SITE: str = "" # 消息通知渠道 telegram/wechat/slack MESSAGER: str = "telegram" # WeChat企业ID diff --git a/app/core/plugin.py b/app/core/plugin.py index 8fea972d..5a993746 100644 --- a/app/core/plugin.py +++ b/app/core/plugin.py @@ -11,7 +11,7 @@ class PluginManager(metaclass=Singleton): """ 插件管理器 """ - systemconfigs: SystemConfigOper = None + systemconfig: SystemConfigOper = None # 插件列表 _plugins: dict = {} @@ -24,7 +24,7 @@ class PluginManager(metaclass=Singleton): self.init_config() def init_config(self): - self.systemconfigs = SystemConfigOper() + self.systemconfig = SystemConfigOper() # 停止已有插件 self.stop() # 启动插件 @@ -95,7 +95,7 @@ class PluginManager(metaclass=Singleton): """ if not self._plugins.get(pid): return {} - return self.systemconfigs.get(self._config_key % pid) or {} + return self.systemconfig.get(self._config_key % pid) or {} def save_plugin_config(self, pid: str, conf: dict) -> bool: """ @@ -103,7 +103,7 @@ class PluginManager(metaclass=Singleton): """ if not self._plugins.get(pid): return False - return self.systemconfigs.set(self._config_key % pid, conf) + return self.systemconfig.set(self._config_key % pid, conf) def get_plugin_commands(self) -> List[dict]: """ diff --git a/app/helper/sites.cp310-win_amd64.pyd b/app/helper/sites.cp310-win_amd64.pyd index ceafd246..6b77aa25 100644 Binary files a/app/helper/sites.cp310-win_amd64.pyd and b/app/helper/sites.cp310-win_amd64.pyd differ diff --git a/app/helper/sites.cpython-310-darwin.so b/app/helper/sites.cpython-310-darwin.so index f945d991..b0c372a0 100755 Binary files a/app/helper/sites.cpython-310-darwin.so and b/app/helper/sites.cpython-310-darwin.so differ diff --git a/app/helper/sites.cpython-310-x86_64-linux-gnu.so b/app/helper/sites.cpython-310-x86_64-linux-gnu.so index 1210f9a9..1f2992b1 100644 Binary files a/app/helper/sites.cpython-310-x86_64-linux-gnu.so and b/app/helper/sites.cpython-310-x86_64-linux-gnu.so differ diff --git a/app/utils/types.py b/app/utils/types.py index 4da8cf08..a678098d 100644 --- a/app/utils/types.py +++ b/app/utils/types.py @@ -27,8 +27,6 @@ class EventType(Enum): class SystemConfigKey(Enum): # 用户已安装的插件 UserInstalledPlugins = "UserInstalledPlugins" - # 用户认证参数 - UserSiteAuthParams = "UserSiteAuthParams" # 站点框架