nonebot-plugin-l4d2-server 1.0.8__tar.gz → 1.1.0__tar.gz

{nonebot_plugin_l4d2_server-1.0.8 → nonebot_plugin_l4d2_server-1.1.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: nonebot-plugin-l4d2-server
-Version: 1.0.8
+Version: 1.1.0
 Summary: L4D2 server related operations plugin for NoneBot2
 Keywords: steam,game,l4d2,nonebot2,plugin
 Author-Email: Agnes_Digital <Z735803792@163.com>

{nonebot_plugin_l4d2_server-1.0.8 → nonebot_plugin_l4d2_server-1.1.0}/nonebot_plugin_l4d2_server/__main__.py

@@ -42,7 +42,7 @@ from .l4_request import (
 )
 from .utils.api.request import L4API
 from .utils.api.utils import out_msg_out
-from .utils.utils import split_maohao
+from .utils.utils import log_and_send, read_config, split_maohao, write_config
 
 if TYPE_CHECKING:
     from .utils.api.models import OutServer
@@ -131,6 +131,8 @@ async def _(
 ):
     # 以后有时间补img格式
     msg: str = args.extract_plain_text().strip()
+    if not msg:
+        return UniMessage.text("请在指令后添加要找的昵称哦")
     tag_list: List[str] = msg.split(" ", maxsplit=1)
     if len(tag_list) == 1:
         await UniMessage.text("未设置组，正在全服查找，时间较长").send()
@@ -202,29 +204,15 @@ l4_add_ban = on_command("l4addban", aliases={"l4添加ban"})
 @l4_add_ban.handle()
 async def _(args: Message = CommandArg()):
     arg = args.extract_plain_text().strip().split(" ")
-
     if len(arg) != 2:
         await UniMessage.text("请在命令后增加响应指令名和网址").finish()
 
-    if not config_path.is_file():
-        config_data = {}
-    else:
-        try:
-            with config_path.open("r") as f:
-                config_data = json.load(f)
-        except (json.JSONDecodeError, FileNotFoundError):
-            config_data = {}
-
+    config_data = read_config(config_path)
     config_data.update({arg[0]: arg[1]})
-
-    try:
-        with config_path.open("w") as f:
-            json.dump(config_data, f, ensure_ascii=False, indent=4)
-    except IOError as e:
-        await UniMessage.text(f"文件写入失败: {e}").finish()
+    write_config(config_path, config_data)
 
     await L4API.get_sourceban(arg[0], arg[1])
-    await out_msg_out(f"添加成功\n组名: {arg[0]}\n网址: {arg[1]}")
+    await log_and_send(l4_add_ban, f"添加成功\n组名: {arg[0]}\n网址: {arg[1]}")
 
 
 l4_del_ban = on_command("l4delban", aliases={"l4删除ban", "l4移除ban"})

{nonebot_plugin_l4d2_server-1.0.8 → nonebot_plugin_l4d2_server-1.1.0}/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.8"
+__version__ = "1.1.0"
 TEXT_PATH = Path(__file__).parent / "texture2d"
 HELP_DATA = Path(__file__).parent / "Help.json"
 

{nonebot_plugin_l4d2_server-1.0.8 → nonebot_plugin_l4d2_server-1.1.0}/nonebot_plugin_l4d2_server/l4_image/convert.py

@@ -152,20 +152,26 @@ async def text2pic(text: str, max_size: int = 800, font_size: int = 24):
     if text.endswith("\n"):
         text = text[:-1]
 
+    # 更准确的高度计算
+    line_count = text.count("\n") + 1
+    line_height = int(font_size * 1.2)  # 每行高度，包含行间距
+    estimated_height = line_count * line_height + 80  # 加上上下边距
+
     img = Image.new(
         "RGB",
-        (max_size, len(text) * font_size // 10),
+        (max_size, estimated_height),
         (255, 255, 255),
     )
     img_draw = ImageDraw.ImageDraw(img)
     y = draw_center_text_by_line(
         img_draw,
-        (50, 50),
+        (50, 30),
         text,
         core_font(font_size),
         "black",
         max_size - 80,
         True,  # noqa: FBT003
     )
-    img = img.crop((0, 0, max_size, int(y + 80)))
+    # 裁剪时留一些余量
+    img = img.crop((0, 0, max_size, int(y + 55)))
     return await convert_img(img)

{nonebot_plugin_l4d2_server-1.0.8 → nonebot_plugin_l4d2_server-1.1.0}/nonebot_plugin_l4d2_server/l4_local/__init__.py

@@ -45,7 +45,15 @@ else:
 
     @search_map.handle()
     async def _():
-        supath = local_path[map_index] / "addons"
+        try:
+            supath = local_path[map_index] / "addons"
+        except IndexError:
+            logger.warning(
+                "未填写本地服务器路径,如果想要使用本地服务器功能,请填写本地服务器路径",
+            )
+            await UniMessage.text(
+                "未填写本地服务器路径,如果想要使用本地服务器功能,请填写本地服务器路径",
+            ).finish()
         vpk_list: list[str] = []
         if supath.is_dir():
             for sudir in supath.iterdir():
@@ -54,6 +62,27 @@ else:
                     vpk_list.append(sudir.name)
         if not vpk_list:
             await UniMessage.text("未找到可用的VPK文件").finish()
+
+        # 添加排序逻辑（数字升序）
+        def sort_key(filename: str):
+            # 提取文件名开头的数字（如果有）
+            num_part = ""
+            for char in filename:
+                if char.isdigit():
+                    num_part += char
+                elif num_part:  # 遇到非数字且已经有数字部分时停止
+                    break
+
+            # 返回一个元组作为排序依据：(数字值, 整个文件名)
+            # 使用正数表示升序，没有数字的用无穷大排在最后
+            return (
+                int(num_part) if num_part else float("inf"),
+                filename,
+            )
+
+        # 按数字升序，然后按字母和中文排序
+        vpk_list.sort(key=sort_key)
+
         out_msg = "\n".join(
             f"{index + 1}、{line}" for index, line in enumerate(vpk_list)
         )

{nonebot_plugin_l4d2_server-1.0.8 → nonebot_plugin_l4d2_server-1.1.0}/nonebot_plugin_l4d2_server/l4_request/__init__.py

@@ -119,6 +119,7 @@ async def get_group_detail(
     command: str,
 ):
     server_json = _get_server_json(command, ALLHOST)
+    # logger.debug(f"获取组服务器信息: {server_json}")
     logger.info(server_json)
     if server_json is None:
         logger.warning("未找到这个组")
@@ -170,7 +171,7 @@ def reload_ip():
 async def tj_request(command: str = "云", tj="tj"):
     map_type = "普通药役"
     server_json = ALLHOST.get(command)
-    logger.info(server_json)
+    logger.debug(server_json)
     if server_json is None:
         logger.warning("未找到这个组")
         return None
@@ -186,8 +187,9 @@ async def tj_request(command: str = "云", tj="tj"):
             logger.warning("没有找到符合条件的服务器")
             return "没有符合条件的服务器"
 
+        server_list_str = [f"{ip['host']}:{ip['port']}" for ip in right_ip]
         logger.info(
-            f"符合条件的服务器列表: {[f'{ip['host']}:{ip['port']}' for ip in right_ip]}",
+            f"符合条件的服务器列表: {server_list_str}",
         )
         s = random.choice(right_ip)
         logger.info(f"最终选择的服务器: {s['host']}:{s['port']}")
@@ -211,11 +213,15 @@ async def tj_request(command: str = "云", tj="tj"):
 
 
 async def server_find(
-    command: str = "云",
+    command: str = "",
     _id: Optional[str] = None,
     is_img: bool = True,
 ):
-    server_json = _get_server_json(command, ALLHOST)
+    all_command = get_all_json_filenames()
+    server_json = []
+    for one_command in all_command:
+        server_j = _get_server_json(one_command, ALLHOST)
+        server_json.extend(server_j)
     logger.info(server_json)
     if server_json is None:
         logger.warning("未找到这个组")
@@ -238,3 +244,19 @@ async def server_find(
     if isinstance(out_msg, str):
         return UniMessage.text(out_msg)
     return None
+
+
+def get_all_json_filenames():
+    """
+    获取 server_all_path 路径下所有 json 文件的文件名（不带扩展名）的列表。
+    """
+    json_files = []
+    for item in server_all_path.iterdir():
+        if item.is_file() and item.suffix == ".json":
+            json_files.append(item.stem)
+    return json_files
+
+
+# 使用示例
+
+# all_json_names 现在是一个包含所有 json 文件名（不带扩展名）的 list

{nonebot_plugin_l4d2_server-1.0.8 → nonebot_plugin_l4d2_server-1.1.0}/nonebot_plugin_l4d2_server/l4_request/draw_msg.py

@@ -1,5 +1,3 @@
-import asyncio
-
 # from logging import log
 import io
 from pathlib import Path
@@ -15,9 +13,9 @@ from ..utils.api.request import L4API
 
 async def draw_one_ip(host: str, port: int, is_img: bool = config.l4_image):
     """输出单个ip"""
-    try:
-        ser_list = await L4API.a2s_info([(host, port)], is_player=True)
-    except asyncio.exceptions.TimeoutError:
+    ser_list = await L4API.a2s_info([(host, port)], is_player=True)
+    if not ser_list or ser_list[0][0].max_players == 0:
+        # except asyncio.exceptions.TimeoutError:
         return "服务器无响应"
     one_server = ser_list[0][0]
     one_player = ser_list[0][1]
@@ -40,15 +38,10 @@ async def draw_one_ip(host: str, port: int, is_img: bool = config.l4_image):
                 soc = "[{:>{}}]".format(player.score, max_score_len)
                 chines_dur = await convert_duration(player.duration)
                 dur = "{:^{}}".format(chines_dur, max_duration_len)
-                name_leg = len(player.name)
-                if name_leg > 2:
-                    xing = ":)" * (name_leg - 2)
-                    name = f"{player.name[0]}{xing}{player.name[-1]}"
-                else:
-                    name = player.name
+                name = player.name
                 player_msg += f"{soc} | {dur} | {name} \n"
         else:
-            player_msg = "服务器感觉很安静啊"
+            player_msg = "服务器感觉很安静啊\n"
         return player_msg
 
     def build_server_message(server, player_info: str) -> str:
@@ -59,13 +52,16 @@ async def draw_one_ip(host: str, port: int, is_img: bool = config.l4_image):
         Returns:
             完整的服务器信息字符串
         """
+
+        vac_status = "启用" if server.vac_enabled else "禁用"
         msg = f"""-{server.server_name}-
 游戏: {server.folder}
 地图: {server.map_name}
-人数: {server.player_count}/{server.max_players}"""
+人数: {server.player_count} / {server.max_players}"""
         if server.ping is not None:
             msg += f"""
-ping: {server.ping * 1000:.0f}ms
+延迟: {server.ping * 1000:.0f} ms
+VAC : {vac_status}\n
 {player_info}"""
         if config.l4_show_ip:
             msg += f"""
@@ -112,7 +108,7 @@ connect {host}:{port}"""
 
             # 计算图片尺寸
             margin = 20
-            line_spacing = 5
+            line_spacing = 7
             img_width = max(title_width, content_width) + 2 * margin
             content_lines_count = len(content.split("\n")) if content else 0
             img_height = max(
@@ -141,13 +137,87 @@ connect {host}:{port}"""
                 if content:
                     content_x = margin
                     content_y = title_y + title_height + margin
-                    draw.text(
-                        (content_x, content_y),
-                        content,
-                        font=font,
-                        fill=(255, 255, 255),
-                        spacing=line_spacing,
-                    )
+
+                    # 定义不同参数值的颜色（冒号后的内容）
+                    value_colors = {
+                        "游戏: ": (200, 180, 255),  # 淡紫
+                        "地图: ": (166, 202, 253),  # 淡蓝
+                        "人数: ": (100, 255, 100),  # 绿色
+                        "延迟: ": (100, 255, 100),  # 绿色
+                        "类型: ": (180, 220, 255),  # 淡蓝
+                        "密码: ": (255, 255, 255),  # 白色
+                        # connect不修改，保持原逻辑
+                    }
+
+                    # 按行绘制内容
+                    current_y = content_y
+                    for line in content_lines:
+                        # 检查是否是参数行
+                        colored = False
+                        for prefix, color in value_colors.items():
+                            if line.startswith(prefix):
+                                # 绘制完整参数名（白色）
+                                prefix_part = prefix
+                                prefix_width = (
+                                    font.getbbox(prefix_part)[2]
+                                    - font.getbbox(prefix_part)[0]
+                                )
+                                draw.text(
+                                    (content_x, current_y),
+                                    prefix_part,
+                                    font=font,
+                                    fill=(255, 255, 255),
+                                )
+
+                                # 绘制参数值（带颜色）
+                                value_part = line[len(prefix) :].strip()
+                                draw.text(
+                                    (content_x + prefix_width, current_y),
+                                    value_part,
+                                    font=font,
+                                    fill=color,
+                                )
+
+                                colored = True
+                                break
+                        # 特殊处理VAC行
+                        if not colored and line.startswith("VAC :"):
+                            prefix = "VAC : "
+                            prefix_width = (
+                                font.getbbox(prefix)[2] - font.getbbox(prefix)[0]
+                            )
+                            draw.text(
+                                (content_x, current_y),
+                                prefix,
+                                font=font,
+                                fill=(255, 255, 255),
+                            )
+
+                            value_part = line[len(prefix) :].strip()
+                            vac_color = (
+                                (70, 209, 110)
+                                if value_part == "启用"
+                                else (255, 90, 90)
+                            )  # 启用绿/禁用红
+                            draw.text(
+                                (content_x + prefix_width, current_y),
+                                value_part,
+                                font=font,
+                                fill=vac_color,
+                            )
+
+                            colored = True
+
+                        # 普通行（玩家信息）和connect保持原样
+                        if not colored:
+                            draw.text(
+                                (content_x, current_y),
+                                line,
+                                font=font,
+                                fill=(255, 255, 255),
+                            )
+
+                        current_y += line_height + line_spacing
 
                     return img
             except Exception as e:

{nonebot_plugin_l4d2_server-1.0.8 → nonebot_plugin_l4d2_server-1.1.0}/nonebot_plugin_l4d2_server/l4_request/utils.py

@@ -1,4 +1,4 @@
-from typing import Dict, List, Optional, Tuple, Union, cast
+from typing import Dict, List, Optional, Tuple, Union
 
 from nonebot.log import logger
 
@@ -22,11 +22,13 @@ def _get_server_json(
     Returns:
         Optional[list]: 服务器JSON列表，未找到组时返回None
     """
+    logger.debug(f"获取服务器组 {allhost} 的信息")
     if command:
         return allhost.get(command)
     server_json = []
     for servers in allhost.values():
         server_json.extend(servers)
+    logger.debug(f"获取到的服务器组信息: {server_json}")
     return server_json
 
 
@@ -95,10 +97,7 @@ async def _handle_single_server(
         return None
 
     host, port = server_info
-    out_msg = await draw_one_ip(host, port)
-    if is_img:
-        return cast(bytes, out_msg)
-    return out_msg
+    return await draw_one_ip(host, port, is_img=is_img)
 
 
 async def _filter_servers(

{nonebot_plugin_l4d2_server-1.0.8 → nonebot_plugin_l4d2_server-1.1.0}/nonebot_plugin_l4d2_server/utils/utils.py

@@ -13,6 +13,29 @@ from nonebot.log import logger
 from nonebot_plugin_alconna import UniMessage
 
 
+async def log_and_send(matcher, message: str, level="info"):
+    getattr(logger, level)(message)
+    await matcher.finish(UniMessage.text(message))
+
+
+def read_config(config_path: Path) -> dict:
+    if not config_path.is_file():
+        return {}
+    try:
+        with config_path.open("r", encoding="utf-8") as f:
+            return json.load(f)
+    except (json.JSONDecodeError, FileNotFoundError):
+        return {}
+
+
+def write_config(config_path: Path, data: dict) -> None:
+    try:
+        with config_path.open("w", encoding="utf-8") as f:
+            json.dump(data, f, ensure_ascii=False, indent=4)
+    except IOError as e:
+        raise RuntimeError(f"配置写入失败: {e}") from e
+
+
 async def get_file(url: str, down_file: Path):
     """
     下载指定Url到指定位置

{nonebot_plugin_l4d2_server-1.0.8 → nonebot_plugin_l4d2_server-1.1.0}/pyproject.toml

@@ -47,7 +47,7 @@ classifiers = [
     "Operating System :: OS Independent",
 ]
 readme = "README.md"
-version = "1.0.8"
+version = "1.1.0"
 
 [project.license]
 text = "GPLv3"