优化代码

basic_plugins/init_plugin_config/init_plugins_config.py

@@ -1,13 +1,10 @@
-import asyncio
-from datetime import datetime, timedelta
 from pathlib import Path
 from ruamel.yaml import round_trip_load, round_trip_dump, YAML
-from utils.manager import admin_manager, plugins_manager
+from utils.manager import admin_manager, plugins_manager, plugin_data_manager
 from configs.config import Config
 from services.log import logger
 from utils.text_utils import prompt2cn
 from utils.utils import get_matchers
-from utils.utils import scheduler
 from configs.path_config import DATA_PATH
 from ruamel import yaml
 
@@ -20,67 +17,50 @@ def init_plugins_config():
     初始化插件数据配置
     """
     plugins2config_file = DATA_PATH / "configs" / "plugins2config.yaml"
-    plugins2config_file.parent.mkdir(parents=True, exist_ok=True)
-    _data = {}
-    if plugins2config_file.exists():
-        _data = _yaml.load(open(plugins2config_file, "r", encoding="utf8"))
+    _data = Config.get_data()
     # 优先使用 metadata 数据
-    for matcher in [matcher for matcher in get_matchers(True) if matcher.plugin and matcher.plugin.module]:
-        _plugin = matcher.plugin
-        metadata = _plugin.metadata
-        _module = _plugin.module
-        plugin_version = None
-        if metadata:
-            plugin_version = metadata.extra.get("version")
-        if not plugin_version and hasattr(_module, "__plugin_version__"):
-            plugin_version = _module.__getattribute__("__plugin_version__")
-        if metadata and metadata.config:
-            plugin_configs = {}
-            for key, value in metadata.config.__fields__.items():
-                plugin_configs[key.upper()] = {
-                    "value": value.default,
-                    "default_value": value.default
-                }
-        else:
-            try:
-                plugin_configs = _module.__getattribute__("__plugin_configs__")
-            except AttributeError:
-                continue
-        # 插件配置版本更新或为Version为None或不在存储配置内，当使用metadata时，必定更新
-        if isinstance(plugin_version, str) or (
-            plugin_version is None
-            or (
-                _data.get(matcher.plugin_name)
-                and _data[matcher.plugin_name].keys() != plugin_configs.keys()
-            )
-            or plugin_version > plugins_manager.get(matcher.plugin_name).version
-            or matcher.plugin_name not in _data.keys()
-        ):
-            for key in plugin_configs:
-                if isinstance(plugin_configs[key], dict):
+    for matcher in get_matchers(True):
+        if plugin_data := plugin_data_manager.get(matcher.plugin_name):
+            # 插件配置版本更新或为Version为None或不在存储配置内，当使用metadata时，必定更新
+            if plugin_data.plugin_configs and (
+                isinstance(plugin_data.version, str)
+                or (
+                    plugin_data.version is None
+                    or (
+                        _data.get(matcher.plugin_name)
+                        and _data[matcher.plugin_name].keys()
+                        != plugin_data.plugin_configs.keys()
+                    )
+                    or plugin_data.version
+                    > plugins_manager.get(matcher.plugin_name).version
+                    or matcher.plugin_name not in _data.keys()
+                )
+            ):
+                plugin_configs = plugin_data.plugin_configs
+                for key in plugin_configs:
+                    if isinstance(plugin_data.plugin_configs[key], dict):
+                        Config.add_plugin_config(
+                            matcher.plugin_name,
+                            key,
+                            plugin_configs[key].get("value"),
+                            help_=plugin_configs[key].get("help"),
+                            default_value=plugin_configs[key].get("default_value"),
+                            _override=True,
+                        )
+                    else:
+                        Config.add_plugin_config(
+                            matcher.plugin_name, key, plugin_configs[key]
+                        )
+            elif plugin_configs := _data.get(matcher.plugin_name):
+                for key in plugin_configs:
                     Config.add_plugin_config(
                         matcher.plugin_name,
                         key,
-                        plugin_configs[key].get("value"),
-                        help_=plugin_configs[key].get("help"),
-                        default_value=plugin_configs[key].get("default_value"),
+                        plugin_configs[key]["value"],
+                        help_=plugin_configs[key]["help"],
+                        default_value=plugin_configs[key]["default_value"],
                         _override=True,
                     )
-                else:
-                    Config.add_plugin_config(
-                        matcher.plugin_name, key, plugin_configs[key]
-                    )
-        else:
-            plugin_configs = _data[matcher.plugin_name]
-            for key in plugin_configs:
-                Config.add_plugin_config(
-                    matcher.plugin_name,
-                    key,
-                    plugin_configs[key]["value"],
-                    help_=plugin_configs[key]["help"],
-                    default_value=plugin_configs[key]["default_value"],
-                    _override=True,
-                )
     if not Config.is_empty():
         Config.save()
         _data = round_trip_load(open(plugins2config_file, encoding="utf8"))
@@ -92,26 +72,13 @@ def init_plugins_config():
             _data[plugin].yaml_set_start_comment(plugin_name, indent=2)
         # 初始化未设置的管理员权限等级
         for k, v in Config.get_admin_level_data():
-            # try:
             admin_manager.set_admin_level(k, v)
-            # except KeyError as e:
-            #     raise KeyError(f"{e} ****** 请检查是否有插件加载失败 ******")
         # 存完插件基本设置
         with open(plugins2config_file, "w", encoding="utf8") as wf:
             round_trip_dump(
                 _data, wf, indent=2, Dumper=yaml.RoundTripDumper, allow_unicode=True
             )
-    user_config_file = Path() / "configs" / "config.yaml"
-    # if not user_config_file.exists():
     _replace_config()
-    # else:
-    #     logger.info('五分钟后将进行配置数据替换，请注意...')
-    #     scheduler.add_job(
-    #         _replace_config,
-    #         "date",
-    #         run_date=datetime.now() + timedelta(minutes=5),
-    #         id=f"_replace_config"
-    #     )
 
 
 def _replace_config():
@@ -151,9 +118,7 @@ def _replace_config():
     temp_file = Path() / "configs" / "temp_config.yaml"
     try:
         with open(temp_file, "w", encoding="utf8") as wf:
-            yaml.dump(
-                _tmp_data, wf, Dumper=yaml.RoundTripDumper, allow_unicode=True
-            )
+            yaml.dump(_tmp_data, wf, Dumper=yaml.RoundTripDumper, allow_unicode=True)
         with open(temp_file, "r", encoding="utf8") as rf:
             _data = round_trip_load(rf)
         # 添加注释
@@ -187,9 +152,7 @@ def _replace_config():
                 rst += f'{k}: {Config[plugin][k]["help"]}' + "\n"
             _data[plugin].yaml_set_start_comment(rst[:-1], indent=2)
         with open(Path() / "configs" / "config.yaml", "w", encoding="utf8") as wf:
-            round_trip_dump(
-                _data, wf, Dumper=yaml.RoundTripDumper, allow_unicode=True
-            )
+            round_trip_dump(_data, wf, Dumper=yaml.RoundTripDumper, allow_unicode=True)
     except Exception as e:
         logger.error(f"生成简易配置注释错误 {type(e)}：{e}")
     if temp_file.exists():