nonebot-plugin-l4d2-server 0.3.4a2__tar.gz → 0.3.5a1__tar.gz

{nonebot_plugin_l4d2_server-0.3.4a2 → nonebot_plugin_l4d2_server-0.3.5a1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: nonebot-plugin-l4d2-server
-Version: 0.3.4a2
+Version: 0.3.5a1
 Summary: L4D2 server related operations plugin for NoneBot
 Home-page: https://github.com/Umamusume-Agnes-Digital/nonebot_plugin_l4d2_server
 License: MIT
@@ -259,6 +259,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>
 
@@ -490,6 +492,7 @@ 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>
 

{nonebot_plugin_l4d2_server-0.3.4a2 → nonebot_plugin_l4d2_server-0.3.5a1}/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>
 
@@ -447,6 +449,7 @@ 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>
 

{nonebot_plugin_l4d2_server-0.3.4a2 → nonebot_plugin_l4d2_server-0.3.5a1}/nonebot_plugin_l4d2_server/__init__.py

@@ -16,7 +16,7 @@
 """
 from nonebot.matcher import Matcher
 from nonebot.typing import T_State
-from typing import Tuple
+from typing import Tuple,Union,List
 from time import sleep
 from .config import *
 from .utils import *
@@ -28,7 +28,7 @@ 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 .txt_to_img import mode_txt_to_img
 # from .l4d2_server import RCONClient
 from nonebot import get_bot, require
@@ -37,7 +37,7 @@ scheduler = require("nonebot_plugin_apscheduler").scheduler
 driver = get_driver()
 
 
-__version__ = "0.3.4a2"
+__version__ = "0.3.4"
 __plugin_meta__ = PluginMetadata(
     name="求生之路小助手",
     description='群内对有关求生之路的查询和操作',
@@ -141,7 +141,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()):
@@ -312,25 +311,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('已取消上传')
     
@@ -418,10 +438,21 @@ 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))
+    
 @driver.on_shutdown
 async def close_db():
     """关闭数据库"""

{nonebot_plugin_l4d2_server-0.3.4a2 → nonebot_plugin_l4d2_server-0.3.5a1}/nonebot_plugin_l4d2_server/command.py

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

{nonebot_plugin_l4d2_server-0.3.4a2 → nonebot_plugin_l4d2_server-0.3.5a1}/nonebot_plugin_l4d2_server/config.py

@@ -84,6 +84,11 @@ try:
 except:
     l4_proxies = ''
 
+try:
+    l4_style:str = nonebot.get_driver().config.l4_style
+except:
+    l4_style: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-0.3.4a2 → nonebot_plugin_l4d2_server-0.3.5a1}/nonebot_plugin_l4d2_server/data/L4D2/image/template/anne.html

@@ -3,7 +3,7 @@
 	<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;">
 	{% for item in data %}
 	<h1 ><center>求生药役anne电信服数据</center></h1>
 	<div class="scissors" style="border-top:1px dashed orange;">

nonebot_plugin_l4d2_server-0.3.5a1/nonebot_plugin_l4d2_server/data/L4D2/image/template/help - /345/211/257/346/234/254.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-0.3.5a1/nonebot_plugin_l4d2_server/data/L4D2/image/template/help_dack.html

@@ -0,0 +1,231 @@
+<html>
+  <head>
+    <style>
+      body {
+        margin: 0px;
+        zoom: 150%;
+        background-color: #0D1117;
+      }
+      .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: #161B22;
+        padding-left: 20px;
+        padding-right: 20px;
+        padding-top: 10px;
+        padding-bottom: 10px;
+        border: 2px solid;
+        border-radius: 50px;
+        border-color: #1a1a1a;
+        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: #161B22;
+        box-shadow: 0px 2px 6px 1px rgba(0, 0, 0, 0.2);
+        background-color: #1a1a1a;
+      }
+      .plugin_meta {
+        display: flex;
+        flex-direction: column;
+        padding: 5px;
+        width: 250px;
+        justify-content: space-between;
+      }
+      .plugin_name {
+        font-size: 20px;
+      }
+      .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(46, 160, 67);
+      }
+      .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><font color="Silver">已加载服务器</font></b></span>
+        <span><font color="Silver">发送“<b>服务器昵称/序号</b>”查看详情</font></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"><font color="DeepSkyBlue">{{ plugin.number }}:{{ plugin.name }}</font></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="LightSkyBlue">{{ plugin.map_ }}</font><br>
+                {% for Player in plugin.Players %}
+                    <font color="LightGray">{{ Player }}</font><br>
+                {% endfor %}
+            </div>
+            <div class="plugin_meta_line3">
+              <div class="package_name_label"></div>
+              <div class="package_name"><font color="LightGray">{{ plugin.max_players }}</font></div>
+            </div>
+          </div>
+        </div>
+        {% endfor %}
+      </div>
+	  <div class="head">
+      <span><b><font color="Silver">©爱丽数码</font></b></span>
+      <span><font color="Silver">github*Umamusume-Agnes-Digital</font></span>
+      </div>
+    </div>
+  </body>
+</html>
+  
+
+/*暗黑风格-ArcPav*/

{nonebot_plugin_l4d2_server-0.3.4a2 → nonebot_plugin_l4d2_server-0.3.5a1}/nonebot_plugin_l4d2_server/data/L4D2/image/template/ip.html

@@ -33,7 +33,7 @@
                         {% for Player in data[j].Players %}
                             <font color="green">{{ Player }}</font><br>
                         {% endfor %}
-                        <font color="yellow">{{ data[j].max_players }}</font>
+                        <font color="yellow">{{ data[j].max_players }}{{data[j].ping}}</font>
                     </td>
                 {% endif %}
             {% endfor %}