nonebot-plugin-l4d2-server 1.0.2__py3-none-any.whl → 1.0.4__py3-none-any.whl

nonebot_plugin_l4d2_server/__main__.py

@@ -16,7 +16,7 @@
 """
 
 from pathlib import Path
-from typing import TYPE_CHECKING, List, Optional
+from typing import TYPE_CHECKING, List, Optional, Union
 
 import aiofiles
 import ujson as json
@@ -24,10 +24,11 @@ from nonebot.adapters import Message
 from nonebot.log import logger
 from nonebot.matcher import Matcher
 from nonebot.params import CommandArg, CommandStart, RawCommand
+from nonebot.permission import SUPERUSER
 from nonebot.plugin import on_command
 from nonebot_plugin_alconna import UniMessage
 
-from .config import config
+from .config import config, config_manager
 from .l4_help import get_l4d2_core_help
 from .l4_local import *  # noqa: F403
 from .l4_request import (
@@ -45,7 +46,7 @@ if TYPE_CHECKING:
 
 reload_ip()
 
-l4_help = on_command("l4help", aliases={"l4帮助", "l4d2帮助"})
+l4_help = on_command("l4help", aliases={"l4d2帮助"})
 l4_request = on_command("anne", aliases=COMMAND, priority=10)
 l4_reload = on_command("l4reload", aliases={"l4刷新,l4重载"})
 l4_all = on_command("l4all", aliases={"l4全服"})
@@ -59,13 +60,11 @@ config_path = Path(config.l4_path) / "config.json"
 
 
 @l4_help.handle()
-async def _(matcher: Matcher):
+async def _():
     """帮助"""
     logger.info("开始执行[l4d2帮助]")
     im = await get_l4d2_core_help()
-    if isinstance(im, str):
-        await matcher.finish(im)
-    await UniMessage.image(raw=im).send()
+    await out_msg_out(im)
 
 
 @l4_request.handle()
@@ -74,11 +73,31 @@ async def _(
     command: str = RawCommand(),
     args: Message = CommandArg(),
 ):
-    """例：
-    指令：  /橘5
-    start: /(command开头指令)
-    command: /橘(响应的全部指令)
-    args: 5(响应的指令后的数字)
+    """
+    异步函数，用于处理特定的指令。
+
+    Args:
+        start (str, optional): 指令的开头部分，默认为 CommandStart() 返回的值。
+        command (str, optional): 完整的指令字符串，默认为 RawCommand() 返回的值。
+        args (Message, optional): 指令后的参数，默认为 CommandArg() 返回的值。
+
+    Returns:
+        None
+
+    Examples:
+        示例指令："/橘5"
+        - start: "/" (指令的开头部分)
+        - command: "/橘" (完整的指令字符串)
+        - args: "5" (指令后的参数)
+
+    Notes:
+        1. 如果 start 存在，会将 command 中的 start 部分替换为空字符串。
+        2. 如果 command 等于 "anne"，则将其替换为 "云"。
+        3. 提取 args 中的纯文本内容，如果内容非空且不是数字，则返回。
+        4. 如果 args 为空，则将其设置为 None。
+        5. 使用 logger 记录处理过程中的信息。
+        6. 调用 get_server_detail 函数获取服务器详情，并根据返回结果发送相应的消息。
+        7. 如果 get_server_detail 返回 None，则发送 "服务器无响应" 的文本消息。
     """
 
     if start:
