nonebot-plugin-l4d2-server 0.3.4a2__py3-none-any.whl → 0.3.5__py3-none-any.whl

README.md

@@ -216,6 +216,8 @@ _✨Nonebot & Left 4 Dead 2 server操作✨_
 | l4_image | 否 | True | 布尔值，是否显示图片 |
 | l4_font | 否 | 'simsun.ttc' | str，确保在开启图片的时候，字体存在 |
 | l4_only | 否 | False | 布尔值，如果不想在下载的时候阻碍其他指令可以开启，但是有不能下载超过200m地图的bug |
+| l4_style | 否 | '' | str,图片风格，目前可选['balck'] |
+
 
 </details>
 
@@ -292,6 +294,23 @@ anne:<br>
 <details>
 <summary>展开/收起</summary>
 
+### 0.3.5--2022.3.6
+
+ - 新增ping查询（在ip里包括）
+ - 新增api查询（未完成）
+ - 修复了电信服查询绑定名字无法查询的错误
+ - 新增了救援率的显示
+ - 新增web端（未完成）
+
+### 0.3.4--2022.3.1
+
+ - 新增本地插件smx查询
+ - 增加了三个内置群服
+ - 修改了图片的UI,变好看了
+ - 删减了部分图片和字体，使得轻量化
+ - 修复了海量bug
+ - 修复了python3.8中typing错误
+
 ### 0.3.3--2022.2.26
 
  - 重写协议，使用a2s库，同时解决win端不同报错无法输出
