nonebot-plugin-l4d2-server 1.0.8__py3-none-any.whl → 1.0.9__py3-none-any.whl

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.0.9"
 TEXT_PATH = Path(__file__).parent / "texture2d"
 HELP_DATA = Path(__file__).parent / "Help.json"
 

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/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/l4_request/__init__.py

@@ -119,7 +119,7 @@ async def get_group_detail(
     command: str,
 ):
     server_json = _get_server_json(command, ALLHOST)
-    logger.info(server_json)
+    logger.debug(server_json)
     if server_json is None:
         logger.warning("未找到这个组")
         return None
@@ -170,7 +170,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 +186,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']}")
@@ -216,7 +217,7 @@ async def server_find(
     is_img: bool = True,
 ):
     server_json = _get_server_json(command, ALLHOST)
-    logger.info(server_json)
+    logger.debug(server_json)
     if server_json is None:
         logger.warning("未找到这个组")
         return None

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,35 @@ async def draw_one_ip(host: str, port: int, is_img: bool = config.l4_image):
         Returns:
             完整的服务器信息字符串
         """
+
+        # 处理服务器类型显示
+        type_map = {
+            "d": "Dedicated",
+            "l": "Listen",
+        }
+        platform_map = {
+            "w": "Windows",
+            "l": "Linux",
+        }
+        # 解析原始数据 (例如 "d(w)" -> type='d', platform='w')
+        server_type = server.server_type[0] if server.server_type else "d"
+        platform = server.platform[0] if server.platform else "w"
+
+        # 处理VAC状态显示
+        vac_status = "启用" if server.vac_enabled else "禁用"
+        # 处理密码状态显示
+        pw_status = "是" if server.password_protected 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
+类型: {type_map.get(server_type, '未知')} ({platform_map.get(platform, '未知')})
+VAC : {vac_status}
+密码: {pw_status}\n
 {player_info}"""
         if config.l4_show_ip:
             msg += f"""
@@ -112,7 +127,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 +156,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/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
 
@@ -95,10 +95,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.dist-info → nonebot_plugin_l4d2_server-1.0.9.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: nonebot-plugin-l4d2-server
-Version: 1.0.8
+Version: 1.0.9
 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.dist-info → nonebot_plugin_l4d2_server-1.0.9.dist-info}/RECORD

@@ -1,13 +1,13 @@
-nonebot_plugin_l4d2_server-1.0.8.dist-info/METADATA,sha256=oxEFgnJzb8aG9Ouh5q6sjIMpF8TabEOpauUXAwyPxxU,6759
-nonebot_plugin_l4d2_server-1.0.8.dist-info/WHEEL,sha256=tSfRZzRHthuv7vxpI4aehrdN9scLjk-dCJkPLzkHxGg,90
-nonebot_plugin_l4d2_server-1.0.8.dist-info/entry_points.txt,sha256=6OYgBcLyFCUgeqLgnvMyOJxPCWzgy7se4rLPKtNonMs,34
-nonebot_plugin_l4d2_server-1.0.8.dist-info/licenses/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
+nonebot_plugin_l4d2_server-1.0.9.dist-info/METADATA,sha256=ctmdb9rfE5_n965rELNjZ1l-KWaXoKndwjj0Ewh2Ye0,6759
+nonebot_plugin_l4d2_server-1.0.9.dist-info/WHEEL,sha256=tSfRZzRHthuv7vxpI4aehrdN9scLjk-dCJkPLzkHxGg,90
+nonebot_plugin_l4d2_server-1.0.9.dist-info/entry_points.txt,sha256=6OYgBcLyFCUgeqLgnvMyOJxPCWzgy7se4rLPKtNonMs,34
+nonebot_plugin_l4d2_server-1.0.9.dist-info/licenses/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
 nonebot_plugin_l4d2_server/__init__.py,sha256=xzhXyprPmoTTjpfyqYlMweC4umuLsm8MERA1ZTqCyYc,1661
 nonebot_plugin_l4d2_server/__main__.py,sha256=Ysx4PkR3kIuSsKM6h9kmPBuylxXsuLjtrOdT1LbQT9A,10511
 nonebot_plugin_l4d2_server/config.py,sha256=t4BYygrrLTcsl9oBnyce0-tDhMCCkMrkEPs4DX2t4KI,2682
 nonebot_plugin_l4d2_server/data/font/loli.ttf,sha256=Yrh-RPoCrn1-NG94DR0x20ASXYUt8g3Ep6BCt3CdOFk,11125812
 nonebot_plugin_l4d2_server/l4_help/Help.json,sha256=D0YmZYGW-imC7nVebkQ0_eODiqevQhL9aKj-cyBaqDY,1704
-nonebot_plugin_l4d2_server/l4_help/__init__.py,sha256=BsrZHgZXEZ0rXNb2mQJF7o3kwDeb05vAXoYwl6znMCc,1479
+nonebot_plugin_l4d2_server/l4_help/__init__.py,sha256=_e2uAaiECMGhbunurdN3dImu00l5j1uDCLBMxPlqolM,1479
 nonebot_plugin_l4d2_server/l4_help/draw.py,sha256=y6yDPUnoZFvwly8cf7g9HRpT1JXTxyA9DC1TuvUinTM,6448
 nonebot_plugin_l4d2_server/l4_help/icon/介绍.png,sha256=3QC6A38QC-7gDBxmtQSQdbsz7hsefU5LL-oZmJ41zTk,3806
 nonebot_plugin_l4d2_server/l4_help/icon/任务.png,sha256=nyZ4_kM21ZO95nwanCFnUfCGX-PkmJXYQf9OrJVKomY,3782
@@ -51,7 +51,7 @@ nonebot_plugin_l4d2_server/l4_help/texture2d/bg.jpg,sha256=xTyLJLgo3E-ZH-tupsjZC
 nonebot_plugin_l4d2_server/l4_help/texture2d/button.png,sha256=oQKoRBJDaVXz2eVD-lHkaVcV1aw0ehkNBK8TNSjTehI,12711
 nonebot_plugin_l4d2_server/l4_help/texture2d/icon.png,sha256=A2p0r8aBXpNy_b_CtZTZzTrEeHbGRYzO2fNwahyLlQ0,634659
 nonebot_plugin_l4d2_server/l4_image/__init__.py,sha256=-GWXUDv_z_cfJ-wyvx5J3wB9P7ng4NzRHfCq-GZD6XQ,431
-nonebot_plugin_l4d2_server/l4_image/convert.py,sha256=MISJq2JFcmQJaYZz6dDjQ2UusVORQt7rLSoAY_CyyWY,3894
+nonebot_plugin_l4d2_server/l4_image/convert.py,sha256=2wc72nyfEIjyOZS_98BrzD6G9xFzlD9GlsUGOjBLJV4,4132
 nonebot_plugin_l4d2_server/l4_image/download.py,sha256=qRAo0Ggj5KV8RQN3LFJe547__wwC7Ww4QnT-v3pfe6w,3116
 nonebot_plugin_l4d2_server/l4_image/html_img.py,sha256=BE_GQ67KRCb-r_iaVOLPAEoloNvOA9bbxhc8o8WhLXc,2882
 nonebot_plugin_l4d2_server/l4_image/image_tools.py,sha256=iHkvG2fYxYCz7B2JV69MSMlH5KXyWftcBs_prmyTyO4,14453
@@ -83,15 +83,15 @@ nonebot_plugin_l4d2_server/l4_image/img/template/vue.css,sha256=2sGjCFrR-3tFMB_x
 nonebot_plugin_l4d2_server/l4_image/img/template/w.svg,sha256=LnctC2mVwjdhRMiS9ffrjUX-9KGwqb6OMmpJXvVXl70,486
 nonebot_plugin_l4d2_server/l4_image/model.py,sha256=FGsCvf_BKbRNJUVy6I5BKnArMY-3JEIdqeX2gs93E5o,231
 nonebot_plugin_l4d2_server/l4_image/vtfs.py,sha256=He_7zzEIOip8MXP55TS7aWPbzo6ac0wPf602nN3GWZM,1461
-nonebot_plugin_l4d2_server/l4_local/__init__.py,sha256=B4E30jX4733M4eNCJvIQhsN4M0nlxLezSXMSwUYLRIk,3581
+nonebot_plugin_l4d2_server/l4_local/__init__.py,sha256=gNNUNXGKHA8UXQaDKomND4VEutGpAghpYE4Va13gb5I,4736
 nonebot_plugin_l4d2_server/l4_local/file.py,sha256=hew1Y8kV3uSZvUGplmi09EGKC89-sUJWsWV7SCEstI8,3067
-nonebot_plugin_l4d2_server/l4_request/__init__.py,sha256=OrwOyucW-DyKVDk8LRA24h0gQIyzmhWbG73DG3O2JgM,7499
-nonebot_plugin_l4d2_server/l4_request/draw_msg.py,sha256=KpSfl6ZLaxPbax0SgO07niJloeMARuQJ2T-F_XeH6uQ,8108
-nonebot_plugin_l4d2_server/l4_request/utils.py,sha256=7E_Cqp4UcKjrnGBn0gbs5nGiC37RAKmUBJx7qEaXi6Q,5166
+nonebot_plugin_l4d2_server/l4_request/__init__.py,sha256=p8ndsNC4QCJ97K9fZwCQ2y6jOa5-QU14soQ3dIZzIKg,7544
+nonebot_plugin_l4d2_server/l4_request/draw_msg.py,sha256=2HvUpVdge4lHG3y7LpB1Babi7jTkpoVP325V3MTvgBA,12151
+nonebot_plugin_l4d2_server/l4_request/utils.py,sha256=UyRceC5FOS_GeUNKJtL1OpXwq-f5QiVxSpy6rgj52p8,5102
 nonebot_plugin_l4d2_server/utils/api/api.py,sha256=auvDicCEKwvnm6EJYeCxCtugFby61K-zAmmaRWWEwtM,296
 nonebot_plugin_l4d2_server/utils/api/models.py,sha256=p-hoxPHwadTaMRb2hqwfbaQ3pvJySrV8VbBmhA0Oi-M,2391
 nonebot_plugin_l4d2_server/utils/api/request.py,sha256=JGAhMgPgmy2Z2w7w3GVlUGKBmxlaTTDD3bq1T2dhHIE,13567
 nonebot_plugin_l4d2_server/utils/api/utils.py,sha256=rdrFK3VKP59KfNX-C8v0Q_IV3tBLm02Wo9axLTQQ87Y,762
 nonebot_plugin_l4d2_server/utils/database/models.py,sha256=SLdcgwsn39r_ZkcBoqf4MLX1EfpCOjGBwWcR16u9Bqo,454
 nonebot_plugin_l4d2_server/utils/utils.py,sha256=TD3cUCxmmj2GPmK1sQwP7NtkIXNO2FpuXjymaUqBDYo,6141
-nonebot_plugin_l4d2_server-1.0.8.dist-info/RECORD,,
+nonebot_plugin_l4d2_server-1.0.9.dist-info/RECORD,,