@@ -93,49 +112,50 @@ async def _(
     logger.info(f"组:{command} ;数字:{_id}")
     msg = await get_server_detail(command, _id)
     if msg is not None:
-        if isinstance(msg, str):
-            await UniMessage.text(msg).finish()
-        if isinstance(msg, bytes):
-            await UniMessage.image(raw=msg).finish()
+        await out_msg_out(msg, is_connect=config.l4_image)
     else:
-        await UniMessage.text("服务器无响应").finish()
+        await out_msg_out("服务器无响应")
 
 
 @l4_find_player.handle()
 async def _(
     args: Message = CommandArg(),
 ):
+    # 以后有时间补img格式
     msg: str = args.extract_plain_text().strip()
     tag_list: List[str] = msg.split(" ", maxsplit=1)
-    if len(tag_list) < 2:
-        return await UniMessage.text("格式错误，正确格式：/l4find 组名 玩家名").finish()
-    group, name = tag_list
-    out: List[OutServer] = await get_server_detail(group, is_img=False)  # type: ignore
-    out_msg = "未找到玩家"
-    for one in out:
-        for player in one["player"]:
-            if name in player.name:
-                out_msg = await get_ip_server(f"{one['host']}:{one['port']}")
-
-    return await UniMessage.text(out_msg).finish()
+    if len(tag_list) == 1:
+        await UniMessage.text("未设置组，正在全服查找，时间较长").send()
+        name = tag_list[0]
+        out: List[OutServer] = await get_server_detail(is_img=False)  # type: ignore
+        out_msg = "未找到玩家"
+        for one in out:
+            for player in one["player"]:
+                if name in player.name:
+                    out_msg = await get_ip_server(f"{one['host']}:{one['port']}")
+    if len(tag_list) == 2:
+        group, name = tag_list
+        await UniMessage.text(f"正在查询{group}组").send()
+        out: List[OutServer] = await get_server_detail(group=group, is_img=False)  # type: ignore
+        out_msg = "未找到玩家"
+        for one in out:
+            for player in one["player"]:
+                if name in player.name:
+                    out_msg = await get_ip_server(f"{one['host']}:{one['port']}")
+
+    return await out_msg_out(out_msg)
 
 
 @l4_all.handle()
 async def _():
-    await UniMessage.text(await get_all_server_detail()).finish()
+    await out_msg_out(await get_all_server_detail())
 
 
 @l4_connect.handle()
 async def _(args: Message = CommandArg()):
     ip: Optional[str] = args.extract_plain_text()
     if ip is not None:
-        await UniMessage.text(await get_ip_server(ip)).finish()
-
-
-# anne部分
-if config.l4_anne:
-    logger.info("加载anne功能")
-    from .l4_anne import *  # noqa: F403
+        await out_msg_out(await get_ip_server(ip), is_connect=config.l4_image)
 
 
 @l4_reload.handle()
@@ -151,7 +171,7 @@ async def _(args: Message = CommandArg()):
         for tag, url in ip_json.items():
             logger.info(f"重载{tag}的ip")
             await L4API.get_sourceban(tag, url)
-        await UniMessage.text("重载ip完成").finish()
+        await out_msg_out("重载ip完成")
 
 
 l4_add_ban = on_command("l4addban", aliases={"l4添加ban"})
@@ -182,7 +202,7 @@ async def _(args: Message = CommandArg()):
         await UniMessage.text(f"文件写入失败: {e}").finish()
 
     await L4API.get_sourceban(arg[0], arg[1])
-    await UniMessage.text(f"添加成功\n组名: {arg[0]}\n网址: {arg[1]}").finish()
+    await out_msg_out(f"添加成功\n组名: {arg[0]}\n网址: {arg[1]}")
 
 
 l4_del_ban = on_command("l4delban", aliases={"l4删除ban", "l4移除ban"})
@@ -209,7 +229,7 @@ async def _(args: Message = CommandArg()):
                 del config_data[arg[0]]
             async with aiofiles.open(config_path, "w", encoding="utf-8") as f:
                 json.dump(config_data, f, ensure_ascii=False, indent=4)
-            await UniMessage.text(f"删除成功，组名:{arg[0]}").finish()
+            await out_msg_out(f"删除成功，组名:{arg[0]}")
     elif len(arg) == 2:
         if not Path(Path(config.l4_path) / "config.json").is_file():
             await UniMessage.text("没有添加过组名").finish()
@@ -226,7 +246,7 @@ async def _(args: Message = CommandArg()):
                 config_datas[arg[0]] = arg[1]
                 async with aiofiles.open(config_path, "w", encoding="utf-8") as f:
                     json.dump(config_datas, f, ensure_ascii=False, indent=4)
-                await UniMessage.text(f"修改成功，组名:{arg[0]},网址:{arg[1]}").finish()
+                await out_msg_out(f"修改成功，组名:{arg[0]},网址:{arg[1]}")
 
 
 @ld_tj.handle()
@@ -239,3 +259,39 @@ async def _(matcher: Matcher):
 async def _(matcher: Matcher):
     await matcher.send("正在寻找牢房信息")
     await matcher.finish(await tj_request("云", "zl"))
+
+
+async def out_msg_out(
+    msg: Union[str, bytes, UniMessage],
+    is_connect: bool = False,
+    host: str = "",
+    port: str = "",
+):
+    if isinstance(msg, UniMessage):
+        return await msg.finish()
+    if isinstance(msg, str):
+        await UniMessage.text(msg).finish()
+    if is_connect:
+        out = UniMessage.image(raw=msg) + UniMessage.text(
+            f"连接到服务器: {host}:{port}",
+        )
+        return await out.finish()
+    return await UniMessage.image(raw=msg).finish()
+
+
+## 以下为配置修改
+
+img_trung = on_command("l4img", aliases={"l4图片"}, permission=SUPERUSER)
+
+
+@img_trung.handle()
+async def _(args: Message = CommandArg()):
+    arg = args.extract_plain_text().strip().lower()
+    if arg == "开启":
+        config_manager.update_image_config(enabled=True)
+        await out_msg_out("[l4]已开启图片模式")
+    elif arg == "关闭":
+        config_manager.update_image_config(enabled=False)
+        await out_msg_out("[l4]已关闭图片模式")
+    else:
+        await UniMessage.text("请在参数后加上开启或关闭").finish()

nonebot_plugin_l4d2_server/config.py

@@ -1,10 +1,14 @@
 from pathlib import Path
 
 from nonebot import get_plugin_config
+from nonebot.log import logger
 from pydantic import BaseModel
 
 DATAPATH = Path(__file__).parent.joinpath("data")
 DATAOUT = Path("data/L4D2")
+if not Path(DATAOUT / "l4d2.json").exists():
+    logger.info("文件 l4d2.json 不存在，已创建并初始化为 {}")
+    Path(DATAOUT / "l4d2.json").write_text("{}", encoding="utf-8")
 print(DATAOUT.absolute())
 server_all_path = DATAOUT / "l4d2"
 server_all_path.mkdir(parents=True, exist_ok=True)
@@ -16,11 +20,9 @@ map_index = 0
 
 
 class ConfigModel(BaseModel):
-    l4_anne: bool = False
-    """是否启用anne电信服相关功能"""
     l4_enable: bool = True
     """是否全局启用求生功能"""
-    l4_image: bool = False
+    l4_image: bool = True
     """是否启用图片"""
     l4_connect: bool = True
     """是否在查服命令后加入connect ip"""
@@ -39,3 +41,54 @@ class ConfigModel(BaseModel):
 
 
 config = get_plugin_config(ConfigModel)
+
+
+class ConfigManager:
+    """配置项管理类，提供类型安全的配置更新方法"""
+
+    def __init__(self):
+        self._config = config
+
+    def update_image_config(self, enabled: bool) -> None:
+        """更新图片配置
+
+        Args:
+            enabled: 是否启用图片功能
+        """
+        self._config.l4_image = enabled
+
+    def update_style_config(self, style: str) -> None:
+        """更新图片风格配置
+
+        Args:
+            style: 图片风格名称
+        """
+        if not isinstance(style, str):
+            raise TypeError("style必须是字符串")
+        self._config.l4_style = style
+
+    def update_connect_config(self, enabled: bool) -> None:
+        """更新connect ip配置
+
+        Args:
+            enabled: 是否在查服命令后加入connect ip
+        """
+        self._config.l4_connect = enabled
+
+    def update(self, **kwargs) -> None:
+        """通用配置更新方法
+
+        Args:
+            **kwargs: 要更新的配置项键值对
+
+        Raises:
+            ValueError: 当传入无效的配置项时
+        """
+        for key, value in kwargs.items():
+            if hasattr(self._config, key):
+                setattr(self._config, key, value)
+            else:
+                raise ValueError(f"无效的配置项: {key}")
+
+
+config_manager = ConfigManager()

nonebot_plugin_l4d2_server/l4_help/__init__.py

@@ -10,7 +10,7 @@ from ..l4_image.convert import core_font
 from ..l4_image.model import PluginHelp
 from .draw import get_help
 
-__version__ = "1.0.2"
+__version__ = "1.0.4"
 TEXT_PATH = Path(__file__).parent / "texture2d"
 HELP_DATA = Path(__file__).parent / "Help.json"