nonebot-plugin-l4d2-server 1.0.0a2__tar.gz → 1.0.1__tar.gz

{nonebot_plugin_l4d2_server-1.0.0a2 → nonebot_plugin_l4d2_server-1.0.1}/PKG-INFO

@@ -1,9 +1,8 @@
 Metadata-Version: 2.1
 Name: nonebot-plugin-l4d2-server
-Version: 1.0.0a2
+Version: 1.0.1
 Summary: L4D2 server related operations plugin for NoneBot2
 Keywords: steam,game,l4d2,nonebot2,plugin
-Home-page: https://github.com/Agnes4m/nonebot_plugin_l4d2_server
 Author-Email: Agnes_Digital <Z735803792@163.com>
 License: GPLv3
 Classifier: License :: OSI Approved :: GNU General Public License v3 (GPLv3)
@@ -13,7 +12,7 @@ Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Operating System :: OS Independent
-Project-URL: Homepage, https://github.com/Agnes4m/nonebot_plugin_l4d2_server
+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: nonebot-plugin-htmlrender>=0.3.0
@@ -87,7 +86,6 @@ _✨Nonebot & Left 4 Dead 2 server操作✨_
 
 以下提到的方法 任选**其一** 即可
 
-
 <details open>
 <summary>[推荐] 使用 nb-cli 安装</summary>
 在 nonebot2 项目的根目录下打开命令行, 输入以下指令即可安装
@@ -164,7 +162,7 @@ conda install nonebot-plugin-l4d2-server
     l4_style = "default"
     """图片风格，可选包括以下，默认简洁
     - 暗风格
-    - 孤独摇滚        
+    - 孤独摇滚
     - 电玩像素
     - 缤纷彩虹
 """
@@ -185,7 +183,7 @@ conda install nonebot-plugin-l4d2-server
 - 水果 - html图片优化
 
 - 感谢以下服主大力支持
