nonebot-plugin-l4d2-server 0.3.1.2__py3-none-any.whl → 0.3.1.4__py3-none-any.whl

README.md

@@ -145,7 +145,9 @@ _✨Nonebot & Left 4 Dead 2 server操作✨_
 | 求生地图/查看求生地图 | 所有人 | 看图 | 获取当前路径下所有的vpk文件，并输出目录 |
 | (求生)地图删除[number] | 群管/超管 | 删图 | 根据求生地图列出的序号，删除地图，[number]可以在第二条消息内输入 |
 | 求生地图[number][改/改名][text] | 群管/超管 | 改图名 | [number]同上，text为更改后名称，如果没有.vpk后缀会自动加上 |
-| 求生服务器指令[text] | 群管/超管 | 控制台 | rcon连接求生服务器控制台,建议设置l4_host、l4_port、l4_rcon，l4_rcon不设置会尝试自动获取 |
+| 求生服务器指令[text] | 群管/超管 | 控制台 | rcon连接求生服务器控制台，使用ip和passsword |
+| 求生路径 | 群管/超管 | 查看路径 | 查看当前服务器路径 |
+| 求生路径切换[number] | 群管/超管 | 切换路径 | 切换本地服务器路径 |
 
 ### anne(电信服)
 
@@ -292,6 +294,7 @@ anne:<br>
  - 在win端成功测试，修复压缩包bug
  - 新增开关协程异步env设置
  - 测试rcon建立通讯
+ - 实现切换路径查看地图和使用rcon指令
 
 ### 0.3.0--2022.2.18
 

nonebot_plugin_l4d2_server/__init__.py

@@ -39,7 +39,7 @@ scheduler = require("nonebot_plugin_apscheduler").scheduler
 driver = get_driver()
 
 
