nonebot-plugin-l4d2-server 0.5.2__py3-none-any.whl → 0.5.3__py3-none-any.whl

README.md

@@ -40,6 +40,8 @@ _✨Nonebot & Left 4 Dead 2 server操作✨_
 
 同时不再支持远程查询，改为只允许本地查询
 
+文档暂时没时间更新ozr
+
 ## 主要功能
 
 - 求生服务器-本地多路径操作（传地图）
@@ -114,7 +116,14 @@ bot所在文件夹下
 <details>
 <summary>展开/收起</summary>
 
-### 0.5.1--2022.5.01
+
+### 0.5.3--2022.5.07
+
+- 新增`l4更新`和`l4重启`
+- 注释无效项（三方图查询）
+- 可以通过git clone 直接加载插件
+
+### 0.5.2--2022.5.01
 
 - 解决了main和dev分支的一个严重bug（也许没解决
 - 本地化，更好的添加,删除远程分支
@@ -360,6 +369,6 @@ bot所在文件夹下
   - [可爱小Q](https://github.com/MeetWq/mybot)- 服务器图片参考
 - [群聊学习](https://github.com/CMHopeSunshine/nonebot-plugin-learning-chat)- web控制台参考
 - [日向麻麻](https://github.com/Special-Week)- 代码优化参考
-- [gsuid](https://github.com/KimigaiiWuyi/GenshinUID)- readme和wiki的格式参考
+- [gsuid](https://github.com/KimigaiiWuyi/GenshinUID)- readme和wiki的格式参考，以及3.1版本的更新和重启
 - 呆呆- 提供三方地图的详细数据
 - ArcPav -积极反馈bug，提供改进思路

nonebot_plugin_l4d2_server/__init__.py

@@ -412,18 +412,18 @@ async def _(matcher:Matcher,):
     msg = mes_list(msg,name_smx).replace(" ","")
     await matcher.finish(mode_txt_to_img(mes,msg))
     
-@search_api.handle()
-async def _(matcher:Matcher,state:T_State,event:GroupMessageEvent,args:Message = CommandArg()):
-    msg:str = args.extract_plain_text()
-    # if msg.startswith('代码'):
-        # 建图代码返回三方图信息
-    data = await seach_map(msg,l4_config.l4_master[0],l4_config.l4_key)
-    # else:
-    if type(data) == str:
-        await matcher.finish(data)
-    else:
-        state['maps'] = data
-        await matcher.send(await map_dict_to_str(data))
+# @search_api.handle()
+# async def _(matcher:Matcher,state:T_State,event:GroupMessageEvent,args:Message = CommandArg()):
+#     msg:str = args.extract_plain_text()
+#     # if msg.startswith('代码'):
+#         # 建图代码返回三方图信息
+#     data = await seach_map(msg,l4_config.l4_master[0],l4_config.l4_key)
+#     # else:
+#     if type(data) == str:
+#         await matcher.finish(data)
+#     else:
+#         state['maps'] = data
+#         await matcher.send(await map_dict_to_str(data))
         
 @search_api.got("is_sure",prompt='如果需要上传，请发送 "yes"')    
 async def _(matcher:Matcher,bot:Bot,event:GroupMessageEvent,state:T_State):

nonebot_plugin_l4d2_server/config.py

@@ -19,8 +19,7 @@ from nonebot.adapters.onebot.v11.permission import (
     PRIVATE_FRIEND,
 )
 
-from .l4d2_queries.ohter import ALL_HOST    
-from .l4d2_queries.api import seach_map,map_dict_to_str
+from .l4d2_queries.ohter import ALL_HOST
 file_format = (".vpk",".zip",".7z",'rar')
 # 权限
 

nonebot_plugin_l4d2_server/l4d2_image/image.py

@@ -0,0 +1,292 @@
+from io import BytesIO
+from pathlib import Path
+from base64 import b64encode
+from typing import Union, overload
+from typing import Union,Tuple,Optional
+import math
+import random
+
+import aiofiles
+from PIL import Image
+from httpx import get
+import sys
+from pathlib import Path
+
+MAIN_PATH = Path() / 'data' / 'GenshinUID'
+sys.path.append(str(MAIN_PATH))
+CONFIG_PATH = MAIN_PATH / 'config.json'
+RESOURCE_PATH = MAIN_PATH / 'resource'
+WIKI_PATH = MAIN_PATH / 'wiki'
+CU_BG_PATH = MAIN_PATH / 'bg'
+CU_CHBG_PATH = MAIN_PATH / 'chbg'
+WEAPON_PATH = RESOURCE_PATH / 'weapon'
+GACHA_IMG_PATH = RESOURCE_PATH / 'gacha_img'
+CHAR_PATH = RESOURCE_PATH / 'chars'
+CHAR_STAND_PATH = RESOURCE_PATH / 'char_stand'
+CHAR_SIDE_PATH = RESOURCE_PATH / 'char_side'
+CHAR_NAMECARD_PATH = RESOURCE_PATH / 'char_namecard'
+REL_PATH = RESOURCE_PATH / 'reliquaries'
+ICON_PATH = RESOURCE_PATH / 'icon'
+TEMP_PATH = RESOURCE_PATH / 'temp'
+CARD_PATH = RESOURCE_PATH / 'card'
+GUIDE_PATH = WIKI_PATH / 'guide'
+TEXT2D_PATH = Path(__file__).parents[2] / 'resource' / 'texture2d'
+
+PLAYER_PATH = MAIN_PATH / 'players'
+
+
+TEXT2D_PATH = Path(__file__).parents[2] / 'resource' / 'texture2d'
+FETTER_PATH = TEXT2D_PATH / 'fetter'
+TALENT_PATH = TEXT2D_PATH / 'talent'
+WEAPON_BG_PATH = TEXT2D_PATH / 'weapon'
+WEAPON_AFFIX_PATH = TEXT2D_PATH / 'weapon_affix'
+LEVEL_PATH = TEXT2D_PATH / 'level'
+
+BG_PATH = Path(__file__).parent / 'bg'
+TEXT_PATH = Path(__file__).parent / 'texture2d'
+ring_pic = Image.open(TEXT_PATH / 'ring.png')
+mask_pic = Image.open(TEXT_PATH / 'mask.png')
+NM_BG_PATH = BG_PATH / 'nm_bg'
+SP_BG_PATH = BG_PATH / 'sp_bg'@overload
+
+if list(CU_BG_PATH.iterdir()) != []:
+    bg_path = CU_BG_PATH
+else:
+    bg_path = NM_BG_PATH
+
+async def convert_img(img: Image.Image, is_base64: bool = False) -> bytes:
+    ...
+
+
+@overload
+async def convert_img(img: Image.Image, is_base64: bool = True) -> str:
+    ...
+
+
+@overload
+async def convert_img(img: bytes, is_base64: bool = False) -> str:
+    ...
+
+
+@overload
+async def convert_img(img: Path, is_base64: bool = False) -> str:
+    ...
+
+
+async def convert_img(
+    img: Union[Image.Image, str, Path, bytes], is_base64: bool = False
+):
+    """
+    :说明:
+      将PIL.Image对象转换为bytes或者base64格式。
+    :参数:
+      * img (Image): 图片。
+      * is_base64 (bool): 是否转换为base64格式, 不填默认转为bytes。
+    :返回:
+      * res: bytes对象或base64编码图片。
+    """
+    if isinstance(img, Image.Image):
+        img = img.convert('RGB')
+        result_buffer = BytesIO()
+        img.save(result_buffer, format='PNG', quality=80, subsampling=0)
+        res = result_buffer.getvalue()
+        if is_base64:
+            res = 'base64://' + b64encode(res).decode()
+        return res
+    elif isinstance(img, bytes):
+        pass
+    else:
+        async with aiofiles.open(img, 'rb') as fp:
+            img = await fp.read()
+    return f'[CQ:image,file=base64://{b64encode(img).decode()}]'
+
+
+async def get_color_bg(
+    based_w: int, based_h: int, bg: Optional[str] = None
+) -> Image.Image:
+    image = ''
+    if bg:
+        path = SP_BG_PATH / f'{bg}.jpg'
+        if path.exists():
+            image = Image.open(path)
+    CI_img = CustomizeImage(image, based_w, based_h)
+    img = CI_img.bg_img
+    color = CI_img.bg_color
+    color_mask = Image.new('RGBA', (based_w, based_h), color)
+    enka_mask = Image.open(TEXT2D_PATH / 'mask.png').resize((based_w, based_h))
+    img.paste(color_mask, (0, 0), enka_mask)
+    return img
+
+
+
+class CustomizeImage:
+    def __init__(
+        self, image: Union[str, Image.Image], based_w: int, based_h: int
+    ) -> None:
+
+        self.bg_img = self.get_image(image, based_w, based_h)
+        self.bg_color = self.get_bg_color(self.bg_img, is_light=True)
+        self.text_color = self.get_text_color(self.bg_color)
+        self.highlight_color = self.get_highlight_color(self.bg_color)
+        self.char_color = self.get_char_color(self.bg_color)
+        self.bg_detail_color = self.get_bg_detail_color(self.bg_color)
+        self.char_high_color = self.get_char_high_color(self.bg_color)
+
+    @staticmethod
+    def get_image(
+        image: Union[str, Image.Image], based_w: int, based_h: int
+    ) -> Image.Image:
+        # 获取背景图片
+        if isinstance(image, Image.Image):
+            edit_bg = image
+        elif image:
+            edit_bg = Image.open(BytesIO(get(image).content)).convert('RGBA')
+        else:
+            path = random.choice(list(bg_path.iterdir()))
+            edit_bg = Image.open(path).convert('RGBA')
+
+        # 确定图片的长宽
+        bg_img = crop_center_img(edit_bg, based_w, based_h)
+        return bg_img
+
+    @staticmethod
+    def get_dominant_color(pil_img: Image.Image) -> Tuple[int, int, int]:
+        img = pil_img.copy()
+        img = img.convert("RGBA")
+        img = img.resize((1, 1), resample=0)
+        dominant_color = img.getpixel((0, 0))
+        return dominant_color
+
+    @staticmethod
+    def get_bg_color(
+        edit_bg: Image.Image, is_light: Optional[bool] = False
+    ) -> Tuple[int, int, int]:
+        # 获取背景主色
+        color = 8
+        q = edit_bg.quantize(colors=color, method=2)
+        bg_color = (0, 0, 0)
+        if is_light:
+            based_light = 195
+        else:
+            based_light = 120
+        temp = 9999
+        for i in range(color):
+            bg = tuple(
+                q.getpalette()[  # type:ignore
+                    i * 3 : (i * 3) + 3  # noqa:E203
+                ]
+            )
+            light_value = bg[0] * 0.3 + bg[1] * 0.6 + bg[2] * 0.1
+            if abs(light_value - based_light) < temp:
+                bg_color = bg
+                temp = abs(light_value - based_light)
+        return bg_color
+
+    @staticmethod
+    def get_text_color(bg_color: Tuple[int, int, int]) -> Tuple[int, int, int]:
+        # 通过背景主色（bg_color）确定文字主色
+        r = 125
+        if max(*bg_color) > 255 - r:
+            r *= -1
+        text_color = (
+            math.floor(bg_color[0] + r if bg_color[0] + r <= 255 else 255),
+            math.floor(bg_color[1] + r if bg_color[1] + r <= 255 else 255),
+            math.floor(bg_color[2] + r if bg_color[2] + r <= 255 else 255),
+        )
+        return text_color
+
+    @staticmethod
+    def get_char_color(bg_color: Tuple[int, int, int]) -> Tuple[int, int, int]:
+        r = 140
+        if max(*bg_color) > 255 - r:
+            r *= -1
+        char_color = (
+            math.floor(bg_color[0] + 5 if bg_color[0] + r <= 255 else 255),
+            math.floor(bg_color[1] + 5 if bg_color[1] + r <= 255 else 255),
+            math.floor(bg_color[2] + 5 if bg_color[2] + r <= 255 else 255),
+        )
+        return char_color
+
+    @staticmethod
+    def get_char_high_color(
+        bg_color: Tuple[int, int, int]
+    ) -> Tuple[int, int, int]:
+        r = 140
+        d = 20
+        if max(*bg_color) > 255 - r:
+            r *= -1
+        char_color = (
+            math.floor(bg_color[0] + d if bg_color[0] + r <= 255 else 255),
+            math.floor(bg_color[1] + d if bg_color[1] + r <= 255 else 255),
+            math.floor(bg_color[2] + d if bg_color[2] + r <= 255 else 255),
+        )
+        return char_color
+
+    @staticmethod
+    def get_bg_detail_color(
+        bg_color: Tuple[int, int, int]
+    ) -> Tuple[int, int, int]:
+        r = 140
+        if max(*bg_color) > 255 - r:
+            r *= -1
+        bg_detail_color = (
+            math.floor(bg_color[0] - 20 if bg_color[0] + r <= 255 else 255),
+            math.floor(bg_color[1] - 20 if bg_color[1] + r <= 255 else 255),
+            math.floor(bg_color[2] - 20 if bg_color[2] + r <= 255 else 255),
+        )
+        return bg_detail_color
+
+    @staticmethod
+    def get_highlight_color(
+        color: Tuple[int, int, int]
+    ) -> Tuple[int, int, int]:
+        red_color = color[0]
+        green_color = color[1]
+        blue_color = color[2]
+
+        highlight_color = {
+            'red': red_color - 127 if red_color > 127 else 127,
+            'green': green_color - 127 if green_color > 127 else 127,
+            'blue': blue_color - 127 if blue_color > 127 else 127,
+        }
+
+        max_color = max(highlight_color.values())
+
+        name = ''
+        for _highlight_color in highlight_color:
+            if highlight_color[_highlight_color] == max_color:
+                name = str(_highlight_color)
+
+        if name == 'red':
+            return red_color, highlight_color['green'], highlight_color['blue']
+        elif name == 'green':
+            return highlight_color['red'], green_color, highlight_color['blue']
+        elif name == 'blue':
+            return highlight_color['red'], highlight_color['green'], blue_color
+        else:
+            return 0, 0, 0  # Error
+        
+        
+def crop_center_img(
+    img: Image.Image, based_w: int, based_h: int
+) -> Image.Image:
+    # 确定图片的长宽
+    based_scale = '%.3f' % (based_w / based_h)
+    w, h = img.size
+    scale_f = '%.3f' % (w / h)
+    new_w = math.ceil(based_h * float(scale_f))
+    new_h = math.ceil(based_w / float(scale_f))
+    if scale_f > based_scale:
+        resize_img = img.resize((new_w, based_h), Image.ANTIALIAS)
+        x1 = int(new_w / 2 - based_w / 2)
+        y1 = 0
+        x2 = int(new_w / 2 + based_w / 2)
+        y2 = based_h
+    else:
+        resize_img = img.resize((based_w, new_h), Image.ANTIALIAS)
+        x1 = 0
+        y1 = int(new_h / 2 - based_h / 2)
+        x2 = based_w
+        y2 = int(new_h / 2 + based_h / 2)
+    crop_img = resize_img.crop((x1, y1, x2, y2))
+    return crop_img

nonebot_plugin_l4d2_server/l4d2_queries/api.py

@@ -1,43 +1,43 @@
-import httpx
-from typing import List,Union
-from nonebot.log import logger
+# import httpx
+# from typing import List,Union
+# from nonebot.log import logger
 
-async def seach_map(msg:Union[list,str],qq:str,key:str,mode:str = 'zh'):
-    url = "http://106.13.207.45:4015/l4d2"
-    json = {
-        "mode":mode,
-        "map_name":msg,
-        "qq":qq,
-        "key":key
-    }
-    file = httpx.post(url=url,json=json)
-    if mode == 'zh':
-        if file.status_code == 200:
-            return file.json()
-        elif file.status_code == 204:
-            return "没有结果"
-        elif file.status_code == 406:
-            return "参数错误"
-        elif file.status_code == 401:
-            return file.json()
-    elif mode == 'ip':
-        rep:dict = file.json()
-        try:
-            logger.error(rep['error_'])
-        except:
-            pass
-        print(file.json())
-        return file.json()
-    elif mode == 'first':
-        ip_tag:list = file.json()
-        return ip_tag
+# async def seach_map(msg:Union[list,str],qq:str,key:str,mode:str = 'zh'):
+#     url = ""
+#     json = {
+#         "mode":mode,
+#         "map_name":msg,
+#         "qq":qq,
+#         "key":key
+#     }
+#     file = httpx.post(url=url,json=json)
+#     if mode == 'zh':
+#         if file.status_code == 200:
+#             return file.json()
+#         elif file.status_code == 204:
+#             return "没有结果"
+#         elif file.status_code == 406:
+#             return "参数错误"
+#         elif file.status_code == 401:
+#             return file.json()
+#     elif mode == 'ip':
+#         rep:dict = file.json()
+#         try:
+#             logger.error(rep['error_'])
+#         except:
+#             pass
+#         print(file.json())
+#         return file.json()
+#     elif mode == 'first':
+#         ip_tag:list = file.json()
+#         return ip_tag
         
 
-async def map_dict_to_str(data:List[dict]):
-    msg = ""
-    for key,value in data[0].items():
-        if key == "url":
-            continue
-        msg += f"{key}:{value}\n"
-    return msg
+# async def map_dict_to_str(data:List[dict]):
+#     msg = ""
+#     for key,value in data[0].items():
+#         if key == "url":
+#             continue
+#         msg += f"{key}:{value}\n"
+#     return msg
 

nonebot_plugin_l4d2_server/l4d2_update/__init__.py

@@ -0,0 +1,143 @@
+from typing import Any, Tuple
+
+from nonebot.log import logger
+from nonebot.matcher import Matcher
+from nonebot.params import RegexGroup
+from nonebot.permission import SUPERUSER
+from nonebot import get_bot, on_regex, get_driver, on_command
+from nonebot.adapters.onebot.v11 import Bot, MessageEvent, MessageSegment
+
+from ..utils import register_menu
+from ..rule import FullCommand
+from .draw_update_log import draw_update_log_img
+from .restart import restart_message, restart_genshinuid
+
+l4d_restart = on_command('l4重启', rule=FullCommand())
+get_update_log = on_command('更新记录', rule=FullCommand())
+l4d_update = on_regex(
+    r'^(l4d)(强行)?(强制)?(更新)$',
+    block=True,
+)
+
+
+driver = get_driver()
+
+
+@driver.on_bot_connect
+async def _():
+    logger.info('检查遗留信息...')
+    bot = get_bot()
+    update_log = await restart_message()
+    if update_log == {}:
+        return
+    if update_log['send_type'] == 'group':
+        await bot.call_api(
+            api='send_group_msg',
+            group_id=update_log['send_to'],
+            message=update_log['msg'],
+        )
+    else:
+        await bot.call_api(
+            api='send_private_msg',
+            user_id=update_log['send_to'],
+            message=update_log['msg'],
+        )
+    logger.info('遗留信息检查完毕!')
+
+
+@get_update_log.handle()
+@register_menu(
+    '更新记录',
+    '更新记录',
+    '查看插件最近的更新记录',
+    detail_des=(
+        '介绍：\n'
+        '查看插件最近的有效Git更新记录\n'
+        ' \n'
+        '指令：\n'
+        '- <ft color=(238,120,0)>更新记录</ft>'
+    ),
+)
+async def send_updatelog_msg(
+    matcher: Matcher,
+):
+    im = await draw_update_log_img(is_update=False)
+    logger.info('正在执行[更新记录]...')
+    if isinstance(im, str):
+        await matcher.finish(im)
+    elif isinstance(im, bytes):
+        await matcher.finish(MessageSegment.image(im))
+    else:
+        await matcher.finish('发生了未知错误,请联系管理员检查后台输出!')
+
+
+@l4d_restart.handle()
+@register_menu(
+    '重启Bot',
+    'l4重启',
+    '重启Bot框架',
+    trigger_method='超级用户指令',
+    detail_des=(
+        '介绍：\n' '重启Bot框架\n' ' \n' '指令：\n' '- <ft color=(238,120,0)>l4重启</ft>'
+    ),
+)
+async def send_restart_msg(
+    bot: Bot,
+    event: MessageEvent,
+    matcher: Matcher,
+):
+    if not await SUPERUSER(bot, event):
+        return
+    logger.warning('开始执行[重启]')
+    qid = event.user_id
+    if len(event.get_session_id().split('_')) == 3:
+        send_id = event.get_session_id().split('_')[1]
+        send_type = 'group'
+    else:
+        send_id = qid
+        send_type = 'private'
+    await matcher.send('正在执行[l4重启]...')
+    await restart_genshinuid(send_type, str(send_id))
+
+
+@l4d_update.handle()
+@register_menu(
+    '更新插件',
+    'l4更新',
+    '手动更新插件',
+    detail_des=(
+        '介绍：\n'
+        '手动更新插件（执行 git pull）\n'
+        '每加上一个可选参数，执行等级加1\n'
+        '当执行等级≥1时会还原上次更改，等级≥2时会清空暂存\n'
+        ' \n'
+        '指令：\n'
+        '- <ft color=(238,120,0)>l4d</ft>'
+        '<ft color=(125,125,125)>(强行)(强制)</ft>'
+        '<ft color=(238,120,0)>更新</ft>'
+    ),
+)
+async def send_update_msg(
+    bot: Bot,
+    event: MessageEvent,
+    matcher: Matcher,
+    args: Tuple[Any, ...] = RegexGroup(),
+):
+    if not await SUPERUSER(bot, event):
+        return
+
+    logger.info('[l4d更新] 正在执行 ...')
+    level = 2
+    if args[1] is None:
+        level -= 1
+    if args[2] is None:
+        level -= 1
+    logger.info(f'[l4d更新] 更新等级为{level}')
+    await matcher.send(f'开始执行[l4d更新], 执行等级为{level}')
+    im = await draw_update_log_img(level)
+    if isinstance(im, str):
+        await matcher.finish(im)
+    elif isinstance(im, bytes):
+        await matcher.finish(MessageSegment.image(im))
+    else:
+        await matcher.finish('发生了未知错误,请联系管理员检查后台输出!')

nonebot_plugin_l4d2_server/l4d2_update/draw_update_log.py

@@ -0,0 +1,41 @@
+from pathlib import Path
+from typing import Union
+
+# from PIL import Image, ImageDraw
+
+from .update import update_from_git
+# from ..l4d2_image.image import convert_img
+# from ..l4d2_image.image import get_color_bg
+# from ..utils.genshin_fonts.genshin_fonts import genshin_font_origin
+
+R_PATH = Path(__file__).parent
+TEXT_PATH = R_PATH / 'texture2d'
+
+# gs_font_30 = genshin_font_origin(30)
+black_color = (24, 24, 24)
+
+log_config = {
+    'key': '✨🐛🎨⚡🍱♻️',
+    'num': 18,
+}
+
+log_map = {'✨': 'feat', '🐛': 'bug', '🍱': 'bento', '⚡️': 'zap', '🎨': 'art'}
+
+
+async def draw_update_log_img(
+    level: int = 0,
+    repo_path: Union[str, Path, None] = None,
+    is_update: bool = True,
+) -> Union[bytes, str]:
+    log_list = await update_from_git(level, repo_path, log_config, is_update)
+    if len(log_list) == 0:
+        return '更新失败!更多错误信息请查看控制台...\n' \
+               '>> 可以尝试使用\n' \
+               '>> [gs强制更新](危险)\n' \
+               '>> [gs强行强制更新](超级危险)!'
+
+    result = 'L4D2Bot 更新记录\n\n'
+    for log in log_list:
+        result += f'- {log[2:]}\n'
+
+    return result

nonebot_plugin_l4d2_server/l4d2_update/restart.py

@@ -0,0 +1,67 @@
+import os
+import sys
+import json
+import time
+import platform
+import subprocess
+from pathlib import Path
+
+# from ..utils.db_operation.db_operation import config_check
+
+bot_start = Path().cwd() / 'bot.py'
+restart_sh_path = Path().cwd() / 'gs_restart.sh'
+update_log_path = Path(__file__).parent / 'update_log.json'
+
+_restart_sh = '''#!/bin/bash
+kill -9 {}
+{} &'''
+
+
+async def get_restart_sh(extra: str) -> str:
+    args = f'{extra} {str(bot_start.absolute())}'
+    return _restart_sh.format(str(bot_start.absolute()), args)
+
+
+async def restart_genshinuid(send_type: str, send_id: str) -> None:
+    # extra = ''
+    # if await config_check('UsePoetry'):
+    #     extra = 'poetry run '
+    extra = sys.executable
+    restart_sh = await get_restart_sh(extra)
+    if not restart_sh_path.exists():
+        with open(restart_sh_path, "w", encoding="utf8") as f:
+            f.write(restart_sh)
+        if platform.system() == 'Linux':
+            os.system(f'chmod +x {str(restart_sh_path)}')
+            os.system(f'chmod +x {str(bot_start)}')
+    now_time = time.strftime('%Y-%m-%d %H:%M:%S', time.localtime(time.time()))
+    update_log = {
+        'type': 'restart',
+        'msg': '重启完成!',
+        'send_type': send_type,
+        'send_to': send_id,
+        'time': now_time,
+    }
+    with open(str(update_log_path), 'w', encoding='utf-8') as f:
+        json.dump(update_log, f)
+    if platform.system() == 'Linux':
+        os.execl(str(restart_sh_path), ' ')
+    else:
+        pid = os.getpid()
+        subprocess.Popen(
+            f'taskkill /F /PID {pid} & {extra} {bot_start}',
+            shell=True,
+        )
+
+
+async def restart_message() -> dict:
+    if update_log_path.exists():
+        with open(update_log_path, 'r', encoding='utf-8') as f:
+            update_log = json.load(f)
+        msg = f'{update_log["msg"]}\n重启时间:{update_log["time"]}'
+        update_log['msg'] = msg
+        os.remove(update_log_path)
+        os.remove(restart_sh_path)
+        return update_log
+    else:
+        return {}

nonebot_plugin_l4d2_server/l4d2_update/update.py

@@ -0,0 +1,65 @@
+from pathlib import Path
+from typing import List, Union
+
+import git
+from nonebot.log import logger
+from git.exc import GitCommandError
+
+
+async def update_from_git(
+    level: int = 0,
+    repo_path: Union[str, Path, None] = None,
+    log_config: dict = {
+        'key': '✨🐛',
+        'num': 7,
+    },
+    is_update: bool = True,
+) -> List[str]:
+    if repo_path is None:
+        repo_path = Path(__file__).parents[2]
+    repo = git.Repo(repo_path)  # type: ignore
+    o = repo.remotes.origin
+
+    if is_update:
+        # 清空暂存
+        if level >= 2:
+            logger.warning('[gs更新] 正在执行 git clean --xdf')
+            repo.git.clean('-xdf')
+        # 还原上次更改
+        if level >= 1:
+            logger.warning('[gs更新] 正在执行 git reset --hard')
+            repo.git.reset('--hard')
+
+        try:
+            pull_log = o.pull()
+            logger.info(f'[gs更新] {pull_log}')
+        except GitCommandError as e:
+            logger.warning(e)
+            return []
+
+    commits = list(repo.iter_commits(max_count=40))
+    log_list = []
+    for commit in commits:
+        if isinstance(commit.message, str):
+            for key in log_config['key']:
+                if key in commit.message:
+                    log_list.append(commit.message.replace('\n', ''))
+                    if len(log_list) >= log_config['num']:
+                        break
+    return log_list
+
+
+async def update_genshinuid(
+    level: int = 0, repo_path: Union[str, Path, None] = None
+) -> str:
+    log_list = await update_from_git(level, repo_path)
+    if len(log_list) == 0:
+        return (
+            '更新失败!更多错误信息请查看控制台...\n '
+            '>> 可以尝试使用\n '
+            '>> [gs强制更新](危险)\n '
+            '>> [gs强行强制更新](超级危险)!'
+        )
+    log = '\n'.join(log_list)
+    logger.info(f'[gs更新]\n{log}')
+    return f'更新成功!\n >> 最近有效更新为:\n{log}'

nonebot_plugin_l4d2_server/rule.py

@@ -0,0 +1,15 @@
+from nonebot.rule import Rule
+from nonebot.params import Depends, CommandArg
+from nonebot.adapters.onebot.v11 import Message
+
+
+async def full_command(arg: Message = CommandArg()) -> bool:
+    return not bool(str(arg))
+
+
+def FullCommand() -> Rule:
+    return Rule(full_command)
+
+
+def FullCommandDepend():
+    return Depends(full_command)

nonebot_plugin_l4d2_server/utils.py

@@ -6,7 +6,7 @@ import httpx
 import os
 from pathlib import Path
 
-from typing import List,Dict,Union
+from typing import List,Dict,Union,Optional
 from .txt_to_img import txt_to_img
 from .config import *
 from .l4d2_anne import write_player,del_player,anne_messgae
@@ -270,3 +270,28 @@ async def json_server_to_tag_dict(key:str,msg:str):
 
 
 
+sub_menus = []
+
+def register_menu_func(
+    func: str,
+    trigger_condition: str,
+    brief_des: str,
+    trigger_method: str = '指令',
+    detail_des: Optional[str] = None,
+):
+    sub_menus.append(
+        {
+            'func': func,
+            'trigger_method': trigger_method,
+            'trigger_condition': trigger_condition,
+            'brief_des': brief_des,
+            'detail_des': detail_des or brief_des,
+        }
+    )
+
+def register_menu(*args, **kwargs):
+    def decorator(f):
+        register_menu_func(*args, **kwargs)
+        return f
+
+    return decorator

{nonebot_plugin_l4d2_server-0.5.2.dist-info → nonebot_plugin_l4d2_server-0.5.3.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: nonebot-plugin-l4d2-server
-Version: 0.5.2
+Version: 0.5.3
 Summary: L4D2 server related operations plugin for NoneBot2
 Home-page: https://github.com/Agnes4m/nonebot_plugin_l4d2_server
 License: GPLv3
@@ -24,7 +24,8 @@ Requires-Dist: aiohttp (>=3.8.3,<4.0.0)
 Requires-Dist: amis-python (>=1.0.6,<2.0.0)
 Requires-Dist: asyncio (>=3.4.3)
 Requires-Dist: beautifulsoup4 (>=4.8.0)
-Requires-Dist: h11 (>=0.14.0,<0.15.0)
+Requires-Dist: gitpython (>=3.1.27)
+Requires-Dist: h11 (>0.11.0)
 Requires-Dist: httpx (>=0.23.3,<0.24.0)
 Requires-Dist: jieba (>=0.42.1,<0.43.0)
 Requires-Dist: jinja2 (>=3.0.0)
@@ -88,6 +89,8 @@ _✨Nonebot & Left 4 Dead 2 server操作✨_
 
 同时不再支持远程查询，改为只允许本地查询
 
+文档暂时没时间更新ozr
+
 ## 主要功能
 
 - 求生服务器-本地多路径操作（传地图）
@@ -162,7 +165,14 @@ bot所在文件夹下
 <details>
 <summary>展开/收起</summary>
 
-### 0.5.1--2022.5.01
+
+### 0.5.3--2022.5.07
+
+- 新增`l4更新`和`l4重启`
+- 注释无效项（三方图查询）
+- 可以通过git clone 直接加载插件
+
+### 0.5.2--2022.5.01
 
 - 解决了main和dev分支的一个严重bug（也许没解决
 - 本地化，更好的添加,删除远程分支
@@ -408,6 +418,6 @@ bot所在文件夹下
   - [可爱小Q](https://github.com/MeetWq/mybot)- 服务器图片参考
 - [群聊学习](https://github.com/CMHopeSunshine/nonebot-plugin-learning-chat)- web控制台参考
 - [日向麻麻](https://github.com/Special-Week)- 代码优化参考
-- [gsuid](https://github.com/KimigaiiWuyi/GenshinUID)- readme和wiki的格式参考
+- [gsuid](https://github.com/KimigaiiWuyi/GenshinUID)- readme和wiki的格式参考，以及3.1版本的更新和重启
 - 呆呆- 提供三方地图的详细数据
 - ArcPav -积极反馈bug，提供改进思路

{nonebot_plugin_l4d2_server-0.5.2.dist-info → nonebot_plugin_l4d2_server-0.5.3.dist-info}/RECORD

@@ -1,9 +1,8 @@
 LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
-README.md,sha256=hA9y2yRdAxcKkBHTvgXAX81TxYaMpXtKNj_9YHcpoZ4,10994
-nonebot_plugin_l4d2_server/__init__.py,sha256=6OQnWZccjqh_uEfyTzdWbLUOt-ATGndNtWV8jQrbtKs,17425
-nonebot_plugin_l4d2_server/chrome.py,sha256=NTb5STKFd1fXgNJvC3oFXsRG8a7tqbN1bCqasFuZe-A,1671
+README.md,sha256=jXjbsu1db4zcZcvIE34gjLCAevQoI_7zZJJtzLKRsmY,11200
+nonebot_plugin_l4d2_server/__init__.py,sha256=nTX9DMygNCbm5f-VpF7R3NtwhNKmu3mqg55Ei5mIQxM,17449
 nonebot_plugin_l4d2_server/command.py,sha256=Zqzp-QjsT9Wwt1niwtPJypYJVCZkeU-3YSMorhZ3VcU,8619
-nonebot_plugin_l4d2_server/config.py,sha256=GG9YwgQSvQGRzuypMoQlkyg33ZCOAig0bH5CiCWIPXc,6129
+nonebot_plugin_l4d2_server/config.py,sha256=nSAYebvlaoVaM_aCNkmG3Ls0LvwvZFVTYu38tJeYQiM,6069
 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
 nonebot_plugin_l4d2_server/data/L4D2/image/header/player1.jpg,sha256=2A_llIi9YVhJs9JOMuF36by7Ewc7P7qOgQS8t5jemNw,405369
@@ -24,6 +23,7 @@ nonebot_plugin_l4d2_server/l4d2_anne/server.py,sha256=QyfksmpUKjYCLFswAo-Q-S5Ung
 nonebot_plugin_l4d2_server/l4d2_anne/startand.py,sha256=4XmghR4l4rSw34rLFT5RmzwoTu1vxFFAq8PLsicB7_M,359
 nonebot_plugin_l4d2_server/l4d2_data/__init__.py,sha256=-Gqzs0WmYT0atAmm25hYszgFi2Zp1dlVQtF_CNoNchc,3241
 nonebot_plugin_l4d2_server/l4d2_data/config.py,sha256=RTPayMBDU2f4losEwAZ9BPKbJNDpmmEeheskWVIueI8,468
+nonebot_plugin_l4d2_server/l4d2_data/database.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 nonebot_plugin_l4d2_server/l4d2_data/players.py,sha256=kaXcBA8RO5eVTicb6up9pwdE-T2afkc1NykYFQ80poI,3221
 nonebot_plugin_l4d2_server/l4d2_data/serverip.py,sha256=c78UuSOMLaOBvfIayKo7xiQELYj8UMvM1A91D1E2f0s,1284
 nonebot_plugin_l4d2_server/l4d2_file/__init__.py,sha256=3gVBmEBVb7kVtjeTN7oxWbG8MxbkRtDBE9KNpoVAnhc,4075
@@ -32,23 +32,37 @@ nonebot_plugin_l4d2_server/l4d2_file/remote.py,sha256=uAcCbDAq9RIookmHl41PfQTpHy
 nonebot_plugin_l4d2_server/l4d2_image/__init__.py,sha256=fAjFLMkl7Kl4_2pE_wSi74IVzr5XsxLD3H_fPK3DgmM,4036
 nonebot_plugin_l4d2_server/l4d2_image/download.py,sha256=mdz3Q60peiq0B2oK3IOjDSe32guVH4gBM1Xwrrc4-rI,3996
 nonebot_plugin_l4d2_server/l4d2_image/htmlimg.py,sha256=DKG2ENh1HOCY7P41hIJTGGLizsTwR_nf05DR3vFWxRQ,1038
+nonebot_plugin_l4d2_server/l4d2_image/image.py,sha256=L6AWkyAq-UJTlT6yvPbdkFScZg0g1E9hNwUkrTsDImE,9524
 nonebot_plugin_l4d2_server/l4d2_image/send_image_tool.py,sha256=bXZKD6NhVr4FVJd5YY9Fcg5qDeA5_kQEQvv--CAO57Y,936
 nonebot_plugin_l4d2_server/l4d2_image/steam.py,sha256=_jsz96aw0ie67gE0Y_15qsjqW4tVe4IdC-xg3H0l21c,3799
 nonebot_plugin_l4d2_server/l4d2_image/vtfs.py,sha256=MawVMrGOrFZ7b8F_XGAMJPvd-grKfbRamDZAWxFXclQ,1387
 nonebot_plugin_l4d2_server/l4d2_queries/__init__.py,sha256=fS6Kdi2M_U-epbIMyiPRdnhcnb57RydnUHkJMam0ZVc,3791
-nonebot_plugin_l4d2_server/l4d2_queries/api.py,sha256=wkmdxR_gojvJiA1-gyL4Bd0ukyw14CUnd7GIOfS41y4,1109
+nonebot_plugin_l4d2_server/l4d2_queries/api.py,sha256=r-pnXh2ZGyR84M4k5OzYNIWcWD0lq8FmFk6hn7NoQFk,1157
 nonebot_plugin_l4d2_server/l4d2_queries/ohter.py,sha256=ssq1GKBWa5zrbytmdFwNxr9bSiRyrDTn2aoeb0tGoP0,1191
 nonebot_plugin_l4d2_server/l4d2_queries/qqgroup.py,sha256=l7gEwy_2M134Gu4U__1mwJH7mx7bQazYMPQvf_E9fJs,10826
 nonebot_plugin_l4d2_server/l4d2_server/__init__.py,sha256=AKufLXRnvzLi31aJLURqZenXjeOf0xRftBwHSugMasE,1615
+nonebot_plugin_l4d2_server/l4d2_server/index.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 nonebot_plugin_l4d2_server/l4d2_server/rcon.py,sha256=WmIt-hCTKC0swceO-hxeBHeKS_Srxtzfvpqay7O6RdE,1237
 nonebot_plugin_l4d2_server/l4d2_server/workshop.py,sha256=MLEGqU_m9zDDQVppExCJAKe_G340QL-VrPkJpXTkpOM,1359
+nonebot_plugin_l4d2_server/l4d2_update/__init__.py,sha256=gGt7DNbaxHmSVtC37YVr__aSjLuF-Pk6dPLS_twztHg,4093
+nonebot_plugin_l4d2_server/l4d2_update/draw_update_log.py,sha256=pTz1GJ6dZ8fzjheJQCWmNDvekxQKJBrx-_4wJwqHzRI,1179
+nonebot_plugin_l4d2_server/l4d2_update/restart.py,sha256=4xj6awHhhzX_Jh4hWWUpWPQf0bKFXWrPg0w_lhPCNko,2024
+nonebot_plugin_l4d2_server/l4d2_update/texture2d/art.png,sha256=QAvaSduHhaq1Fd43JIIHAqcjJajcVsKhIuOF3Nnajdw,3872
+nonebot_plugin_l4d2_server/l4d2_update/texture2d/bento.png,sha256=OgW84QrjAsLVn5iDGPR4p9cc1cucY2L9YZa8awvKhEQ,4448
+nonebot_plugin_l4d2_server/l4d2_update/texture2d/bug.png,sha256=u1OwznUVim5jitwekswgVVGRFrkBM7jFx7nGM4bfYCY,3575
+nonebot_plugin_l4d2_server/l4d2_update/texture2d/feat.png,sha256=D7lUdbvyme0Wup2yZPDltuVLm7TsreLKtHljUSgAEYc,3760
+nonebot_plugin_l4d2_server/l4d2_update/texture2d/log_title.png,sha256=KstYz0Ff4rcAPg0sycjvfrJIw_2uG1-QlWSYiTuFC0o,137862
+nonebot_plugin_l4d2_server/l4d2_update/texture2d/other.png,sha256=BgIQtvI1pXgswQGVQkCCr5fZf2qr4uPb25AR9mWDR2g,3028
+nonebot_plugin_l4d2_server/l4d2_update/texture2d/zap.png,sha256=Ydg07QYQLeCOzeH7L9Nm_qv37R-mJuawttMhhhkdkHU,2346
+nonebot_plugin_l4d2_server/l4d2_update/update.py,sha256=br_K16vBYlTafF_u_aiRAbb8FBJsYLLgmV-_x9KKePo,1968
 nonebot_plugin_l4d2_server/l4d2_web/web.py,sha256=qMWySCsJCHoAZJHWhkqq6qfmNLxAUhSpnAhcArVXWv0,8542
 nonebot_plugin_l4d2_server/l4d2_web/webUI.py,sha256=9u8zhT9pocdVXpH15_vZR8qvvGbWjYv2mYso_uJYBww,14148
 nonebot_plugin_l4d2_server/message.py,sha256=vTrTyXWF4fCEH-IlmvKeGv-J7oCkbrXhFwsAHFcivtg,1620
+nonebot_plugin_l4d2_server/rule.py,sha256=j1EEh9PgvFmbq5fQhOonA-3t13wnRM6R44Jkp8hCNQw,337
 nonebot_plugin_l4d2_server/seach.py,sha256=Box5QORfNfpMYDdwNeR309dP1wtivBOxcgrxdJSduSw,992
 nonebot_plugin_l4d2_server/txt_to_img.py,sha256=hzwLVGoOjLAQb3Br43vu1IWW23DuxKW6yTuxMCLhWoY,2133
-nonebot_plugin_l4d2_server/utils.py,sha256=zeFG7VD3aJXtXZhjw-imeTe8RSkAK4Kpx4IV1ud-rsQ,8035
-nonebot_plugin_l4d2_server-0.5.2.dist-info/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
-nonebot_plugin_l4d2_server-0.5.2.dist-info/METADATA,sha256=OQ6BKw-7x7R-2mVlHtlLpKtJPjoJBhJ8TFJCyH2TD5o,13030
-nonebot_plugin_l4d2_server-0.5.2.dist-info/WHEEL,sha256=7Z8_27uaHI_UZAc4Uox4PpBhQ9Y5_modZXWMxtUi4NU,88
-nonebot_plugin_l4d2_server-0.5.2.dist-info/RECORD,,
+nonebot_plugin_l4d2_server/utils.py,sha256=DmL09vlLLmoWVtX9C-E32npRFHGd4Q20LU3CZfTPoN4,8624
+nonebot_plugin_l4d2_server-0.5.3.dist-info/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
+nonebot_plugin_l4d2_server-0.5.3.dist-info/METADATA,sha256=ufFA8VbxjNEEaBJ2Cmd0XGOi-YwLMdsOo-n_zfW6JVw,13263
+nonebot_plugin_l4d2_server-0.5.3.dist-info/WHEEL,sha256=7Z8_27uaHI_UZAc4Uox4PpBhQ9Y5_modZXWMxtUi4NU,88
+nonebot_plugin_l4d2_server-0.5.3.dist-info/RECORD,,

nonebot_plugin_l4d2_server/chrome.py

@@ -1,45 +0,0 @@
-try:
-    from selenium import webdriver
-    from selenium.webdriver.chrome.options import Options
-    from selenium.webdriver.common.by import By
-except:
-    pass
-url = 'https://server.trygek.com/index.php'
-
-
-def get_anne_server():
-    chrome_options = Options()  
-    chrome_options.add_argument('--no-sandbox') #“–no-sandbox”参数是让Chrome在root权限下跑
-    chrome_options.add_argument('--ignore-certificate-errors')
-    chrome_options.add_argument('--disable-dev-shm-usage')
-    chrome_options.add_argument('-ignore-certificate-errors')
-    chrome_options.add_argument('--headless') #“–headless”参数是不用打开图形界面  
-    driver = webdriver.Chrome(chrome_options=chrome_options) 
-    print('启动成功')
-    # browser.get(url)
-    # browser.add_cookie({'name':'token','value':token_value})
-    driver.get(url)
-    print('网页已打开，正在浏览')
-    i = 0
-    n = 1
-    msg = ''
-    while i <= 40:
-        try:
-            i += 1
-            mes =''
-            xpath1 = '//*[@id="host_{}"]'.format(i)
-            xpath2 = '/html/body/main/div[3]/div[5]/div/div/table/tbody/tr[{}]/td[5]'.format(n)
-            xpath3 = '//*[@id="players_{}"]'.format(i)
-            xpath4 = '//*[@id="map_{}"]'.format(i)
-            xpath = [xpath1,xpath2,xpath3,xpath4]
-            names = ['服务器名称','服务器ip','玩家','地图']
-            for x in range(5):
-                name:str = driver.find_element(By.XPATH,xpath[x-1]).text
-                mes += names[x-1] + '' + name + '\n'
-            msg += mes
-            msg += '--------------------\n'
-            n += 2
-        except :
-            continue
-    return msg
-