-  - Michaela's | 机器人功能测试反馈 
+  - Michaela's | 机器人功能测试反馈
   - 东 | 提供docker部署方法等建议 | [电信服anne游戏群](http://qm.qq.com/cgi-bin/qm/qr?_wv=1027&k=6i7r5aJ7Jyg0ejby4rt9GWmFRF53nV1K&authKey=ekMsWepBZPL26%2BfJAG%2F95JD0fhvH39%2BIGVyKOvNlXVDbpIclJlly4kXqukL7JhWR&noverify=0&group_code=883237206)
   - 迷茫 | 催命更新byd
   - ArcPav | 积极反馈bug，提供改进思路

{nonebot_plugin_l4d2_server-1.0.0a2 → nonebot_plugin_l4d2_server-1.0.1}/README.md

@@ -51,7 +51,6 @@ _✨Nonebot & Left 4 Dead 2 server操作✨_
 
 以下提到的方法 任选**其一** 即可
 
-
 <details open>
 <summary>[推荐] 使用 nb-cli 安装</summary>
 在 nonebot2 项目的根目录下打开命令行, 输入以下指令即可安装
@@ -128,7 +127,7 @@ conda install nonebot-plugin-l4d2-server
     l4_style = "default"
     """图片风格，可选包括以下，默认简洁
     - 暗风格
-    - 孤独摇滚        
+    - 孤独摇滚
     - 电玩像素
     - 缤纷彩虹
 """
@@ -149,7 +148,7 @@ conda install nonebot-plugin-l4d2-server
 - 水果 - html图片优化
 
 - 感谢以下服主大力支持
-  - Michaela's | 机器人功能测试反馈 
+  - Michaela's | 机器人功能测试反馈
   - 东 | 提供docker部署方法等建议 | [电信服anne游戏群](http://qm.qq.com/cgi-bin/qm/qr?_wv=1027&k=6i7r5aJ7Jyg0ejby4rt9GWmFRF53nV1K&authKey=ekMsWepBZPL26%2BfJAG%2F95JD0fhvH39%2BIGVyKOvNlXVDbpIclJlly4kXqukL7JhWR&noverify=0&group_code=883237206)
   - 迷茫 | 催命更新byd
   - ArcPav | 积极反馈bug，提供改进思路

{nonebot_plugin_l4d2_server-1.0.0a2 → nonebot_plugin_l4d2_server-1.0.1}/nonebot_plugin_l4d2_server/__main__.py

@@ -15,8 +15,10 @@
 * along with this program.  If not, see <https://www.gnu.org/licenses/>.
 """
 
+from pathlib import Path
 from typing import TYPE_CHECKING, List, Optional
 
+import ujson as json
 from nonebot.adapters import Message
 from nonebot.log import logger
 from nonebot.matcher import Matcher
@@ -26,12 +28,14 @@ from nonebot_plugin_alconna import UniMessage
 
 from .config import config
 from .l4_help import get_l4d2_core_help
+from .l4_local import *  # noqa: F403
 from .l4_request import (
     COMMAND,
     get_all_server_detail,
     get_ip_server,
     get_server_detail,
     reload_ip,
+    tj_request
 )
 from .utils.api.request import L4API
 
@@ -47,6 +51,9 @@ l4_all = on_command("l4all", aliases={"l4全服"})
 l4_connect = on_command("connect", aliases={"l4连接"})
 l4_find_player = on_command("l4find", aliases={"l4查找"})
 
+ld_tj = on_command("tj", aliases={"探监"})
+ld_zl = on_command("zl")
+ld_kl = on_command("kl")
 
 @l4_help.handle()
 async def _(matcher: Matcher):
@@ -135,6 +142,88 @@ async def _(args: Message = CommandArg()):
     if not arg:
         reload_ip()
         logger.success("重载ip完成")
+        with (Path(config.l4_path) / "config.json").open("r", encoding="utf-8") as f:
+            content = f.read().strip()
+            ip_json = json.loads(content)
+        for tag, url in ip_json.items():
+            logger.info(f"重载{tag}的ip")
+            await L4API.get_sourceban(tag, url)
         await UniMessage.text("重载ip完成").finish()
+        
+
+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()
+    
+    config_path = Path(config.l4_path) / "config.json"
+    
+    if not config_path.is_file():
+        config_data = {}
     else:
-        print(await L4API.get_sourceban())
+        try:
+            with config_path.open("r") as f:
+                config_data = json.load(f)
+        except (json.JSONDecodeError, FileNotFoundError):
+            config_data = {}
+    
+    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()
+    
+    await L4API.get_sourceban(arg[0], arg[1])
+    await UniMessage.text(f"添加成功\n组名: {arg[0]}\n网址: {arg[1]}").finish()
+    
+
+l4_del_ban = on_command("l4delban", aliases={"l4删除ban", "l4移除ban"})
+@l4_del_ban.handle()
+async def _(args: Message = CommandArg()):    
+    arg = args.extract_plain_text().strip().split(" ")
+    if  len(arg) not in [1,2]:
+        await UniMessage.text("请在命令后增加响应指令名或者带响应网址").finish()
+    elif len(arg) == 1:
+        if not Path(Path(config.l4_path) / "config.json").is_file():
+            await UniMessage.text("没有添加过组名").finish()
+        else:
+            with (Path(config.l4_path) / "config.json").open("r", encoding="utf-8") as f:
+                content = f.read().strip()
+                config_data = json.loads(content)            
+            if arg[0] not in config_data:
+                await UniMessage.text("没有添加过这个组").finish()
+            else:
+                del config_data[arg[0]]
+                with Path(Path(config.l4_path) / "config.json").open("w") as f:
+                    json.dump(config_data, f,ensure_ascii=False,indent=4)
+                await UniMessage.text(f"删除成功，组名:{arg[0]}").finish()
+    elif len(arg) == 2:
+        if not Path(Path(config.l4_path) / "config.json").is_file():
+            await UniMessage.text("没有添加过组名").finish()
+        else:
+            with (Path(config.l4_path) / "config.json").open("r", encoding="utf-8") as f:
+                content = f.read().strip()
+                config_datas = json.loads(content)
+            if arg[0] not in config_datas:
+                await UniMessage.text("没有添加过这个组").finish()
+            else:
+                config_datas[arg[0]] = arg[1]
+                with Path(Path(config.l4_path) / "config.json").open("w") as f:
+                    json.dump(config_datas, f,ensure_ascii=False,indent=4)
+                await UniMessage.text(f"修改成功，组名:{arg[0]},网址:{arg[1]}").finish()
+                
+                
+@ld_tj.handle()
+async def _(matcher: Matcher):
+    await matcher.send("正在寻找牢房信息")
+    await matcher.finish(await tj_request("云","tj"))
+    
+@ld_zl.handle()
+async def _(matcher: Matcher):
+    await matcher.send("正在寻找牢房信息")
+    await matcher.finish(await tj_request("云","zl"))

{nonebot_plugin_l4d2_server-1.0.0a2 → nonebot_plugin_l4d2_server-1.0.1}/nonebot_plugin_l4d2_server/config.py

@@ -11,9 +11,12 @@ server_all_path.mkdir(parents=True, exist_ok=True)
 
 ICONPATH = DATAPATH / "icon"
 
+global map_index
+map_index = 0
+
 
 class ConfigModel(BaseModel):
-    l4_anne: bool = True
+    l4_anne: bool = False
     """是否启用anne电信服相关功能"""
     l4_enable: bool = True
     """是否全局启用求生功能"""
@@ -30,6 +33,9 @@ class ConfigModel(BaseModel):
     l4_font: str = str(Path(__file__).parent.joinpath("data/font/loli.ttf"))
     """字体"""
     l4_show_ip: bool = True
+    """单服务器查询时候是否展示ip直连地址"""
+    l4_local: list[str] = []
+    """本地服务器路径,填写路径下有`steam_appid.txt`文件"""
 
 
 config = get_plugin_config(ConfigModel)

{nonebot_plugin_l4d2_server-1.0.0a2 → nonebot_plugin_l4d2_server-1.0.1}/nonebot_plugin_l4d2_server/l4_anne/__init__.py

@@ -1,4 +1,5 @@
-from nonebot import log as log, on_command  # noqa: N999
+from nonebot import log as log
+from nonebot import on_command
 from nonebot.adapters import Event, Message
 from nonebot.log import logger
 from nonebot.params import CommandArg

{nonebot_plugin_l4d2_server-1.0.0a2 → nonebot_plugin_l4d2_server-1.0.1}/nonebot_plugin_l4d2_server/l4_help/Help.json

@@ -83,6 +83,14 @@
         "need_ck": false,
         "need_sk": false,
         "need_admin": true
+      },      
+      {
+        "name": "l4地图上传",
+        "desc": "进入交互上传地图文件",
+        "eg": "l4地图上传",
+        "need_ck": false,
+        "need_sk": false,
+        "need_admin": true
       }
     ]
   },

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

{nonebot_plugin_l4d2_server-1.0.0a2 → nonebot_plugin_l4d2_server-1.0.1}/nonebot_plugin_l4d2_server/l4_image/anne_pil.py

@@ -1,8 +1,9 @@
 from pathlib import Path
 
-from nonebot_plugin_l4d2_server.utils.api.models import AnnePlayer2
 from PIL import Image, ImageFont
 
+from nonebot_plugin_l4d2_server.utils.api.models import AnnePlayer2
+
 from ..config import config
 
 font = ImageFont.truetype(config.l4_font)
@@ -10,7 +11,7 @@ font = ImageFont.truetype(config.l4_font)
 anne_path = Path(__file__).parent / "img" / "anne"
 
 
-async def anne_player_info(msg: AnnePlayer2):
+async def anne_player_info(msg: AnnePlayer2):  # noqa: RUF029
     back_img = Image.open(anne_path / "back1.jpg")
     base_img = Image.new("RGBA", (back_img.size), (255, 255, 255, 50))
     back_img.paste(base_img, (0, 0), base_img)

{nonebot_plugin_l4d2_server-1.0.0a2 → nonebot_plugin_l4d2_server-1.0.1}/nonebot_plugin_l4d2_server/l4_image/convert.py

@@ -21,32 +21,28 @@ def core_font(size: int) -> ImageFont.FreeTypeFont:
 async def convert_img(
     img: Image.Image,
     is_base64: bool = False,
-) -> bytes:
-    ...
+) -> bytes: ...
 
 
 @overload
 async def convert_img(
     img: Image.Image,
-    is_base64: bool = True,
-) -> str:
-    ...
+    is_base64: bool = True,  # noqa: FBT001
+) -> str: ...
 
 
 @overload
 async def convert_img(
     img: bytes,
     is_base64: bool = False,
-) -> str:
-    ...
+) -> str: ...
 
 
 @overload
 async def convert_img(
     img: Path,
     is_base64: bool = False,
-) -> str:
-    ...
+) -> str: ...
 
 
 async def convert_img(
@@ -78,7 +74,7 @@ async def convert_img(
         async with aiofiles.open(img, "rb") as fp:
             img = await fp.read()
 
-    logger.success("图片处理完成！")
+    logger.success("图片处理完成!")
 
     return f"base64://{b64encode(img).decode()}"
 
@@ -90,7 +86,7 @@ def convert_img_sync(img_path: Path):
     return f"base64://{b64encode(img).decode()}"
 
 
-async def str_lenth(r: str, size: int, limit: int = 540) -> str:
+async def str_lenth(r: str, size: int, limit: int = 540) -> str:  # noqa: RUF029
     result = ""
     temp = 0
     for i in r:
@@ -158,7 +154,7 @@ async def text2pic(text: str, max_size: int = 800, font_size: int = 24):
 
     img = Image.new(
         "RGB",
-        (max_size, len(text) * font_size // 3),
+        (max_size, len(text) * font_size // 10),
         (255, 255, 255),
     )
     img_draw = ImageDraw.ImageDraw(img)

{nonebot_plugin_l4d2_server-1.0.0a2 → nonebot_plugin_l4d2_server-1.0.1}/nonebot_plugin_l4d2_server/l4_image/download.py

@@ -27,20 +27,22 @@ async def download_url(url: str) -> bytes:
                 logger.warning(f"Error downloading {url}, retry {i}/3: {e}")
                 await asyncio.sleep(3)
 
-    raise Exception(f"{url} 下载失败！")
+    raise Exception(f"{url} 下载失败!")
 
 
 async def download_head(user_id: str) -> bytes:
     url = f"http://q1.qlogo.cn/g?b=qq&nk={user_id}&s=640"
     data = await download_url(url)
-    if hashlib.md5(data).hexdigest() == "acef72340ac0e914090bd35799f5594e":  # noqa: S324
+    if (
+        hashlib.md5(data).hexdigest() == "acef72340ac0e914090bd35799f5594e"
+    ):  # noqa: S324
         url = f"http://q1.qlogo.cn/g?b=qq&nk={user_id}&s=100"
         data = await download_url(url)
     return data
 
 
 def square_to_circle(im: ImageS):
-    """im是正方形，变圆形"""
+    """im是正方形,变圆形"""
     size = im.size
     mask = Image.new("L", size, 0)
     draw = ImageDraw.Draw(mask)

{nonebot_plugin_l4d2_server-1.0.0a2 → nonebot_plugin_l4d2_server-1.0.1}/nonebot_plugin_l4d2_server/l4_image/html_img.py

@@ -23,7 +23,7 @@ env = jinja2.Environment(
 
 async def server_ip_pic(server_dict: List[OutServer]):
     """
-    输入一个字典列表，输出图片
+    输入一个字典列表,输出图片
     msg_dict:folder/name/map_/players/max_players/Players/[Name]
     """
     for server_info in server_dict:
@@ -92,7 +92,7 @@ async def get_server_img(plugins: List[OutServer]) -> Optional[bytes]:
 
 # async def server_group_ip_pic(msg_list: List[ServerGroup]) -> bytes:
 #     """
-#     输入一个群组字典列表，输出图片
+#     输入一个群组字典列表,输出图片
 #     msg_dict:folder/name/map_/players/max_players/Players/[Name]
 #     """
 #     template = env.get_template("group_ip.html")

{nonebot_plugin_l4d2_server-1.0.0a2 → nonebot_plugin_l4d2_server-1.0.1}/nonebot_plugin_l4d2_server/l4_image/image_tools.py

@@ -44,7 +44,10 @@ def get_v4_bg(w: int, h: int, is_dark: bool = False, is_blur: bool = False):
     return img.convert("RGBA")
 
 
-async def shift_image_hue(img: Image.Image, angle: float = 30) -> Image.Image:
+async def shift_image_hue(
+    img: Image.Image,
+    angle: float = 30,
+) -> Image.Image:  # noqa: RUF029
     alpha = img.getchannel("A")
     img = img.convert("HSV")
 
@@ -120,7 +123,7 @@ def draw_center_text_by_line(
                 line = line.replace("\n", "")
                 img.text((x, y), line, fill, font, anchor)
                 line, lenth = "", 0
-                y += h * 2.5
+                y += h * 1.5
     else:
         img.text((x, y), line, fill, font, anchor)
     return y
@@ -198,7 +201,7 @@ def easy_paste(
     """
     inplace method
     快速粘贴, 自动获取被粘贴图像的坐标。
-    pos应当是粘贴点坐标，direction指定粘贴点方位，例如lt为左上
+    pos应当是粘贴点坐标,direction指定粘贴点方位,例如lt为左上
     """
     x, y = pos
     size_x, size_y = im_paste.size
@@ -379,11 +382,11 @@ class CustomizeImage:
         for i in range(color):
             bg = tuple(
                 q.getpalette()[  # type:ignore
-                    i * 3 : (i * 3) + 3  # noqa:E203
+                    i * 3 : (i * 3) + 3
                 ],
             )
             light_value = bg[0] * 0.3 + bg[1] * 0.6 + bg[2] * 0.1
-            if abs(light_value - based_light) < temp:  # noqa:E203
+            if abs(light_value - based_light) < temp:
                 bg_color = bg
                 temp = abs(light_value - based_light)
         return bg_color  # type:ignore

nonebot_plugin_l4d2_server-1.0.1/nonebot_plugin_l4d2_server/l4_local/__init__.py

@@ -0,0 +1,98 @@
+from pathlib import Path
+
+from nonebot.adapters import Event
+from nonebot.log import logger
+from nonebot.matcher import Matcher
+from nonebot_plugin_alconna import File, UniMessage, UniMsg, on_alconna
+
+from ..config import config, map_index
+from ..l4_image.convert import text2pic
+from ..utils.utils import mes_list
+from .file import updown_l4d2_vpk
+
+try:
+    vpk_path = config.l4_local[map_index]
+except IndexError:
+    logger.warning("未填写本地服务器路径,如果想要使用本地服务器功能,请填写本地服务器路径")
+    vpk_path = ""
+
+local_path_list = config.l4_local
+if not local_path_list:
+    logger.warning(
+        "未填写本地服务器路径,如果想要使用本地服务器功能,请填写本地服务器路径",
+    )
+else:
+    local_path: list[Path] = []
+    for folder_path in local_path_list:
+        path = Path(folder_path)
+
+        if path.is_dir():
+            for nextdir in path.iterdir():
+                # 如果找到了名为left4dead2的目录,返回True
+                if nextdir.name == "left4dead2" and nextdir.is_dir():
+                    local_path.append(nextdir)
+            continue
+    logger.debug(f"本地服务器路径列表:{local_path}")
+
+    search_map = on_alconna(
+        "l4map",
+        aliases={"l4地图查询", "l4地图"},
+        priority=20,
+        block=True,
+    )
+
+    @search_map.handle()
+    async def _():
+        supath = local_path[map_index] / "addons"
+        vpk_list: list[str] = []
+        print(supath)
+        if supath.is_dir():
+            for sudir in supath.iterdir():
+                logger.info(f"找到文件:{sudir}")
+                if sudir.is_file() and sudir.name.endswith(".vpk"):
+                    vpk_list.append(sudir.name)
+        if not vpk_list:
+            await UniMessage.text("未找到可用的VPK文件").finish()
+        out_msg = "\n".join(
+            f"{index + 1}、{line}" for index, line in enumerate(vpk_list)
+        )
+
+        img = await text2pic(f"服务器地图:\n{out_msg}")
+        await UniMessage.image(raw=img).send()
+
+    up = on_alconna(
+        "l4upload",
+        aliases={"l4地图上传"},
+        priority=5,
+        block=True,
+    )
+
+    @up.handle()
+    async def _():
+        await UniMessage.text("请发送地图文件").finish()
+
+    @up.got("map_url", prompt="图来")
+    async def _(ev: Event, msg: UniMsg, matcher: Matcher):
+        if not msg.has(File):
+            await UniMessage.text("不是文件,退出交互").finish()
+        args = ev.dict()
+        if args["notice_type"] != "offline_file":
+            matcher.set_arg("txt", args)  # type: ignore
+            return
+        l4_file_path = config.l4_local[map_index]
+        map_path = Path(l4_file_path, vpk_path)  # type: ignore
+        # 检查下载路径是否存在
+        if not Path(l4_file_path).exists():  # type: ignore
+            await UniMessage.text("你填写的路径不存在辣").finish()
+        if not Path(map_path).exists():
+            await UniMessage.text("这个路径并不是求生服务器的路径,请再看看罢").finish()
+        url: str = args["file"]["url"]
+        name: str = args["file"]["name"]
+        # 如果不符合格式则忽略
+        await up.send("已收到文件,开始下载")
+        vpk_files = await updown_l4d2_vpk(map_path, name, url)
+        if vpk_files:
+            mes = "解压成功,新增以下几个vpk文件"
+            await UniMessage.text(mes_list(mes, vpk_files)).finish()
+        else:
+            await UniMessage.text("你可能上传了相同的文件,或者解压失败了捏").finish()

nonebot_plugin_l4d2_server-1.0.1/nonebot_plugin_l4d2_server/l4_local/file.py

@@ -0,0 +1,105 @@
+import io
+import platform
+import zipfile
+from pathlib import Path
+from typing import Callable, Dict, List
+from zipfile import ZipFile
+
+import rarfile
+from nonebot.log import logger
+from pyunpack import Archive
+
+from ..utils.utils import get_file, get_vpk
+
+systems = platform.system()
+
+
+async def updown_l4d2_vpk(map_paths: Path, name: str, url: str):
+    """从url下载压缩包并解压到位置"""
+    original_vpk_files = get_vpk(map_paths)
+    down_file = Path(map_paths, name)
+    if await get_file(url, down_file) is None:
+        return None
+    msg = open_packet(name, down_file)
+    logger.info(msg)
+
+    extracted_vpk_files = get_vpk(map_paths)
+    # 获取新增vpk文件的list
+    return list(set(extracted_vpk_files) - set(original_vpk_files))
+
+
+SUPPORTED_EXTENSIONS = (".zip", ".7z", ".rar")
+
+
+def unzip_zipfile(down_file: Path, down_path: Path):
+    """解压zip文件"""
+    with support_gbk(zipfile.ZipFile(down_file, "r")) as z:
+        z.extractall(down_path)
+    down_file.unlink()
+
+
+def unpack_7zfile(down_file: Path, down_path: Path):
+    """解压7z文件"""
+    Archive(str(down_file)).extractall(str(down_path))
+    down_file.unlink()
+
+
+def unpack_rarfile(down_file: Path, down_path: Path):
+    """解压rar文件"""
+    with rarfile.RarFile(down_file, "r") as z:
+        z.extractall(down_path)
+    down_file.unlink()
+
+
+def open_packet(name: str, down_file: Path) -> str:
+    """解压压缩包"""
+    down_path = down_file.parent
+    logger.info("文件名为:" + name)
+    logger.info(f"系统为{systems}")
+    if name.endswith(".vpk"):
+        return "vpk文件已下载"
+
+    for ext in SUPPORTED_EXTENSIONS:
+        if name.endswith(ext):
+            mes = f"{ext[1:]}文件已下载,正在解压"
+            unpack_funcs: Dict[str, Callable] = {
+                ".zip": unzip_zipfile,
+                ".7z": unpack_7zfile,
+                ".rar": unpack_rarfile,
+            }
+            unpack_func = unpack_funcs.get(ext)
+            if not unpack_func:
+                raise ValueError(f"不支持的拓展名: {ext}")
+            unpack_func(down_file, down_path)
+            return mes
+
+    raise ValueError(f"不支持的文件: {name}")
+
+
+def support_gbk(zip_file: ZipFile):
+    """
+    压缩包中文恢复
+    """
+    if isinstance(zip_file, ZipFile):
+        name_to_info = zip_file.NameToInfo
+        # copy map first
+        for name, info in name_to_info.copy().items():
+            real_name = name.encode("cp437").decode("gbk")
+            if real_name != name:
+                info.filename = real_name
+                del name_to_info[name]
+                name_to_info[real_name] = info
+    return zip_file
+
+
+async def all_zip_to_one(data_list: List[bytes]):  # noqa: RUF029
+    """多压缩包文件合并"""
+    file_list = [io.BytesIO(data).getbuffer() for data in data_list]
+    data_file = io.BytesIO()
+
+    with ZipFile(data_file, mode="w") as zf:
+        for i, file in enumerate(file_list):
+            filename = f"file{i}.zip"
+            zf.writestr(filename, file)
+
+    return data_file.getbuffer()

{nonebot_plugin_l4d2_server-1.0.0a2 → nonebot_plugin_l4d2_server-1.0.1}/nonebot_plugin_l4d2_server/l4_request/__init__.py

@@ -1,18 +1,18 @@
+import random
 from typing import Dict, List, Optional, cast
 
 from nonebot.log import logger
-
 from ..config import server_all_path
 from ..l4_image import msg_to_image
 from ..utils.api.models import AllServer, NserverOut, OutServer
 from ..utils.utils import split_maohao
-from .draw_msg import draw_one_ip, get_much_server
-
+from .draw_msg import draw_one_ip, get_much_server, convert_duration
+from ..utils.api.request import L4API
 try:
     import ujson as json
 except ImportError:
     import json
-
+from ..config import config
 
 # 获取全部服务器信息
 ALLHOST: Dict[str, List[NserverOut]] = {}
@@ -141,3 +141,69 @@ def reload_ip():
 
             if item.name.endswith("txt"):
                 """to do"""
+
+async def tj_request(command: str = "云",tj ="tj"):
+    server_json = ALLHOST.get(command)
+    logger.info(server_json)
+    if server_json is None:
+        logger.warning("未找到这个组")
+        return None    
+    # 返回单个
+    logger.info("正在anne电信服务器信息")
+    player_msg = ""
+    right_ip = []
+    for i in server_json:
+        ser_list = await L4API.a2s_info([(i["host"], i["port"])], is_player=True)
+        one_server = ser_list[0][0]
+        one_player = ser_list[0][1]
+        
+        # 判断坐牢条件
+        if tj == "tj":
+            if "普通药役" in one_server.map_name:
+                score: int = 0
+                for index, player in enumerate(one_player, 1):
+                    if index > 4:
+                        break
+                    score += player.score
+
+                t = one_server.map_name.split("[")[-1].split("特")[0]
+                if int(t)*50 < score:
+                    right_ip.append(i)
+        if tj == "zl":
+            if "普通药役" in one_server.map_name and len(one_player) <= 4:
+                right_ip.append(i)
+                
+                  
+    if not right_ip:
+        return "没有符合条件的服务器"
+    
+    s = random.choice(right_ip)
+    ser_list = await L4API.a2s_info([(s["host"], s["port"])], is_player=True)
+    one_server = ser_list[0][0]
+    one_player = ser_list[0][1]
+    if len(one_player):
+        max_duration_len = max(
+            [len(str(await convert_duration(i.duration))) for i in one_player],
+        )
+        max_score_len = max(len(str(i.score)) for i in one_player)
+
+        for player in one_player:
+            soc = "[{:>{}}]".format(player.score, max_score_len)
+            chines_dur = await convert_duration(player.duration)
+            dur = "{:^{}}".format(chines_dur, max_duration_len)
+            name = f"{player.name[0]}***{player.name[-1]}"
+            player_msg += f"{soc} | {dur} | {name} \n"
+    else:
+        player_msg = "服务器感觉很安静啊"
+    msg = f"""*{one_server.server_name}*
+游戏: {one_server.folder}
+地图: {one_server.map_name}
+人数: {one_server.player_count}/{one_server.max_players}"""
+    if one_server.ping is not None:
+        msg += f"""
+ping: {one_server.ping * 1000:.0f}ms
+{player_msg}"""
+    if config.l4_show_ip:
+        msg += f"""
+connect {s["host"]}:{s["port"]}"""
+    return msg

{nonebot_plugin_l4d2_server-1.0.0a2 → nonebot_plugin_l4d2_server-1.0.1}/nonebot_plugin_l4d2_server/l4_request/draw_msg.py

@@ -29,8 +29,13 @@ async def draw_one_ip(host: str, port: int):
             soc = "[{:>{}}]".format(player.score, max_score_len)
             chines_dur = await convert_duration(player.duration)
             dur = "{:^{}}".format(chines_dur, max_duration_len)
-
-            player_msg += f"{soc} | {dur} | {player.name} \n"
+            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
+            player_msg += f"{soc} | {dur} | {name} \n"
     else:
         player_msg = "服务器感觉很安静啊"
 
@@ -52,7 +57,7 @@ async def get_much_server(server_json: List[NserverOut], command: str):
     out_server: List[OutServer] = []
     search_list: List[Tuple[str, int]] = []
     for i in server_json:
-        search_list.append((i["host"], i["port"]))  # noqa: PERF401
+        search_list.append((i["host"], i["port"]))
 
     all_server = await L4API.a2s_info(search_list, is_player=True)
 

{nonebot_plugin_l4d2_server-1.0.0a2 → nonebot_plugin_l4d2_server-1.0.1}/nonebot_plugin_l4d2_server/utils/api/request.py

@@ -2,13 +2,17 @@ import asyncio
 import contextlib
 import socket
 from copy import deepcopy
+from pathlib import Path
 from typing import Any, Dict, List, Literal, Optional, Tuple, cast
 
 import a2s
 import ujson as js
+import ujson as json
 from bs4 import BeautifulSoup
 from httpx import AsyncClient
 
+from ...config import config
+
 # from nonebot.log import logger
 from ..utils import split_maohao
 from .api import AnnePlayerApi, AnneSearchApi, anne_ban
@@ -154,8 +158,10 @@ class L4D2Api:
             html_content = resp.content
             return BeautifulSoup(html_content, "lxml")
 
-    async def get_sourceban(self, url: str = anne_ban):
+    async def get_sourceban(self, tag:str = "云", url: str = anne_ban):
         """从sourceban++获取服务器列表，目前未做名称处理"""
+        if not (url.startswith(("http://", "https://"))):
+            url = "http://" + url  # 默认添加 http://
         soup = await self._server_request(
             url=url,
             is_json=False,
@@ -177,6 +183,24 @@ class L4D2Api:
                         SourceBansInfo(index=index, host=host, port=port),
                     )
 
+        if not Path(Path(config.l4_path) / "config.json").is_file():
+            with Path(Path(config.l4_path) / "config.json").open("w") as f:
+                f.write("{}")
+        with (Path(config.l4_path) / "config.json").open("r", encoding="utf-8") as f:
+            content = f.read().strip()
+            ip_json = json.loads(content)
+        if tag in ip_json:
+            url = ip_json[tag]
+        with (Path(Path(config.l4_path) / f"l4d2/{tag}.json")).open("w") as f:
+            print(Path(Path(config.l4_path) / f"l4d2/{tag}.json"))
+            up_data = {}
+            for server in server_list:
+                new_dict = {}
+                new_dict["id"] = int(server.index )+ 1
+                new_dict["ip"] = server.host + ":" + str(server.port)
+                up_data.update(new_dict)
+            print(up_data)
+            json.dump(up_data, f)
         return server_list
 
     async def get_anne_steamid(self, name: str):

{nonebot_plugin_l4d2_server-1.0.0a2 → nonebot_plugin_l4d2_server-1.0.1}/nonebot_plugin_l4d2_server/utils/utils.py

@@ -6,8 +6,10 @@ from typing import Any, Dict, List, Optional, Tuple
 
 import aiofiles
 import aiohttp
+import nonebot
 from nonebot.adapters.onebot.v11 import Bot, GroupMessageEvent, MessageEvent
 from nonebot.log import logger
+from nonebot_plugin_alconna import UniMessage
 
 
 async def get_file(url: str, down_file: Path):
@@ -174,7 +176,7 @@ def split_maohao(msg: str) -> Tuple[str, int]:
 
 
 headers = {
-    "User-Agent": "Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:107.0) Gecko/20100101 Firefox/107.0",  # noqa: E501
+    "User-Agent": "Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:107.0) Gecko/20100101 Firefox/107.0",
 }
 
 
@@ -198,7 +200,16 @@ async def url_to_msg(url: str):
             return None
 
 
-async def get_message_at(datas: str) -> Optional[int]:  # noqa: F811
+async def get_message_at(datas: str) -> Optional[int]:
     data: Dict[str, Any] = json.loads(datas)
     at_list = [int(msg["data"]["qq"]) for msg in data["message"] if msg["type"] == "at"]
     return at_list[0] if at_list else None
+
+
+async def send_ip_msg(msg: str):
+    try:
+        await UniMessage.text(msg).finish()
+    except nonebot.adapters.qq:
+        msg_new = msg.split("\n")[:-2]
+        msg_out = "\n".join(msg_new)
+        await UniMessage.text(msg_out).send()

{nonebot_plugin_l4d2_server-1.0.0a2 → nonebot_plugin_l4d2_server-1.0.1}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "nonebot-plugin-l4d2-server"
-version = "1.0.0a2"
+version = "1.0.1"
 description = "L4D2 server related operations plugin for NoneBot2"
 authors = [
     { name = "Agnes_Digital", email = "Z735803792@163.com" },
@@ -52,6 +52,52 @@ homepage = "https://github.com/Agnes4m/nonebot_plugin_l4d2_server"
 [tool.pdm.build]
 includes = []
 
+[tool.ruff]
+ignore = [
+    "B008",
+    "B905",
+    "E501",
+    "N999",
+    "FBT002",
+    "PGH003",
+    "RUF001",
+    "RUF002",
+    "RUF003",
+    "RUF006",
+    "RUF100",
+    "SIM117",
+    "TRY002",
+    "TRY003",
+    "FBT001",
+]
+select = [
+    "A",
+    "ARG",
+    "ASYNC",
+    "B",
+    "C4",
+    "COM",
+    "E",
+    "F",
+    "FBT",
+    "FLY",
+    "I",
+    "ISC",
+    "N",
+    "PIE",
+    "PGH",
+    "PTH",
+    "PYI",
+    "Q",
+    "RET",
+    "RSE",
+    "RUF",
+    "SIM",
+    "SLF",
+    "SLOT",
+    "TRY",
+]
+
 [build-system]
 requires = [
     "pdm-backend",