PyPI - nonebot-plugin-l4d2-server - Versions diffs - 1.0.9__tar.gz → 1.1.1__tar.gz - Mend

nonebot-plugin-l4d2-server 1.0.9tar.gz → 1.1.1tar.gz

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (97) hide show

{nonebot_plugin_l4d2_server-1.0.9 → nonebot_plugin_l4d2_server-1.1.1}/PKG-INFO RENAMED Viewed

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: nonebot-plugin-l4d2-server
-Version: 1.0.9
+Version: 1.1.1
 Summary: L4D2 server related operations plugin for NoneBot2
 Keywords: steam,game,l4d2,nonebot2,plugin
 Author-Email: Agnes_Digital <Z735803792@163.com>
@@ -15,7 +15,7 @@ Classifier: Programming Language :: Python :: 3.12
 Classifier: Operating System :: OS Independent
 Project-URL: homepage, https://github.com/Agnes4m/nonebot_plugin_l4d2_server
 Requires-Python: <4.0,>=3.9
-Requires-Dist: nonebot2>=2.0.0
+Requires-Dist: nonebot2>=2.1.0
 Requires-Dist: nonebot2[fastapi]>=2.3.3
 Requires-Dist: nonebot-plugin-htmlrender>=0.3.0
 Requires-Dist: nonebot-adapter-onebot>=2.4.4

{nonebot_plugin_l4d2_server-1.0.9 → nonebot_plugin_l4d2_server-1.1.1}/nonebot_plugin_l4d2_server/__main__.py RENAMED Viewed

@@ -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.1}/nonebot_plugin_l4d2_server/l4_help/__init__.py RENAMED Viewed

@@ -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.1"
 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.1}/nonebot_plugin_l4d2_server/l4_image/html_img.py RENAMED Viewed

@@ -76,7 +76,7 @@ async def get_server_img(plugins: List[OutServer]) -> Optional[bytes]:
         else:
             template = env.get_template("normal.html")
         content = await template.render_async(
-            plugins=plugins,
+            servers=plugins,
             max_count=config.l4_players,
         )
         return await html_to_pic(
@@ -86,5 +86,5 @@ async def get_server_img(plugins: List[OutServer]) -> Optional[bytes]:
             template_path=f"file://{template_path.absolute()}",
         )
     except Exception as e:
-        logger.warning(f"Error in get_help_img: {e}")
+        logger.warning(f"Error in get_server_img: {e}")
     return None

nonebot_plugin_l4d2_server-1.1.1/nonebot_plugin_l4d2_server/l4_image/img/template/normal.html ADDED Viewed