@@ -447,16 +466,17 @@ ubuntu20.04 python3.10
 - 2、~[自己写的求生之路查询库](https://github.com/Umamusume-Agnes-Digital/VSQ)~
 - 3、[可爱小Q的帮助(太好看了tql)](https://github.com/MeetWq/mybot)
 - 4、感谢petpet交流群各位大佬指点nonebot2事件处理api
+- 5、ArcPav改的暗♂黑风格菜单
 
 <h2 id="cx">服务器相关 </h2>
 
-目前插件会内置经腐竹同意的服的ip
+目前插件会内置经腐竹同意的服的查询（未来将使用api）
 
 | 指令 | 服务器 | op | 数量 |
 |:-----:|:----:|:----:|:----:|
-| 云 | anne电信服云服 | 东 | 26
+| 云 | ~anne电信服云服~(暂时不提供) | 东 | 24
 | 呆呆 | 呆呆的小窝 | 提莫大魔王 | 15
-| 橘 | 橘希实香的小窝 | 橘希实香 | 4
+| 橘 | 橘希实香的小窝 | 橘希实香 | 7
 
 如果需要上传自己的ip可以Pr、iss或者进qq群
 

nonebot_plugin_l4d2_server/__init__.py

@@ -16,7 +16,9 @@
 """
 from nonebot.matcher import Matcher
 from nonebot.typing import T_State
-from typing import Tuple
+from nonebot.params import CommandArg,ArgPlainText,RegexGroup,Arg,Command,RawCommand
+
+from typing import Tuple,Union,List
 from time import sleep
 from .config import *
 from .utils import *
@@ -28,16 +30,18 @@ from nonebot import get_driver
 from .l4d2_image.vtfs import img_to_vtf
 from .l4d2_queries.ohter import load_josn
 from .l4d2_queries.qqgroup import write_json,ip_anne_list
-from .l4d2_file import updown_l4d2_vpk
+from .l4d2_file import updown_l4d2_vpk,all_zip_to_one
+from .l4d2_queries.maps import seach_map,map_dict_to_str
 from .txt_to_img import mode_txt_to_img
 # from .l4d2_server import RCONClient
 from nonebot import get_bot, require
+from .l4d2_server import web,webUI
 scheduler = require("nonebot_plugin_apscheduler").scheduler
 
 driver = get_driver()
 
 
-__version__ = "0.3.4a2"
+__version__ = "0.3.5"
 __plugin_meta__ = PluginMetadata(
     name="求生之路小助手",
     description='群内对有关求生之路的查询和操作',
@@ -141,7 +145,6 @@ async def _(bot:Bot,event: MessageEvent):
     msg = mes_list(msg,name_vpk).replace(" ","")
     
     await find_vpk.finish(mode_txt_to_img(mes,msg))
-    # await find_vpk.finish(msg)
 
 @del_vpk.handle()
 async def _(matcher:Matcher,args:Message = CommandArg()):
@@ -289,6 +292,8 @@ async def _(event:GroupMessageEvent,matcher:Matcher,args:Message = CommandArg())
 async def _(event:GroupMessageEvent):
     group_id = event.group_id
     msg = await show_ip(group_id)
+    if not msg:
+        await show_queries.finish("当前没有启动的服务器捏")
     if type(msg) == str:
         await show_queries.finish(msg)
     else:
@@ -312,25 +317,46 @@ async def _(state:T_State,tag:str = ArgPlainText("ip")):
     msg = await workshop_msg(tag)
     if not msg:
         await up_workshop.finish('没有这个物品捏')
-    pic = await url_to_byte(msg['图片地址'])
-    message = ''
-    for item,value in msg.items():
-        if item in ['图片地址','下载地址']:
-            continue
-        message += item + ':' + value + '\n'
-    state['dic'] = msg
-    await up_workshop.send(MessageSegment.image(pic) + Message(message))
+    elif type(msg) == dict:
+        pic = await url_to_byte(msg['图片地址'])
+        message = ''
+        for item,value in msg.items():
+            if item in ['图片地址','下载地址','细节']:
+                continue
+            message += item + ':' + value + '\n'
+        state['dic'] = msg
+        await up_workshop.send(MessageSegment.image(pic) + Message(message))
+    elif type(msg) == list:
+        lenge = len(msg)
+        pic = await url_to_byte(msg[0]['图片地址'])
+        message = f'有{lenge}个文件\n'
+        for one in msg:
+            ones = []
+            for item,value in one.items():
+                if item in ['图片地址','下载地址','细节']:
+                    continue
+                message += item + ':' + value + '\n'
+            ones.append(one)
+        state['dic'] = ones
     
 @up_workshop.got("is_sure",prompt='如果需要上传，请发送 "yes"')    
 async def _(matcher: Matcher,bot:Bot,event:GroupMessageEvent,state:T_State):
     is_sure = str(state["is_sure"])
     if is_sure == 'yes':
-        data_dict:dict = state['dic']
-        logger.info('开始上传')
-        data_file = await url_to_byte(data_dict['下载地址'])
-        file_name = data_dict['名字']+ '.vpk'
-        await up_workshop.send('获取地址成功，尝试上传')
-        await upload_file(bot, event, data_file, file_name)
+        data_dict:Union[dict,List[dict]] = state['dic']
+        if type(data_dict) == dict:
+            logger.info('开始上传')
+            data_file = await url_to_byte(data_dict['下载地址'])
+            file_name = data_dict['名字']+ '.vpk'
+            await up_workshop.send('获取地址成功，尝试上传')
+            await upload_file(bot, event, data_file, file_name)
+        else:
+            logger.info('开始上传')
+            for data_one in data_dict:
+                data_file = await url_to_byte(data_one['下载地址'])
+                await all_zip_to_one
+            file_name = data_one['名字']+ '.vpk'
+            await upload_file(bot, event, data_file, file_name)
     else:
         await up_workshop.finish('已取消上传')
     
@@ -351,6 +377,8 @@ async def _(args:Message = CommandArg()):
 @read_ip.handle()
 async def _():
     img = await qq_ip_queries_pic(ip_anne_list)
+    if img == None:
+        return "电信服的地址请加主群自行填写哦"
     await read_ip.finish(MessageSegment.image(img))
 
 @tan_jian.handle()
@@ -371,7 +399,10 @@ async def _(command: str = RawCommand(),args:Message = CommandArg()):
             host,port = split_maohao(one_ip['ip'])
             ip_list.append((one_ip['id'],host,port))
         img = await qq_ip_queries_pic(ip_list)
-        await read_ip.finish(MessageSegment.image(img))
+        if img:
+            await read_ip.finish(MessageSegment.image(img)) 
+        else:
+            await read_ip.finish("服务器无响应")
     else:
         message = await json_server_to_tag_dict(command,msg)
         if len(message) == 0:
@@ -418,10 +449,34 @@ async def _(event:MessageEvent):
 
 @open_prison.handle()
 async def _(event:MessageEvent):
-    await tan_jian.send('正在寻找空房...')
+
     msg = await get_tan_jian(ip_anne_list,3)
     await tan_jian.finish(msg)
 
+@smx_file.handle()
+async def _():
+    smx_path = Path(l4_file[CHECK_FILE],"left4dead2/addons/sourcemod/plugins")
+    smx_list = []
+    name_smx = get_vpk(smx_list,smx_path,file_=".smx")
+    logger.info("获取文件列表成功")
+    mes = "当前服务器下有以下smx文件"
+    msg = ''
+    msg = mes_list(msg,name_smx).replace(" ","")
+    await find_vpk.finish(mode_txt_to_img(mes,msg))
+    
+@search_api.handle()
+async def _(args:Message = CommandArg()):
+    msg:str = args.extract_plain_text()
+    # if msg.startswith('代码'):
+        # 建图代码返回三方图信息
+    data = await seach_map(msg,l4_master[0],l4_key)
+    # else:
+    if type(data) == str:
+        await search_api.finish(data)
+    else:
+        await search_api.finish(await map_dict_to_str(data))
+        
+    
 @driver.on_shutdown
 async def close_db():
     """关闭数据库"""

nonebot_plugin_l4d2_server/command.py

@@ -1,5 +1,5 @@
-from nonebot import on_notice,on_command,on_regex,on_fullmatch,on_shell_command
-from nonebot.params import CommandArg,ArgPlainText,RegexGroup,Arg,Command,RawCommand
+from nonebot import on_notice,on_command,on_regex,on_fullmatch,on_shell_command,on_keyword
+
 import re
 import nonebot
 from nonebot.permission import SUPERUSER
@@ -60,7 +60,7 @@ find_vpk = on_command("l4_map",aliases={"求生地图","查看求生地图"},pri
 del_vpk = on_command("l4_del_map",aliases={"求生地图删除","地图删除"},priority=20,block=True,permission= Master)
 rcon_to_server = on_command('rcon',aliases={"求生服务器指令","服务器指令","求生服务器控制台"},block=True,permission= Master)
 check_path = on_command('l4_check',aliases={'求生路径'},priority=20,block=True,permission= Master)
-
+smx_file = on_command('l4_smx',aliases={'求生插件'},priority=20,block=True,permission= Master)
 
 # anne
 anne_player = on_command('Ranne',aliases={"求生anne"},priority=25,block=True)
@@ -86,7 +86,8 @@ show_queries = on_command('showq',aliases={"求生订阅"},priority=20,block=Tru
 join_server = on_command('showq',aliases={"求生加入"},priority=20,block=True)
 connect_rcon = on_command("Rrcon", aliases={"求生连接", '求生链接','求生rcon'}, priority=50, block=False)
 end_connect = ['stop', '结束', '连接结束', '结束连接']
-
+search_api = on_command('search',aliases={'求生三方'}, priority=20, block=True)
+which_map = on_keyword(("是什么图"),priority=20, block=False)
 
 # 下载内容
 up_workshop = on_command('workshop',aliases={'创意工坊下载','求生创意工坊'},priority=20,block=True)

nonebot_plugin_l4d2_server/config.py

@@ -1,5 +1,6 @@
 import nonebot
 from nonebot.permission import SUPERUSER
+from nonebot import get_driver
 from nonebot.adapters.onebot.v11.permission import (
     GROUP_ADMIN,
     GROUP_OWNER,
@@ -17,7 +18,11 @@ except:
 file_format = (".vpk",".zip",".7z",'rar')
 # 权限
 
-
+driver = get_driver()
+try:
+    NICKNAME: str = list(driver.config.nickname)[0]
+except Exception:
+    NICKNAME = 'bot'
 CHECK_FILE:int = 0
 ANNE_IP:dict = json.load(open(Path(__file__).parent.joinpath(
         'data/L4D2/l4d2.json'), "r", encoding="utf8"))
@@ -28,62 +33,72 @@ ADMINISTRATOR = SUPERUSER | GROUP_ADMIN | GROUP_OWNER | PRIVATE_FRIEND
 # file 填写求生服务器所在路径
 
 try:
-    l4_file: List[str] = nonebot.get_driver().config.l4_file
+    l4_file: List[str] = driver.config.l4_file
 except:
     l4_file: List[str] = ['/home/ubuntu/l4d2']
 
 
 try:
-    l4_image: bool = nonebot.get_driver().config.l4_image
+    l4_image: bool = driver.config.l4_image
 except:
     l4_image: bool = True
 
 try:
-    l4_steamid: bool = nonebot.get_driver().config.l4_steamid
+    l4_steamid: bool = driver.config.l4_steamid
 except:
     l4_steamid: bool = True
 
 try:
-    l4_only: bool = nonebot.get_driver().config.l4_only
+    l4_only: bool = driver.config.l4_only
 except:
     l4_only: bool = False
     
 try:
-    l4_font: str = nonebot.get_driver().config.l4_font
+    l4_font: str = driver.config.l4_font
 except:
     l4_font: str = 'simsun.ttf'
      
 try:
-    l4_host: List[str] = nonebot.get_driver().config.l4_host
+    l4_host: List[str] = driver.config.l4_host
 except:
     l4_host: List[str] = ['127.0.0.1']
 
     
 try:
-    l4_port: List[str] = nonebot.get_driver().config.l4_port
+    l4_port: List[str] = driver.config.l4_port
 except:
     l4_port: List[str] = ['20715']
 
 
 try:
-    l4_rcon: List[str] = nonebot.get_driver().config.l4_rcon
+    l4_rcon: List[str] = driver.config.l4_rcon
 except:
     l4_rcon: List[str] = ['114514']
     
     
 try:
-    l4_master: List[str] = nonebot.get_driver().config.l4_master
+    l4_master: List[str] = driver.config.l4_master
 except:
     l4_master: List[str] = ['114514']
    
     
 try:
     l4_proxies: set = {
-            'http://':nonebot.get_driver().config.l4_proxies
+            'http://':driver.config.l4_proxies
         }
 except:
     l4_proxies = ''
 
+try:
+    l4_style:str = driver.config.l4_style
+except:
+    l4_style:str = ''
+
+try:
+    l4_key:str = driver.config.l4_key
+except:
+    l4_key:str = ""
+
 l4_list = [l4_file, l4_steamid, l4_host, l4_port, l4_rcon, l4_master]
 l4_list = [ast.literal_eval(i) if isinstance(i, str) else i for i in l4_list]
 l4_file, l4_steamid, l4_host, l4_port, l4_rcon, l4_master = l4_list

nonebot_plugin_l4d2_server/data/L4D2/image/template/anne.html

@@ -3,7 +3,8 @@
 	<link rel="stylesheet" type="text/css" href="vue.css">
 </head>
 </br>
-<body style="background-image: url('back.png');">
+<body style="background-image: url('back.png'); background-size: cover;">
+	<font color="yellow">
 	{% for item in data %}
 	<h1 ><center>求生药役anne电信服数据</center></h1>
 	<div class="scissors" style="border-top:1px dashed orange;">
@@ -11,6 +12,7 @@
 		{% for msg_one in item.one_msg %}
 			{{ msg_one }}<br>
 		{% endfor %}</center></h3>
+	</font>
 	<div class="scissors" style="border-top:1px dashed orange;">
 	</div>
 	<div class="myinfo">
@@ -42,16 +44,17 @@
 			</tr>
 			<tr>
 				<td>游玩次数 | {{item.playtimes}}</td>
-				<td></td>
+				<td>救&nbsp; 援&nbsp; 关 | {{item.last_one}}</td>
 			</tr>
 		</tbody>
 	</table>
 </div>
+<font color="yellow">
 {% endfor %}
 <h5><center>©爱丽数码</center></br>
 	<center>
-		https://github.com/Umamusume-Agnes-Digital/nonebot_plugin_l4d2_server
+		github.com/Umamusume-Agnes-Digital/nonebot_plugin_l4d2_server
 	</center>
 </h5>
-
+</font>
 </body>

nonebot_plugin_l4d2_server/data/L4D2/image/template/help - /321/205/320/231/320/277/321/206/320/254/320/274.html"

@@ -0,0 +1,232 @@
+<html>
+  <head>
+<style>
+  body {
+    margin: 0px;
+    zoom: 150%;
+    background-color: #F7D04B;
+  }
+  .image {
+    display: flex;
+    flex-direction: column;
+    overflow: scroll;
+    width: max-content;
+    padding: 20px;
+  }
+  .head {
+    display: flex;
+    flex-direction: row;
+    align-items: center;
+    justify-content: space-between;
+    background-color: #F5D76E;
+    padding-left: 20px;
+    padding-right: 20px;
+    padding-top: 10px;
+    padding-bottom: 10px;
+    border: 2px solid;
+    border-radius: 50px;
+    border-color: #F1C40F;
+    font-size: 16px;
+    margin-bottom: 20px;
+  }
+
+  .plugins {
+    display: grid;
+    grid-template-columns: auto auto auto;
+    row-gap: 20px;
+    column-gap: 20px;
+    margin-bottom: 20px;
+  }
+  .plugin {
+    display: flex;
+    padding: 5px;
+    border: 1px solid;
+    border-radius: 5px;
+    border-color: #F1C40F;
+    box-shadow: 0px 2px 6px 1px rgba(0, 0, 0, 0.2);
+    background-color: #F7D04B;
+  }
+  .plugin_meta {
+    display: flex;
+    flex-direction: column;
+    padding: 5px;
+    width: 250px;
+    justify-content: space-between;
+  }
+  .plugin_name {
+    font-size: 20px;
+    color: #F1C40F;
+  }
+  .plugin_description {
+    font-size: 15px;
+    color: gray;
+    margin-top: 5px;
+    margin-bottom: 5px;
+  }
+  .plugin_meta_line1 {
+    display: flex;
+    flex-direction: row;
+    align-items: center;
+    justify-content: space-between;
+  }
+  .plugin_meta_line3 {
+    display: flex;
+    flex-direction: row;
+    align-items: center;
+  }
+  .package_name_label {
+    background-image: url(./fingerprint.svg);
+    width: 13px;
+    height: 13px;
+    margin-right: 8px;
+  }
+  .package_name {
+    font-size: 13px;
+    color: gray;
+  }
+  .switch {
+    position: relative;
+    display: inline-block;
+    width: 40px;
+    height: 24px;
+  }
+  .slider {
+    position: absolute;
+    cursor: pointer;
+    top: 0;
+    left: 0;
+    right: 0;
+    bottom: 0;
+    background-color: #ccc;
+  }
+  .slider:before {
+    position: absolute;
+    content: "";
+    height: 16px;
+    width: 16px;
+    left: 4px;
+    bottom: 4px;
+    background-color: white;
+  }
+  .switch input {
+    display: none;
+  }
+  .switch input:checked + .slider {
+    background-color: rgba(86, 40, 238, 0.5);
+  }
+      .switch input:checked + .slider:before {
+        -webkit-transform: translateX(16px);
+        -ms-transform: translateX(16px);
+        transform: translateX(16px);
+      }
+      .slider.round {
+        border-radius: 24px;
+      }
+      .slider.round:before {
+        border-radius: 50%;
+      }
+      .checkbox {
+        visibility: hidden;
+      }
+      .slider.locked {
+        opacity: 0.5;
+      }
+      .switch input + span .lock {
+        width: 8px;
+        height: 7px;
+        background: #99a3ba;
+        position: absolute;
+        left: 8px;
+        bottom: 7px;
+        border-radius: 2px;
+        display: block;
+        z-index: 1;
+        transition: all 0.45s ease;
+      }
+      .switch input + span .lock:before {
+        content: "";
+        width: 2px;
+        height: 2px;
+        border-radius: 1px;
+        background: #fff;
+        position: absolute;
+        display: block;
+        left: 50%;
+        top: 50%;
+        margin: -1px 0 0 -1px;
+      }
+      .switch input + span .lock:after {
+        content: "";
+        border-top-left-radius: 4px;
+        border-top-right-radius: 4px;
+        border: 1px solid #99a3ba;
+        border-bottom: 0;
+        width: 4px;
+        height: 4px;
+        left: 1px;
+        bottom: 6px;
+        position: absolute;
+        z-index: 1;
+        -webkit-transform-origin: 0 100%;
+        transform-origin: 0 100%;
+        transition: all 0.45s ease;
+      }
+      .switch input:checked + span .lock {
+        background: #5628ee;
+        -webkit-transform: translateX(16px);
+        -ms-transform: translateX(16px);
+        transform: translateX(16px);
+      }
+      .lock {
+        visibility: hidden;
+      }
+      .lock.locked {
+        visibility: inherit;
+      }
+    </style>
+  </head>
+  <body>
+    <div class="image">
+      <div class="head">
+        <span><b>已加载服务器</b></span>
+        <span>发送 “<b>服务器昵称/序号</b>” 查看详情</span>
+      </div>
+      <div class="plugins">
+        {% for plugin in plugins %}
+        <div class="plugin">
+          <div class="plugin_meta">
+            <div class="plugin_meta_line1">
+              <div class="plugin_name">{{ plugin.number }}:{{ plugin.name }}</div>
+              <div class="plugin_status">
+                <label class="switch">
+                  <input class="checkbox" type="checkbox" {% if plugin.enabled %} checked {% endif %} />
+                  <span class="slider round {% if plugin.locked %} locked {% endif %}">
+                    <span class="lock {% if plugin.locked %} locked {% endif %}"></span>
+                  </span>
+                </label>
+              </div>
+            </div>
+            <div class="plugin_meta_line2">
+				<font color="blue">{{ plugin.map_ }}</font><br>
+                {% for Player in plugin.Players %}
+                    <font color="green">{{ Player }}</font><br>
+                {% endfor %}
+            </div>
+            <div class="plugin_meta_line3">
+              <div class="package_name_label"></div>
+              <div class="package_name">{{ plugin.max_players }}</div>
+            </div>
+          </div>
+        </div>
+        {% endfor %}
+      </div>
+	  <div class="head">
+      <span><b>©爱丽数码</b></span>
+      <span>https://github.com/Umamusume-Agnes-Digital/nonebot_plugin_l4d2_server</span>
+      </div>
+    </div>
+</html>
+  </body>
+
+
+

nonebot_plugin_l4d2_server/data/L4D2/image/template/help.html

@@ -220,7 +220,7 @@
       </div>
 	  <div class="head">
       <span><b>©爱丽数码</b></span>
-      <span>https://github.com/Umamusume-Agnes-Digital/nonebot_plugin_l4d2_server</span>
+      <span>github.com/Umamusume-Agnes-Digital/nonebot_plugin_l4d2_server</span>
       </div>
     </div>
 </html>