-__version__ = "0.3.1.2"
+__version__ = "0.3.1.4"
 __plugin_meta__ = PluginMetadata(
     name="求生之路小助手",
     description='群内对有关求生之路的查询和操作',
@@ -57,38 +57,43 @@ __plugin_meta__ = PluginMetadata(
 @up.handle()
 async def _(matcher:Matcher,event: NoticeEvent):
     args = event.dict()
-    matcher.set_arg('txt',args)
+    map_path = Path(l4_file[CHECK_FILE],vpk_path)
+    if args['notice_type'] != 'offline_file':
+        matcher.set_arg('txt',args)
+    else:
     # 检查下载路径是否存在
     # logger.info('检查下载路径是否存在')
-    # if not Path(l4_file).exists():
-    #     await up.finish("你填写的路径不存在辣")
-    # if not Path(map_path).exists():
-    #     await up.finish("这个路径并不是求生服务器的路径，请再看看罢")
-    #     # args = event.dict()
-    # # if args['notice_type'] != 'offline_file':  # 群聊值响应超管
-    # #     return
-    # url = txt['file']['url']
-    # name: str = txt['file']['name']
-    # # user_id = txt['user_id']
-    # # 如果不符合格式则忽略
-    # if not name.endswith(file_format):
-    #     return
-    # await up.send('已收到文件，开始下载')
-    # sleep(1)   # 等待一秒防止因为文件名获取出现BUG
-    # vpk_files = await updown_l4d2_vpk(map_path,name,url)
-    # if vpk_files:
-    #     logger.info('检查到新增文件')
-    #     mes = "解压成功，新增以下几个vpk文件"
-    # else:
-    #     mes = "你可能上传了相同的文件，或者解压失败了捏"
-            
-    # await up.finish(mes_list(mes,vpk_files))
+        l4_file_path = l4_file[CHECK_FILE]
+        # 检查下载路径是否存在
+        logger.info(l4_file_path)
+        if not Path(l4_file_path).exists():
+            await up.finish("你填写的路径不存在辣")
+        if not Path(map_path).exists():
+            await up.finish("这个路径并不是求生服务器的路径，请再看看罢")
+            # args = event.dict()
+        # if args['notice_type'] != 'offline_file':  # 群聊值响应超管
+        #     return
+        url = args['file']['url']
+        name: str = args['file']['name']
+        # user_id = txt['user_id']
+        # 如果不符合格式则忽略
+        await up.send('已收到文件，开始下载')
+        sleep(1)   # 等待一秒防止因为文件名获取出现BUG
+        vpk_files = await updown_l4d2_vpk(map_path,name,url)
+        if vpk_files:
+            logger.info('检查到新增文件')
+            mes = "解压成功，新增以下几个vpk文件"
+        else:
+            mes = "你可能上传了相同的文件，或者解压失败了捏"
+                
+        await up.finish(mes_list(mes,vpk_files))
 
 
 @up.got("is_sure",prompt="请选择上传位置（输入阿拉伯数字)")    
 async def _(matcher: Matcher):
     logger.info(l4_file)
     args = matcher.get_arg('txt')
+    map_path = Path(l4_file[CHECK_FILE],vpk_path)
     sleep(1)
     if not args:
         await matcher.finish('获取文件出错辣，再试一次吧')
@@ -118,7 +123,7 @@ async def _(matcher: Matcher):
         return
     await up.send('已收到文件，开始下载')
     sleep(1)   # 等待一秒防止因为文件名获取出现BUG
-    vpk_files = await updown_l4d2_vpk(map_path,name,url)
+    vpk_files = await updown_l4d2_vpk(Path(l4_file_path,vpk_path),name,url)
     if vpk_files:
         logger.info('检查到新增文件')
         mes = "解压成功，新增以下几个vpk文件"
@@ -131,6 +136,7 @@ async def _(matcher: Matcher):
 @find_vpk.handle()
 async def _(bot:Bot,event: MessageEvent):
     name_vpk = []
+    map_path = Path(l4_file[CHECK_FILE],vpk_path)
     name_vpk = get_vpk(name_vpk,map_path)
     logger.info("获取文件列表成功")
     mes = "当前服务器下有以下vpk文件"
@@ -148,12 +154,14 @@ async def _(matcher:Matcher,args:Message = CommandArg()):
 
 @del_vpk.got("num",prompt="你要删除第几个序号的地图(阿拉伯数字)")
 async def _(tag:int = ArgPlainText("num")):
+    map_path = Path(l4_file[CHECK_FILE],vpk_path)
     vpk_name = del_map(tag,map_path)
     await del_vpk.finish('已删除地图：' + vpk_name)
     
 @rename_vpk.handle()
 async def _(matched: Tuple[int,str, str] = RegexGroup(),):
     num,useless,rename = matched
+    map_path = Path(l4_file[CHECK_FILE],vpk_path)
     logger.info('检查是否名字是.vpk后缀')
     if not rename.endswith('.vpk'):
         rename = rename + '.vpk'
@@ -242,7 +250,6 @@ async def _(args:Message = CommandArg()):
         else:
             CHECK_FILE = msg_number - 1
             now_path = l4_file[CHECK_FILE]
-            load_config()
             await check_path.send(f'已经切换路径为\n{str(CHECK_FILE+1)}、{now_path}')
     else: 
         now_path = l4_file[CHECK_FILE]
@@ -336,7 +343,6 @@ async def _(matcher: Matcher,bot:Bot,event:GroupMessageEvent,state:T_State):
 async def _(args:Message = CommandArg()):
     """更新"""
     msg = args.extract_plain_text()
-    load_config()
     if not msg:
         load_josn()
         reload_ip()

nonebot_plugin_l4d2_server/command.py

@@ -15,7 +15,7 @@ from nonebot.adapters.onebot.v11 import (
     PrivateMessageEvent
     )
 from .l4d2_anne.server import server_key,ANNE_IP
-from .config import Master,ADMINISTRATOR,reMaster
+from .config import Master,ADMINISTRATOR,reMaster,file_format
 
 help_ = on_command('l4_help',aliases={'求生帮助'},priority=20,block=True)
 
@@ -27,14 +27,18 @@ help_ = on_command('l4_help',aliases={'求生帮助'},priority=20,block=True)
 def wenjian(
 event:NoticeEvent):
     superuse = nonebot.get_driver().config.l4_master
-    if isinstance(event, GroupUploadNoticeEvent):
-        return str(event.user_id) in superuse
-    else:
-        args = event.dict()
+    args = event.dict()
+    name: str = args['file']['name']
+    if args['notice_type'] == 'offline_file':
+        if superuse:
+            return name.endswith(file_format) and args['user_id'] in superuse
+        else:
+            return name.endswith(file_format)
+    elif args['notice_type'] == 'group_upload':
         if superuse:
-            return str(args['user_id']) in superuse and args['notice_type'] == 'offline_file'
+            return args['user_id'] in superuse and name.endswith(file_format)
         else:
-            return args['notice_type'] == 'offline_file'
+            return name.endswith(file_format)
 
 up = on_notice(rule=wenjian)
 # up = on_command('upmap',aliases={'上传地图','上传'},priority=20,block=True,permission= reMaster,handlers=[l4_up()])

nonebot_plugin_l4d2_server/config.py

@@ -91,19 +91,19 @@ l4_file, l4_steamid, l4_host, l4_port, l4_rcon, l4_master = l4_list
 地图路径
 '''
 vpk_path = "left4dead2/addons"
-map_path = Path(l4_file[CHECK_FILE],vpk_path)
-l4_file_one = l4_file[CHECK_FILE]
-l4_host_one = l4_host[CHECK_FILE]
-l4_port_one = int(l4_port[CHECK_FILE])
-l4_rcon_one = l4_rcon[CHECK_FILE]
-def load_config():
-    # 文件路径
-    global map_path,l4_file_one,l4_host_one,l4_port_one,l4_rcon_one
-    map_path = Path(l4_file[CHECK_FILE],vpk_path)
-    l4_file_one = l4_file[CHECK_FILE]
-    l4_host_one = l4_host[CHECK_FILE]
-    l4_port_one = int(l4_port[CHECK_FILE])
-    l4_rcon_one = l4_rcon[CHECK_FILE]
+# map_path = Path(l4_file[CHECK_FILE],vpk_path)
+# l4_file_one = l4_file[CHECK_FILE]
+# l4_host_one = l4_host[CHECK_FILE]
+# l4_port_one = int(l4_port[CHECK_FILE])
+# l4_rcon_one = l4_rcon[CHECK_FILE]
+# def load_config():
+#     # 文件路径
+#     global map_path,l4_file_one,l4_host_one,l4_port_one,l4_rcon_one
+#     map_path = Path(l4_file[CHECK_FILE],vpk_path)
+#     l4_file_one = l4_file[CHECK_FILE]
+#     l4_host_one = l4_host[CHECK_FILE]
+#     l4_port_one = int(l4_port[CHECK_FILE])
+#     l4_rcon_one = l4_rcon[CHECK_FILE]
 
 
 PLAYERSDATA = Path() / "data/L4D2/image/players"

{nonebot_plugin_l4d2_server-0.3.1.2.dist-info → nonebot_plugin_l4d2_server-0.3.1.4.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: nonebot-plugin-l4d2-server
-Version: 0.3.1.2
+Version: 0.3.1.4
 Summary: L4D2 server related operations plugin for NoneBot
 Home-page: https://github.com/Umamusume-Agnes-Digital/nonebot_plugin_l4d2_server
 License: MIT
@@ -187,7 +187,9 @@ _✨Nonebot & Left 4 Dead 2 server操作✨_
 | 求生地图/查看求生地图 | 所有人 | 看图 | 获取当前路径下所有的vpk文件，并输出目录 |
 | (求生)地图删除[number] | 群管/超管 | 删图 | 根据求生地图列出的序号，删除地图，[number]可以在第二条消息内输入 |
 | 求生地图[number][改/改名][text] | 群管/超管 | 改图名 | [number]同上，text为更改后名称，如果没有.vpk后缀会自动加上 |
-| 求生服务器指令[text] | 群管/超管 | 控制台 | rcon连接求生服务器控制台,建议设置l4_host、l4_port、l4_rcon，l4_rcon不设置会尝试自动获取 |
+| 求生服务器指令[text] | 群管/超管 | 控制台 | rcon连接求生服务器控制台，使用ip和passsword |
+| 求生路径 | 群管/超管 | 查看路径 | 查看当前服务器路径 |
+| 求生路径切换[number] | 群管/超管 | 切换路径 | 切换本地服务器路径 |
 
 ### anne(电信服)
 
@@ -334,6 +336,7 @@ anne:<br>
  - 在win端成功测试，修复压缩包bug
  - 新增开关协程异步env设置
  - 测试rcon建立通讯
+ - 实现切换路径查看地图和使用rcon指令
 
 ### 0.3.0--2022.2.18
 

{nonebot_plugin_l4d2_server-0.3.1.2.dist-info → nonebot_plugin_l4d2_server-0.3.1.4.dist-info}/RECORD

@@ -1,7 +1,7 @@
 LICENSE,sha256=IwGE9guuL-ryRPEKi6wFPI_zOhg7zDZbTYuHbSt_SAk,35823
-nonebot_plugin_l4d2_server/__init__.py,sha256=uToyYN9hxFFkb0aQdhXPpLMbVctQcGctAFbZIcVaVDg,16259
-nonebot_plugin_l4d2_server/command.py,sha256=UJW2gUTUVd8W6L-ivmJ2pd1cLL4j9WqLprdDeQuyfLg,4806
-nonebot_plugin_l4d2_server/config.py,sha256=HHj5gOKRu8LJXjeoqmM9rsJd59vMTUOuj9_h4JrurTA,3793
+nonebot_plugin_l4d2_server/__init__.py,sha256=pMDYYZXvh3d1EzoDjN47MxS3y23VLGQqyhhhgwpc4Fs,16661
+nonebot_plugin_l4d2_server/command.py,sha256=md0LK2N0OVxWNWf850AT4Iwk_CA2_b8TnioFhaEv4MI,4975
+nonebot_plugin_l4d2_server/config.py,sha256=rty6HGFS3a5v04kKzSOkBO6lOya_e_HlSqD9TZ-rxDU,3819
 nonebot_plugin_l4d2_server/data/L4D2/font.ttf,sha256=COzaRqdqO7vgO2IEKRko3ck9ZOdm7_iwOfbe72UATzE,2365520
 nonebot_plugin_l4d2_server/data/L4D2/image/head/head.png,sha256=Z72PEvp7xF1DZcLDeuWlg2_g6JAfHxtisptWn6BYGN8,158357
 nonebot_plugin_l4d2_server/data/L4D2/image/header/player1.jpg,sha256=2A_llIi9YVhJs9JOMuF36by7Ewc7P7qOgQS8t5jemNw,405369
@@ -35,8 +35,8 @@ nonebot_plugin_l4d2_server/message.py,sha256=7Dx3XLC3Ef2nS1JWNUsOph1mM-XZikGqMri
 nonebot_plugin_l4d2_server/seach.py,sha256=_H21KaSBJ941U8wqE-SRdPuBIYTKE2ogbuUk55B3ME0,1053
 nonebot_plugin_l4d2_server/txt_to_img.py,sha256=ZaxHYNu8aAZUH4fNALyE1Q_ET7KuWytEiMFZ9loZnqc,2188
 nonebot_plugin_l4d2_server/utils.py,sha256=_GY9zstxi1iWqDnBxZWzdTqMM-7-eGrl6i_IAvhuA8E,8270
-README.md,sha256=QBLIhlox5pRBsNG2jMZjIHWZcb6I-vqNlqvHqghvsMc,14929
-nonebot_plugin_l4d2_server-0.3.1.2.dist-info/LICENSE,sha256=IwGE9guuL-ryRPEKi6wFPI_zOhg7zDZbTYuHbSt_SAk,35823
-nonebot_plugin_l4d2_server-0.3.1.2.dist-info/METADATA,sha256=sE6aQpisjYBtQz08iqn5pdUtahOTmAgGESvNlIvSF_w,16287
-nonebot_plugin_l4d2_server-0.3.1.2.dist-info/WHEEL,sha256=vVCvjcmxuUltf8cYhJ0sJMRDLr1XsPuxEId8YDzbyCY,88
-nonebot_plugin_l4d2_server-0.3.1.2.dist-info/RECORD,,
+README.md,sha256=MGFW2EG_8Y-OnMR-ebBuJwRHjZwNll_vH9Xg_pacXu0,15098
+nonebot_plugin_l4d2_server-0.3.1.4.dist-info/LICENSE,sha256=IwGE9guuL-ryRPEKi6wFPI_zOhg7zDZbTYuHbSt_SAk,35823
+nonebot_plugin_l4d2_server-0.3.1.4.dist-info/METADATA,sha256=fj0z0ZosBoMADtgcUaGGBvDEugmOX0zboeVI3FETsA0,16453
+nonebot_plugin_l4d2_server-0.3.1.4.dist-info/WHEEL,sha256=vVCvjcmxuUltf8cYhJ0sJMRDLr1XsPuxEId8YDzbyCY,88
+nonebot_plugin_l4d2_server-0.3.1.4.dist-info/RECORD,,