From 67309f18344ceb3dc683da788cf30b2b54dc27a5 Mon Sep 17 00:00:00 2001 From: mio <455457521@qq.com> Date: Thu, 17 Apr 2025 14:11:09 +0800 Subject: [PATCH] =?UTF-8?q?=F0=9F=90=9B=20=20=E4=BF=AE=E5=A4=8Dconfig.yaml?= =?UTF-8?q?=E5=8F=AF=E8=83=BD=E4=B8=A2=E5=A4=B1=E9=85=8D=E7=BD=AE=E7=9A=84?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .env.dev | 77 ---------------------- zhenxun/configs/utils/__init__.py | 105 ++++++++++++++++++++++-------- 2 files changed, 78 insertions(+), 104 deletions(-) delete mode 100644 .env.dev diff --git a/.env.dev b/.env.dev deleted file mode 100644 index 3e1059c2..00000000 --- a/.env.dev +++ /dev/null @@ -1,77 +0,0 @@ -SUPERUSERS=[""] - -COMMAND_START=[""] - -SESSION_RUNNING_EXPRESSION="别急呀,小真寻要宕机了!QAQ" - -NICKNAME=["真寻", "小真寻", "绪山真寻", "小寻子"] - -SESSION_EXPIRE_TIMEOUT=00:00:30 - -ALCONNA_USE_COMMAND_START=True - -# 全局图片统一使用bytes发送，当真寻与协议端不在同一服务器上时为True -IMAGE_TO_BYTES = True - -# 回复消息时自称 -SELF_NICKNAME="小真寻" - -# 官bot appid:bot账号 -QBOT_ID_DATA = '{ - -}' - -# 数据库配置 -# 示例: "postgres://user:password@127.0.0.1:5432/database" -# 示例: "mysql://user:password@127.0.0.1:3306/database" -# 示例: "sqlite:data/db/zhenxun.db" 在data目录下建立db文件夹 -DB_URL = "" - -# 系统代理 -# SYSTEM_PROXY = "http://127.0.0.1:7890" - -PLATFORM_SUPERUSERS = ' - { - "qq": [""], - "dodo": [""] - } -' - -DRIVER=~fastapi+~httpx+~websockets - - -# LOG_LEVEL=DEBUG -# 服务器和端口 -HOST = 127.0.0.1 -PORT = 8080 - -# kook adapter toekn -# kaiheila_bots =[{"token": ""}] - -# # discode adapter -# DISCORD_BOTS=' -# [ -# { -# "token": "", -# "intent": { -# "guild_messages": true, -# "direct_messages": true -# }, -# "application_commands": {"*": ["*"]} -# } -# ] -# ' -# DISCORD_PROXY='' - -# # dodo adapter -# DODO_BOTS=' -# [ -# { -# "client_id": "", -# "token": "" -# } -# ] -# ' - -# application_commands的{"*": ["*"]}代表将全部应用命令注册为全局应用命令 -# {"admin": ["123", "456"]}则代表将admin命令注册为id是123、456服务器的局部命令，其余命令不注册 \ No newline at end of file diff --git a/zhenxun/configs/utils/__init__.py b/zhenxun/configs/utils/__init__.py index 03bc7331..d414b154 100644 --- a/zhenxun/configs/utils/__init__.py +++ b/zhenxun/configs/utils/__init__.py @@ -366,24 +366,42 @@ class ConfigsManager: if not module or not key: raise ValueError("add_plugin_config: module和key不能为为空") + + key_upper = key.upper() self.add_module.append(f"{module}:{key}".lower()) - if module in self._data and (config := self._data[module].configs.get(key)): - config.help = help - config.arg_parser = arg_parser - config.type = type + + # 检查配置是否已存在 + config_exists = module in self._data and key_upper in self._data[module].configs + + # 如果配置已存在，仅更新元数据，保留原始值 + if config_exists: + config = self._data[module].configs[key_upper] + # 只更新元数据 + if help is not None: + config.help = help + if arg_parser is not None: + config.arg_parser = arg_parser + if type is not None: + config.type = type + # 只在强制覆盖模式下才更新值 if _override: config.value = value config.default_value = default_value else: - key = key.upper() + # 配置不存在，创建新配置 if not self._data.get(module): self._data[module] = ConfigGroup(module=module) - self._data[module].configs[key] = ConfigModel( + self._data[module].configs[key_upper] = ConfigModel( value=value, help=help, default_value=default_value, type=type, ) + + # 同时更新simple_data + if module not in self._simple_data: + self._simple_data[module] = {} + self._simple_data[module][key_upper] = value def set_config( self, @@ -486,30 +504,63 @@ class ConfigsManager: path: 路径. save_simple_data: 同时保存至config.yaml. """ - if save_simple_data: - with open(self._simple_file, "w", encoding="utf8") as f: - _yaml.dump(self._simple_data, f) - path = path or self.file - data = {} - for module in self._data: - data[module] = {} - for config in self._data[module].configs: - value = self._data[module].configs[config].dict() - del value["type"] - del value["arg_parser"] - data[module][config] = value - with open(path, "w", encoding="utf8") as f: - _yaml.dump(data, f) + try: + if save_simple_data: + # 使用临时文件进行原子写入 + temp_simple_file = self._simple_file.with_suffix(".yaml.tmp") + with open(temp_simple_file, "w", encoding="utf8") as f: + _yaml.dump(self._simple_data, f) + # 原子替换 + temp_simple_file.replace(self._simple_file) + + path = path or self.file + data = {} + for module in self._data: + data[module] = {} + for config in self._data[module].configs: + value = self._data[module].configs[config].dict() + del value["type"] + del value["arg_parser"] + data[module][config] = value + + # 使用临时文件进行原子写入 + temp_file = Path(str(path) + ".tmp") + with open(temp_file, "w", encoding="utf8") as f: + _yaml.dump(data, f) + # 原子替换 + temp_file.replace(path) + except Exception as e: + logger.error(f"保存配置文件失败: {str(e)}") def reload(self): """重新加载配置文件""" - if self._simple_file.exists(): - with open(self._simple_file, encoding="utf8") as f: - self._simple_data = _yaml.load(f) - for key in self._simple_data.keys(): - for k in self._simple_data[key].keys(): - self._data[key].configs[k].value = self._simple_data[key][k] - self.save() + try: + # 先备份当前配置 + backup_data = copy.deepcopy(self._data) + + if self._simple_file.exists(): + with open(self._simple_file, encoding="utf8") as f: + self._simple_data = _yaml.load(f) + + # 检查加载的数据是否为None + if self._simple_data is None: + logger.error("配置文件为空或格式错误，保留原有配置") + self._simple_data = {} + + # 更新配置值 + for key in self._simple_data.keys(): + for k in self._simple_data[key].keys(): + if key in self._data and k in self._data[key].configs: + self._data[key].configs[k].value = self._simple_data[key][k] + + # 保存更新后的配置 + self.save() + except ScannerError as e: + logger.error(f"配置文件解析失败: {str(e)}，保留现有配置") + except Exception as e: + logger.error(f"重新加载配置失败: {str(e)}") + # 发生错误时恢复到备份配置 + self._data = backup_data def load_data(self): """加载数据