@@ -0,0 +1,205 @@
+<!DOCTYPE html>
+<html lang="zh-CN">
+<head>
+    <meta charset="UTF-8">
+    <title>Anne云服服务器状态</title>
+    <style>
+        body {
+            width: 900px;
+            margin: 0 auto;
+            /* 改为自动居中 */
+            font-family: 'Microsoft YaHei', 'Arial', sans-serif;
+            background-color: #f0f2f5;
+            padding: 10px 0;
+            /* 只保留上下padding */
+        }
+        .outer-frame {
+            width: 900px;
+            background-color: white;
+            border-radius: 12px;
+            box-shadow: 0 4px 12px rgba(0, 0, 0, 0.08);
+            overflow: hidden;
+            border: 1px solid #e0e3e7;
+            margin: 0 auto;
+            /* 确保居中 */
+        }
+        .container {
+            width: 880px;
+            /* 调整为更接近外层宽度 */
+            margin: 0 auto;
+            padding: 20px 10px;
+            /* 减少左右padding */
+            box-sizing: border-box;
+        }
+        h1 {
+            text-align: center;
+            color: #2c3e50;
+            margin: 0 0 20px 0;
+            padding-bottom: 10px;
+            border-bottom: 2px solid #eee;
+            font-size: 24px;
+        }
+        .server-grid {
+            display: grid;
+            grid-template-columns: repeat(3, 280px);
+            /* 调整为3列280px */
+            gap: 10px;
+            justify-content: center;
+            /* 确保居中 */
+            padding: 0 10px;
+            /* 添加内边距防止溢出 */
+        }
+        .server-card {
+            width: 100%;
+            /* 改为100%填充网格单元格 */
+            background-color: #fff;
+            border: 1px solid #e0e3e7;
+            border-radius: 8px;
+            padding: 12px;
+            box-sizing: border-box;
+            box-shadow: 0 2px 6px rgba(0, 0, 0, 0.03);
+        }
+        /* 其余样式保持不变... */
+        .server-name {
+            font-weight: bold;
+            font-size: 14px;
+            color: #3498db;
+            margin-bottom: 8px;
+            white-space: nowrap;
+            overflow: hidden;
+            text-overflow: ellipsis;
+            text-align: left;
+        }
+        .server-details {
+            display: grid;
+            grid-template-columns: 80px 1fr;
+            gap: 5px;
+            font-size: 12px;
+        }
+        .detail-label {
+            font-weight: bold;
+            color: #7f8c8d;
+            text-align: left;
+        }
+        .detail-value {
+            text-align: left;
+        }
+        .map-name {
+            font-size: 13px;
+            color: #e74c3c;
+            margin: 5px 0;
+            text-align: left;
+            font-style: normal;
+            padding-left: 5px;
+        }
+        .players {
+            text-align: left;
+            margin-top: 6px;
+            font-size: 12px;
+            padding-left: 0px;
+        }
+        .online {
+            color: #27ae60;
+        }
+        .offline {
+            color: #e74c3c;
+        }
+        .footer {
+            text-align: center;
+            margin-top: 20px;
+            color: #7f8c8d;
+            font-size: 12px;
+            border-top: 1px solid #eee;
+            padding-top: 10px;
+        }
+        .map-name:before,
+        .players:before {
+            margin-right: 5px;
+        }
+        .vac-icon {
+            width: 13px;
+            height: auto;
+            margin-left: 15px;
+        }
+        .platform {
+            width: 13px;
+            height: auto;
+            margin-left: 15px;
+        }
+    </style>
+</head>
+<body>
+    <div class="outer-frame">
+        <div class="container">
+            <h1>Anne云服服务器状态 (共 {{ servers|length }} 台)</h1>
+            <div class="server-grid">
+                {% for server in servers %}
+                <div class="server-card">
+                    <div class="server-name" title="{{ server.server.server_name }}">
+                        {{ server.server.server_name|replace('\n', ' ')|replace(' ', ' ')|trim }}
+                    </div>
+                    <div class="map-name" title="当前地图">
+                        🗺️ {{ server.server.map_name }}
+                    </div>
+                    <div class="players">
+                        {% if server.server.player_count >= 0 %}
+                        <span class="online">
+                            {% if server.server.max_players == 0 %}
+                            🔴
+                            {% elif server.server.player_count / server.server.max_players < 0.5 %} 🟢 {% elif
+                                server.server.player_count>= server.server.max_players
+                                %}
+                                🟡
+                                {% else %}
+                                🔵
+                                {% endif %}</span>
+                        {{ server.server.player_count }}/{{ server.server.max_players}}
+                        {% else %}
+                        <span class="offline">🔴 错误</span>
+                        {% endif %}
+                        <img class="platform" src="{{server.server.platform}}.svg" width="13" height="13" />{% if server.server.vac_enabled %}<img class="vac-icon" src="vac.png">{% endif %}
+                        <span class="platform">{{ (server.server.ping * 1000)|round(1) }} ms </span>
+                    </div>
+          <div class="player">
+            {% set player_count = server.player|length %}
+            {% for i in range(max_count) %}
+            {% set player = server.player[i] if i < player_count else None %} {% if player and player.name %} <font
+              color="green">• {{ player.score }} | {{ player.name }}</font><br>
+              {% else %}
+              {% endif %}
+              {% endfor %}
+          </div>
+                </div>
+                {% endfor %}
+            </div>
+            <div class="footer">
+                111
+            </div>
+        </div>
+    </div>
+</body>
+</html>

{nonebot_plugin_l4d2_server-1.0.9 → nonebot_plugin_l4d2_server-1.1.1}/nonebot_plugin_l4d2_server/l4_request/__init__.py RENAMED Viewed

@@ -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.1}/nonebot_plugin_l4d2_server/l4_request/draw_msg.py RENAMED Viewed

@@ -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.1}/nonebot_plugin_l4d2_server/l4_request/utils.py RENAMED Viewed

@@ -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.1}/nonebot_plugin_l4d2_server/utils/utils.py RENAMED Viewed

@@ -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.1}/pyproject.toml RENAMED Viewed

@@ -14,7 +14,7 @@ keywords = [
     "plugin",
 ]
 dependencies = [
-    "nonebot2>=2.0.0",
+    "nonebot2>=2.1.0",
     "nonebot2[fastapi]>=2.3.3",
     "nonebot-plugin-htmlrender>=0.3.0",
     "nonebot-adapter-onebot>=2.4.4",
@@ -47,7 +47,7 @@ classifiers = [
     "Operating System :: OS Independent",
 ]
 readme = "README.md"
-version = "1.0.9"
+version = "1.1.1"
 [project.license]
 text = "GPLv3"