nonebot-plugin-l4d2-server 0.6.5__py3-none-any.whl → 0.6.6__py3-none-any.whl

nonebot_plugin_l4d2_server/__init__.py

@@ -15,7 +15,6 @@
 * along with this program.  If not, see <https://www.gnu.org/licenses/>.
 """
 
-
 from nonebot import get_driver, require
 
 require("nonebot_plugin_apscheduler")  # noqa: F401
@@ -42,7 +41,7 @@ from .l4d2_web import web, webUI  # noqa: F401
 
 driver = get_driver()
 
-__version__ = "0.6.5"
+__version__ = "0.6.6"
 __plugin_meta__ = PluginMetadata(
     name="求生之路小助手",
     description="可用于管理求生之路查服和本地管理",

nonebot_plugin_l4d2_server/l4d2_file/__init__.py

@@ -58,8 +58,7 @@ smx_file = on_command(
 
 
 @up.handle()
-async def _():
-    ...
+async def _(): ...
 
 
 @up.got("map_url", prompt="图来")

nonebot_plugin_l4d2_server/l4d2_file/utils.py

@@ -66,7 +66,7 @@ def open_packet(name: str, down_file: Path) -> str:
                 ".7z": unpack_7zfile,
                 ".rar": unpack_rarfile,
             }
-            unpack_func = unpack_funcs.get(ext, None)
+            unpack_func = unpack_funcs.get(ext)
             if not unpack_func:
                 raise ValueError(f"不支持的拓展名: {ext}")
             unpack_func(down_file, down_path)

nonebot_plugin_l4d2_server/l4d2_image/__init__.py

@@ -51,6 +51,7 @@ async def dict_to_html(usr_id, detail_map: dict):
     detail_right["url"] = detail_map["个人资料"]
     detail_right["one_msg"] = detail_map["一言"]
     detail_right["last_one"] = detail_map["救援关"]
+
     # html_text = soup.prettify()
     # for key, value in detail_right.items():
     #     html_text = html_text.replace(key,value)
@@ -74,12 +75,12 @@ async def server_ip_pic(msg_list: List[ServerStatus]):
         server_info.rank_players = f"{server_info.players}/{server_info.max_players}"
         players_list: List[PlayerInfo] = []
         # logger.info(server_info.name)
-
-        sorted_players = sorted(server_info.Players, key=lambda x: x.Score)[:4]
+        max_number = l4_config.l4_img_name
+        sorted_players = sorted(server_info.Players, key=lambda x: x.Score)[:max_number]
         for player_info in sorted_players:
             # player_str = f"{player_info.name} | {player_info.Duration}"
             players_list.append(player_info)
-        while len(players_list) < 4:
+        while len(players_list) < max_number:
             players_list.append(PlayerInfo())
         server_info.Players = players_list
         # logger.info(server_info.Players)

nonebot_plugin_l4d2_server/l4d2_image/images.py

@@ -48,23 +48,19 @@ bg_path = CU_BG_PATH if list(CU_BG_PATH.iterdir()) != [] else NM_BG_PATH
 
 
 @overload
-async def convert_img(img: Image.Image, is_base64: bool = False) -> bytes:
-    ...
+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:
-    ...
+async def convert_img(img: Image.Image, is_base64: bool = True) -> str: ...
 
 
 @overload
-async def convert_img(img: bytes, is_base64: bool = False) -> str:
-    ...
+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: Path, is_base64: bool = False) -> str: ...
 
 
 async def convert_img(

nonebot_plugin_l4d2_server/l4d2_push/__init__.py

@@ -213,7 +213,6 @@ async def send_message(
 
 async def server_is_change():
     """检测服务器是否发生变化"""
-    ...
 
 
 if scheduler:

nonebot_plugin_l4d2_server/l4d2_update/__init__.py

@@ -50,7 +50,9 @@ async def _():
     "更新记录",
     "更新记录",
     "查看插件最近的更新记录",
-    detail_des=("介绍：\n查看插件最近的有效Git更新记录\n \n指令：\n- <ft color=(238,120,0)>更新记录</ft>"),
+    detail_des=(
+        "介绍：\n查看插件最近的有效Git更新记录\n \n指令：\n- <ft color=(238,120,0)>更新记录</ft>"
+    ),
 )
 async def send_updatelog_msg(
     matcher: Matcher,

nonebot_plugin_l4d2_server/l4d2_utils/config.py

@@ -55,6 +55,7 @@ class L4d2Config(BaseModel):
     web_username: str = Field("l4d2", alias="后台管理用户名")
     web_password: str = Field("admin", alias="后台管理密码")
     l4_style: str = Field("standard", alias="图片风格")
+    l4_img_name: int = Field(4, alias="图片显示玩家数量")
     l4_ipall: List[Dict[str, Any]] = Field(
         [
             {
@@ -93,8 +94,12 @@ class L4d2Config(BaseModel):
     l4_push_interval: int = Field(default=3, alias="定时任务间隔")
     l4_push_times: int = Field(default=10, alias="定时任务次数")
     l4_connect: bool = Field(default=True, alias="是否在查服命令后加入connect ip")
-    l4_group_upload: bool = Field(default=False, alias="是否在群里传地图的时候，提示上传服务器")
-    group_config: Dict[int, L4d2GroupConfig] = Field(default_factory=dict, alias="分群配置")
+    l4_group_upload: bool = Field(
+        default=False, alias="是否在群里传地图的时候，提示上传服务器"
+    )
+    group_config: Dict[int, L4d2GroupConfig] = Field(
+        default_factory=dict, alias="分群配置"
+    )
 
     def update(self, **kwargs):
         for key, value in kwargs.items():

nonebot_plugin_l4d2_server/l4d2_web/webUI.py

@@ -98,7 +98,9 @@ global_config_form = Form(
             label="后台管理用户名",
             name="web_username",
             value="${web_username}",
-            labelRemark=Remark(shape="circle", content="登录本后台管理所需要的用户名。"),  # noqa: E501
+            labelRemark=Remark(
+                shape="circle", content="登录本后台管理所需要的用户名。"
+            ),  # noqa: E501
         ),
         InputPassword(
             label="后台管理密码",
@@ -119,7 +121,9 @@ global_config_form = Form(
             label="字体",
             name="l4_font",
             value="${l4_font}",
-            labelRemark=Remark(shape="circle", content="机器人返回图片中文字的字体。"),  # noqa: E501
+            labelRemark=Remark(
+                shape="circle", content="机器人返回图片中文字的字体。"
+            ),  # noqa: E501
         ),
         Switch(
             label="是否图片发送单服务器查询",
@@ -197,7 +201,9 @@ global_config_form = Form(
             visibleOn="${total_enable}",
             joinValues=False,
             extractValue=True,
-            labelRemark=Remark(shape="circle", content="在这里加入的用户，才能上传地图"),  # noqa: E501
+            labelRemark=Remark(
+                shape="circle", content="在这里加入的用户，才能上传地图"
+            ),  # noqa: E501
         ),
         InputTag(
             label="坐牢三指令tag",
@@ -426,7 +432,9 @@ server_page = PageSchema(
             Alert(
                 level=LevelEnum.info,
                 className="white-space-pre-wrap",
-                body=(f"此数据库记录了{NICKNAME}所在服务器下的求生服务器。\n· 功能暂未完善"),  # noqa: E501
+                body=(
+                    f"此数据库记录了{NICKNAME}所在服务器下的求生服务器。\n· 功能暂未完善"
+                ),  # noqa: E501
             ),
             server_control,
             server_ditail,

{nonebot_plugin_l4d2_server-0.6.5.dist-info → nonebot_plugin_l4d2_server-0.6.6.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: nonebot-plugin-l4d2-server
-Version: 0.6.5
+Version: 0.6.6
 Summary: L4D2 server related operations plugin for NoneBot2
 Keywords: steam game l4d2 nonebot2 plugin
 Home-page: https://github.com/Agnes4m/nonebot_plugin_l4d2_server
@@ -30,7 +30,7 @@ Requires-Dist: httpx>=0.22.0
 Requires-Dist: rcon==2.1.0
 Requires-Dist: pillow<10.0.0
 Requires-Dist: pyunpack>=0.3.0
-Requires-Dist: ruamel.yaml>=0.17.21
+Requires-Dist: ruamel.yaml==0.17.21
 Requires-Dist: rarfile>=4.0
 Requires-Dist: patool>=1.12
 Requires-Dist: python-a2s>=1.3.0

{nonebot_plugin_l4d2_server-0.6.5.dist-info → nonebot_plugin_l4d2_server-0.6.6.dist-info}/RECORD

@@ -1,7 +1,7 @@
-nonebot_plugin_l4d2_server-0.6.5.dist-info/METADATA,sha256=K22vGduAT7t6ioVgQUqNPadMYICyUlgfVT0pqWSjB_A,7938
-nonebot_plugin_l4d2_server-0.6.5.dist-info/WHEEL,sha256=C8f_gqhOWmHrh81n3Ukx5iURrqMhsHla81fuY1yuwvs,90
-nonebot_plugin_l4d2_server-0.6.5.dist-info/licenses/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
-nonebot_plugin_l4d2_server/__init__.py,sha256=7Ldl4rwKbvwOxlV-ltjldhhPzSYFgXrxjIvr5qrky_g,4816
+nonebot_plugin_l4d2_server-0.6.6.dist-info/METADATA,sha256=hOWgsfeQPRxxcSqhh8li9UNBlSZG0iZCQf2wwtCMyME,7938
+nonebot_plugin_l4d2_server-0.6.6.dist-info/WHEEL,sha256=N2J68yzZqJh3mI_Wg92rwhw0rtJDFpZj9bwQIMJgaVg,90
+nonebot_plugin_l4d2_server-0.6.6.dist-info/licenses/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
+nonebot_plugin_l4d2_server/__init__.py,sha256=DH9_eqAVxmEZicQPcmvkBVXjRSl2oI80SYMaAjv8XP4,4814
 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
@@ -28,20 +28,20 @@ nonebot_plugin_l4d2_server/l4d2_data/config.py,sha256=j_Iq2fmJkCX9G-oscuibhCvozF
 nonebot_plugin_l4d2_server/l4d2_data/database.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 nonebot_plugin_l4d2_server/l4d2_data/players.py,sha256=0c4OAEKC38ZBTcbvI-lBl2D0wRUqwm0Spccmi4KlhqQ,3368
 nonebot_plugin_l4d2_server/l4d2_data/serverip.py,sha256=YnzPwjQaESgOQq8m_aJxZlhwTqzVbwPHD6-EWoIXq60,1293
-nonebot_plugin_l4d2_server/l4d2_file/__init__.py,sha256=WoIWxH4l3JVGuhCzEyv_vAvPOTQmZcS_D6Tx8JYrrkY,7181
+nonebot_plugin_l4d2_server/l4d2_file/__init__.py,sha256=CnkhLLELWxj9VUeQx8xB_KehyyfB_c9UgyEAeE_54b4,7177
 nonebot_plugin_l4d2_server/l4d2_file/ayromote.py,sha256=CND4LSKEYO86bSrd6_TGe9A5RvVJpy2_--tX9mROHIM,1868
 nonebot_plugin_l4d2_server/l4d2_file/input_json.py,sha256=_S7NIUZhZlE63ueETnPyVcZMnBAAwIVZdmW3VBukccY,2347
 nonebot_plugin_l4d2_server/l4d2_file/remote.py,sha256=vzW1RhqAUi7lMLjeoYOUvy_70NVHgGQS07oPkeWNxgk,3074
-nonebot_plugin_l4d2_server/l4d2_file/utils.py,sha256=wYNYLqHDS6h5uEqdqpOlNXu-JKjCoEDAK2wNz5irdfg,3056
-nonebot_plugin_l4d2_server/l4d2_image/__init__.py,sha256=ib2nzMdXzVJ9N3fDuwGdslS2jSwDS1XWU8biJHRMJ1g,4484
+nonebot_plugin_l4d2_server/l4d2_file/utils.py,sha256=-L_upM6cmVh5GhLyL1NneyEW_ewNOmnT2lcliRAAqe0,3050
+nonebot_plugin_l4d2_server/l4d2_image/__init__.py,sha256=Y2y1Viy3mbgV8JA8vHHM23Z7Oaxx5-TVudC1ONzf_a0,4545
 nonebot_plugin_l4d2_server/l4d2_image/download.py,sha256=_ndH2KlehQ5L84hX0b3Lqz0GYQhAWXGy6XJZZODcGqM,4248
 nonebot_plugin_l4d2_server/l4d2_image/htmlimg.py,sha256=7nVaLI89e8UXehCfBrxumYMj2wIR1V8UWRDueQW-lhQ,664
-nonebot_plugin_l4d2_server/l4d2_image/images.py,sha256=jZwwerx2oPDZ40VTYhWgMz5nUoRibOkyZFzSL9b4giE,2801
+nonebot_plugin_l4d2_server/l4d2_image/images.py,sha256=wqtAuMfKPvFsgsvIGFYNsES2r1iCs5-yL0_zJo7PFjs,2785
 nonebot_plugin_l4d2_server/l4d2_image/one.py,sha256=8rZ5GD-F3mp_tXVsbPRoFV4xFiSVDMxMYV2GsAc6TUI,1142
 nonebot_plugin_l4d2_server/l4d2_image/send_image_tool.py,sha256=0qcce0wOI7liuwjsbUPbFhfMXG06hkrpoSpGlCbl3j4,922
 nonebot_plugin_l4d2_server/l4d2_image/steam.py,sha256=4c428t9bkRxig4Hmj4XllaoKCSsY6fpIYIkq1DhHUiE,2203
 nonebot_plugin_l4d2_server/l4d2_image/vtfs.py,sha256=AltoUKpMzWQHY_PSqmlSHQyomk2dZHHML4YN6rnP1s0,1415
-nonebot_plugin_l4d2_server/l4d2_push/__init__.py,sha256=0kZSbYTBbSUInDdTyOoev0214IPC_KIvo0NaF2ahAPw,7694
+nonebot_plugin_l4d2_server/l4d2_push/__init__.py,sha256=trCYaSVr6im6ggQk5gedZJ3kZiOGs5UO8V7fl-pYfs0,7686
 nonebot_plugin_l4d2_server/l4d2_queries/__init__.py,sha256=BK5Rqf4gDCcEkpHPtIVQeLz-PtSW09HBsG8WFsHqNuE,10312
 nonebot_plugin_l4d2_server/l4d2_queries/himi.py,sha256=iu34wD6P7yWXK_WtErpqmSlNLUjq2pwqO_wf_Rd3X8c,3547
 nonebot_plugin_l4d2_server/l4d2_queries/local_ip.py,sha256=-wPvCx8mzl7KVh_OlC3j_EjYMf5IEIeLYkZNnknxITY,1281
@@ -52,19 +52,19 @@ nonebot_plugin_l4d2_server/l4d2_server/__init__.py,sha256=azvqgmH-SY2_AESIl8Uta9
 nonebot_plugin_l4d2_server/l4d2_server/index.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 nonebot_plugin_l4d2_server/l4d2_server/rcon.py,sha256=1vz1CAZg0atqIk45d18273ubFd8rm8Y2iW2SK0F8s20,1669
 nonebot_plugin_l4d2_server/l4d2_server/workshop.py,sha256=m-ZdzYGOWOIxK_cSPAJ8tTr9NA16KpsQgauQt0PTs-g,2846
-nonebot_plugin_l4d2_server/l4d2_update/__init__.py,sha256=M8KTxo250GQ-3CZw3fSmgfsOIxCe4tHkIyzmtGnD3uk,4029
+nonebot_plugin_l4d2_server/l4d2_update/__init__.py,sha256=F--dU5arxQztldaH6pr5e-js5UYVksTk9i9mRq3VYGc,4043
 nonebot_plugin_l4d2_server/l4d2_update/draw_update_log.py,sha256=-Tkn2GBIrDskHbwgAtrh05HflqX32z79vGjIBjR1GQo,1186
 nonebot_plugin_l4d2_server/l4d2_update/restart.py,sha256=R4tSNgvbqtKCRTVdp41td2mkBNV96I35PfSetm9o5YU,2181
 nonebot_plugin_l4d2_server/l4d2_update/update.py,sha256=h_YPzWWO6LY5v-m0Yg6fVUhHCvv4qOsdyk6vmotZETA,1465
 nonebot_plugin_l4d2_server/l4d2_utils/classcal.py,sha256=WqI1pHnTdrgjQ_9YULhaFhERkUYZ-WhtvKBHHaT6_Sg,1226
 nonebot_plugin_l4d2_server/l4d2_utils/command.py,sha256=cCflT3o5hvE4k56Bbg2TtY5avyEM-Z8nY9GNU3KtoXo,629
-nonebot_plugin_l4d2_server/l4d2_utils/config.py,sha256=XOLqjl2EzWt-SwI4MZc-v5_JngINPUByox7isGIouzQ,6188
+nonebot_plugin_l4d2_server/l4d2_utils/config.py,sha256=4fz-VqAFLEIZw9O-08f52MzVqqzS_WIV2XIOno5Gw4w,6282
 nonebot_plugin_l4d2_server/l4d2_utils/message.py,sha256=VzLtK9iPjJHPS1I7cmEIBCxiCivH0xaoBX-S_S9izZY,1631
 nonebot_plugin_l4d2_server/l4d2_utils/rule.py,sha256=A_lC5i8hiQEZiTcCW_Pn2sldwuD5Pz3UdMHiozFqunc,1007
 nonebot_plugin_l4d2_server/l4d2_utils/seach.py,sha256=ZAhwvS_xxSYg8AXIaRQTp9HzdAnSy2tHhxXrhR_YytQ,1230
 nonebot_plugin_l4d2_server/l4d2_utils/txt_to_img.py,sha256=GNbveJi5sFlyqIpcBjHmyib2_of2kBs7lfq0VqLT83w,794
 nonebot_plugin_l4d2_server/l4d2_utils/utils.py,sha256=S1MYcfD38Fcvz4y1jEuoKWhc5LYYT-Skk2K7iVCr7P0,5898
 nonebot_plugin_l4d2_server/l4d2_web/web.py,sha256=YvEMxG0nDrjbm4-IK9GkZlV7MPF9Nedc3goCnCUk_LA,9799
-nonebot_plugin_l4d2_server/l4d2_web/webUI.py,sha256=1StBuG-crEli4M8AbPY4pd_zZi48veiZbeYO0KkOIh8,16217
+nonebot_plugin_l4d2_server/l4d2_web/webUI.py,sha256=sk0rcF3EnwLr2yTvLAu-BKmAixZTLLPZ1vvE54ym1tc,16345
 nonebot_plugin_l4d2_server/l4d2_web/webUI_s.py,sha256=Y8PxkarJPsF9OvUVWCJ3SyhWYlYU5VQNnRGKG72KwFc,3339
-nonebot_plugin_l4d2_server-0.6.5.dist-info/RECORD,,
+nonebot_plugin_l4d2_server-0.6.6.dist-info/RECORD,,

{nonebot_plugin_l4d2_server-0.6.5.dist-info → nonebot_plugin_l4d2_server-0.6.6.dist-info}/WHEEL

@@ -1,4 +1,4 @@
 Wheel-Version: 1.0
-Generator: pdm-backend (2.1.7)
+Generator: pdm-backend (2.1.8)
 Root-Is-Purelib: true
 Tag: py3-none-any