nonebot-plugin-l4d2-server 0.4.7__py3-none-any.whl → 0.4.8__py3-none-any.whl

README.md

@@ -115,6 +115,11 @@ _✨Nonebot & Left 4 Dead 2 server操作✨_
 <details>
 <summary>展开/收起</summary>
 
+### 0.4.8--2022.4.16
+
+ - 新增重载ip
+ - 修复了一些windows启动下奇奇怪怪的bug
+
 ### 0.4.7--2022.4.13
 
  - 新增模式查询

nonebot_plugin_l4d2_server/__init__.py

@@ -47,7 +47,7 @@ else:
 driver = get_driver()
 
 
-__version__ = "0.4.7"
+__version__ = "0.4.8"
 __plugin_meta__ = PluginMetadata(
     name="求生之路小助手",
     description='群内对有关求生之路的查询和操作',
@@ -453,6 +453,16 @@ async def _(matcher:Matcher,bot:Bot,event:GroupMessageEvent,state:T_State):
     else:
         await matcher.finish('已取消上传')
         
+@reload_ip.handle()
+async def _(matcher:Matcher):
+    global matchers
+    await matcher.send('正在重载ip，可能需要一点时间')
+    for _, l4_matchers in matchers.items():
+        for l4_matcher in l4_matchers:
+            l4_matcher.destroy()
+    await get_des_ip()
+    await matcher.finish('已重载ip')
+    
 
 @driver.on_shutdown
 async def close_db():

nonebot_plugin_l4d2_server/command.py

@@ -1,7 +1,8 @@
 import re
 import asyncio
+from typing import Type
 
-from nonebot import on_notice,on_command,on_regex,on_keyword
+from nonebot import on_notice,on_command,on_regex,on_keyword,MatcherGroup
 from nonebot.params import CommandArg,RawCommand,CommandStart
 from nonebot.matcher import Matcher
 import nonebot
@@ -72,10 +73,6 @@ prison = on_command('zl',aliases={'坐牢'},priority=20,block=True)
 open_prison = on_command('kl',aliases={'开牢'},priority=20,block=True)
 
 updata = on_command('updata',aliases={'求生更新'},priority=20,block=True,permission= Master)
-def reload_ip():
-    global updata,get_ip
-    updata = on_command('updata',aliases={'求生更新'},priority=20,block=True,permission= Master)
-    get_ip = on_command('114514919181',aliases=server_key(),priority=80,block=True)
 tan_jian = on_command('tj',aliases={'探监'},priority=20,block=True)
 
 # 查询
@@ -88,6 +85,7 @@ connect_rcon = on_command("Rrcon", aliases={"求生连接", '求生链接','求
 end_connect = ['stop', '结束', '连接结束', '结束连接']
 search_api = on_command('search',aliases={'求生三方'}, priority=20, block=True,permission= Master)
 which_map = on_keyword(("是什么图"),priority=20, block=False)
+reload_ip = on_command('l4_reload',aliases={'重载ip'},priority=30,permission=Master)
 
 # 下载内容
 up_workshop = on_command('workshop',aliases={'创意工坊下载','求生创意工坊'},priority=20,block=True)
@@ -116,16 +114,19 @@ def get_session_id(event: MessageEvent) -> str:
     else:
         return f"private_{event.user_id}"
 
+matchers: Dict[str, List[Type[Matcher]]] = {}
 
-@driver.on_startup
-async def _():
+
+    
+async def get_des_ip():
     global ALL_HOST
     global ANNE_IP
+    global matchers
     if l4_tag == None:
         pass
     else:
         ALL_HOST.update(await seach_map(l4_tag,l4_qq,l4_key,'ip'))
-        def count_ips(ip_dict:dict):
+        async def count_ips(ip_dict:dict):
             global ANNE_IP
             for key, value in ip_dict.items():
                 if key in ['error_','success_']:
@@ -136,7 +137,7 @@ async def _():
                 if key == '云':
                     ANNE_IP = {key:value}
                 
-        count_ips(ALL_HOST)
+        await count_ips(ALL_HOST)
         ip_anne_list=[] 
         try:
             ips = ALL_HOST['云']
@@ -146,10 +147,14 @@ async def _():
                 ip_anne_list.append((one_ip['id'],host,port))
         except KeyError:
             pass
-        
+    
+    
     get_ip = on_command('anne',aliases=server_key(),priority=80,block=True)
     @get_ip.handle()
-    async def _(matcher:Matcher,start:str = CommandStart(),command: str = RawCommand(),args:Message = CommandArg(),):
+    async def _(matcher:Matcher,start:str = CommandStart(),command: str = RawCommand(),args:Message = CommandArg()):
+        if get_ip.plugin_name not in matchers:
+            matchers[get_ip.plugin_name] = []
+        matchers[get_ip.plugin_name].append(get_ip)
         if start:
             command = command.replace(start,'')
         if command == 'anne':
@@ -191,7 +196,8 @@ async def _():
                 await matcher.finish(msg)
             except (OSError,asyncio.exceptions.TimeoutError):
                 await matcher.finish('服务器无响应')
-                
+    
+           
     @tan_jian.handle()
     async def _(matcher:Matcher,event:MessageEvent):
         msg = await get_tan_jian(ip_anne_list,1)
@@ -206,4 +212,17 @@ async def _():
     async def _(matcher:Matcher,event:MessageEvent):
 
         msg = await get_tan_jian(ip_anne_list,3)
-        await matcher.finish(msg)
+        await matcher.finish(msg)
+        
+    
+    
+async def init():
+    global matchers
+
+    await get_des_ip()
+    print('启动辣')
+   
+    
+@driver.on_startup
+async def _():
+    await init()

{nonebot_plugin_l4d2_server-0.4.7.dist-info → nonebot_plugin_l4d2_server-0.4.8.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: nonebot-plugin-l4d2-server
-Version: 0.4.7
+Version: 0.4.8
 Summary: L4D2 server related operations plugin for NoneBot2
 Home-page: https://github.com/Agnes4m/nonebot_plugin_l4d2_server
 License: GPLv3
@@ -162,6 +162,11 @@ _✨Nonebot & Left 4 Dead 2 server操作✨_
 <details>
 <summary>展开/收起</summary>
 
+### 0.4.8--2022.4.16
+
+ - 新增重载ip
+ - 修复了一些windows启动下奇奇怪怪的bug
+
 ### 0.4.7--2022.4.13
 
  - 新增模式查询

{nonebot_plugin_l4d2_server-0.4.7.dist-info → nonebot_plugin_l4d2_server-0.4.8.dist-info}/RECORD

@@ -1,6 +1,6 @@
 LICENSE,sha256=IwGE9guuL-ryRPEKi6wFPI_zOhg7zDZbTYuHbSt_SAk,35823
-nonebot_plugin_l4d2_server/__init__.py,sha256=e1czD-zi7cToD-xWwE4VavFuWHL5MefVga3__SoDOGo,16832
-nonebot_plugin_l4d2_server/command.py,sha256=EGRnYx0mb6wo5zBz77wilAsVYIvooTQn07XrItEC-fg,8320
+nonebot_plugin_l4d2_server/__init__.py,sha256=8RbJmcQKddzf3leH9mP7ojBMvgk3Ze3mc2B6DyRrxg4,17164
+nonebot_plugin_l4d2_server/command.py,sha256=ifm_Bir28r7IHmbnBP9R_R5RkJDC-7rfa5WjqojAiog,8619
 nonebot_plugin_l4d2_server/config.py,sha256=izdgpdcoY_zg_rylcM6jGAzr1e2lK4FJ81s0ITshtz0,5046
 nonebot_plugin_l4d2_server/data/L4D2/image/head/head.png,sha256=Z72PEvp7xF1DZcLDeuWlg2_g6JAfHxtisptWn6BYGN8,158357
 nonebot_plugin_l4d2_server/data/L4D2/image/header/logo.png,sha256=1KhQNsx7zsCKGHmyIZ65dP9npkKzo7Im-Aafyi5_lhc,631630
@@ -42,8 +42,8 @@ nonebot_plugin_l4d2_server/message.py,sha256=x_ts0HaW3SNOma-baEG0oaeozKE5Nh_fybn
 nonebot_plugin_l4d2_server/seach.py,sha256=dsusYogKH9pGeLxZz9BTheQwtJ3wAO3tfbePYdcaIuA,1025
 nonebot_plugin_l4d2_server/txt_to_img.py,sha256=evJeuKWSHbg8EWnUdeqHoNbxE5yOORVWXJwMWO1PKTo,2166
 nonebot_plugin_l4d2_server/utils.py,sha256=OywrH2CQHZo-OMkLxFZV70qN5_KpvZ-Ox3IlizVUENo,8297
-README.md,sha256=rGRkmXP-GUxqqlz-BGb7TzdQlCiQlfcOmwMKz5KbCRU,11486
-nonebot_plugin_l4d2_server-0.4.7.dist-info/LICENSE,sha256=IwGE9guuL-ryRPEKi6wFPI_zOhg7zDZbTYuHbSt_SAk,35823
-nonebot_plugin_l4d2_server-0.4.7.dist-info/METADATA,sha256=5avjRgAx0ryke7TV78IzjSV77ggsXQ_o5TfJPKNnHZo,13142
-nonebot_plugin_l4d2_server-0.4.7.dist-info/WHEEL,sha256=vVCvjcmxuUltf8cYhJ0sJMRDLr1XsPuxEId8YDzbyCY,88
-nonebot_plugin_l4d2_server-0.4.7.dist-info/RECORD,,
+README.md,sha256=kgtvxyze7CvBpFJEP4o6BbzkOQnP3AGVO22Tj6dK788,11585
+nonebot_plugin_l4d2_server-0.4.8.dist-info/LICENSE,sha256=IwGE9guuL-ryRPEKi6wFPI_zOhg7zDZbTYuHbSt_SAk,35823
+nonebot_plugin_l4d2_server-0.4.8.dist-info/METADATA,sha256=u_4-SPNN71DRR_i4JSU3AjYfbypkYvR6i0Hlf4D8lJk,13236
+nonebot_plugin_l4d2_server-0.4.8.dist-info/WHEEL,sha256=vVCvjcmxuUltf8cYhJ0sJMRDLr1XsPuxEId8YDzbyCY,88
+nonebot_plugin_l4d2_server-0.4.8.dist-info/RECORD,,