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

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

{nonebot_plugin_l4d2_server-1.0.9 → nonebot_plugin_l4d2_server-1.1.0}/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-1.0.9 → nonebot_plugin_l4d2_server-1.1.0}/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-1.0.9 → nonebot_plugin_l4d2_server-1.1.0}/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-1.0.9 → 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.9 → nonebot_plugin_l4d2_server-1.1.0}/pyproject.toml

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