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

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

nonebot_plugin_l4d2_server/l4_request/__init__.py

@@ -119,7 +119,8 @@ async def get_group_detail(
     command: str,
 ):
     server_json = _get_server_json(command, ALLHOST)
-    logger.debug(server_json)
+    # logger.debug(f"获取组服务器信息: {server_json}")
+    logger.info(server_json)
     if server_json is None:
         logger.warning("未找到这个组")
         return None
@@ -212,12 +213,16 @@ 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)
-    logger.debug(server_json)
+    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("未找到这个组")
         return None
@@ -239,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/l4_request/draw_msg.py

@@ -53,24 +53,7 @@ async def draw_one_ip(host: str, port: int, is_img: bool = config.l4_image):
             完整的服务器信息字符串
         """
 
-        # 处理服务器类型显示
-        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}
@@ -78,9 +61,7 @@ async def draw_one_ip(host: str, port: int, is_img: bool = config.l4_image):
         if server.ping is not None:
             msg += f"""
 延迟: {server.ping * 1000:.0f} ms
-类型: {type_map.get(server_type, '未知')} ({platform_map.get(platform, '未知')})
-VAC : {vac_status}
-密码: {pw_status}\n
+VAC : {vac_status}\n
 {player_info}"""
         if config.l4_show_ip:
             msg += f"""

nonebot_plugin_l4d2_server/l4_request/utils.py

@@ -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
 
 

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.9.dist-info → nonebot_plugin_l4d2_server-1.1.0.dist-info}/METADATA

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

@@ -1,13 +1,13 @@
-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-1.1.0.dist-info/METADATA,sha256=0_5GoxERyaHRpJ_EGFVGROojGUvr8TqWkdZYNrQ0bs0,6759
+nonebot_plugin_l4d2_server-1.1.0.dist-info/WHEEL,sha256=tSfRZzRHthuv7vxpI4aehrdN9scLjk-dCJkPLzkHxGg,90
+nonebot_plugin_l4d2_server-1.1.0.dist-info/entry_points.txt,sha256=6OYgBcLyFCUgeqLgnvMyOJxPCWzgy7se4rLPKtNonMs,34
+nonebot_plugin_l4d2_server-1.1.0.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/__main__.py,sha256=-m1tH_4T-9AP66V3Drb1t8CZXZMc0eAUXZsBY3LEBuI,10271
 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=_e2uAaiECMGhbunurdN3dImu00l5j1uDCLBMxPlqolM,1479
+nonebot_plugin_l4d2_server/l4_help/__init__.py,sha256=4TODWKsj4a_VMCFAJBVwtzb3p8LQszzoRMmmF8DmSpQ,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
@@ -85,13 +85,13 @@ nonebot_plugin_l4d2_server/l4_image/model.py,sha256=FGsCvf_BKbRNJUVy6I5BKnArMY-3
 nonebot_plugin_l4d2_server/l4_image/vtfs.py,sha256=He_7zzEIOip8MXP55TS7aWPbzo6ac0wPf602nN3GWZM,1461
 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=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/l4_request/__init__.py,sha256=6fSaWFUC-dgU5DWzdDxxcAV4-LwxSaIZbTn7UXE_H3g,8179
+nonebot_plugin_l4d2_server/l4_request/draw_msg.py,sha256=5zMPPSUAUarInOugBUvZVNZjxTVNrg6kO3FOtSzVpKs,11482
+nonebot_plugin_l4d2_server/l4_request/utils.py,sha256=VInMCBduIL0I3zLQ60Sq29gwZ3hbU4tRyOT94mJD-vo,5229
 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.9.dist-info/RECORD,,
+nonebot_plugin_l4d2_server/utils/utils.py,sha256=KHfnTO3a-rGpjhXTsXypC0xb61ijpON631zqjIAW2vo,6836
+nonebot_plugin_l4d2_server-1.1.0.dist-info/RECORD,,