update 0.0.6.5

This commit is contained in:
HibiKi
2021-12-01 14:03:34 +08:00
parent 8c4b515093
commit 2a1a2ee8c5
42 changed files with 515 additions and 254 deletions
+5 -1
View File
@@ -8,7 +8,9 @@ from asyncio.exceptions import TimeoutError
from nonebot.adapters.cqhttp import MessageSegment
from playwright.async_api import Page
from .message_builder import image
from httpx import ConnectTimeout
from .browser import get_browser
from retrying import retry
import asyncio
import aiofiles
import httpx
@@ -19,6 +21,7 @@ class AsyncHttpx:
proxy = {"http://": get_local_proxy()}
@classmethod
@retry(stop_max_attempt_number=3)
async def get(
cls,
url: str,
@@ -149,7 +152,7 @@ class AsyncHttpx:
await wf.write(content)
logger.info(f"下载图片 {url} 成功.. Path:{path.absolute()}")
return True
except TimeoutError:
except (TimeoutError, ConnectTimeout):
pass
else:
logger.error(f"下载图片 {url} 下载超时.. Path:{path.absolute()}")
@@ -312,6 +315,7 @@ class AsyncPlaywright:
return image(path)
except Exception as e:
logger.warning(f"Playwright 截图 url:{url} element:{element} 发生错误 {type(e)}:{e}")
finally:
if page:
await page.close()
return None
-4
View File
@@ -13,10 +13,7 @@ from .admin_manager import AdminManager
from .none_plugin_count_manager import NonePluginCountManager
from .requests_manager import RequestManager
from configs.path_config import DATA_PATH
from nonebot import Driver
import nonebot
driver: Driver = nonebot.get_driver()
# 群功能开关 | 群被动技能 | 群权限 管理
group_manager: Optional[GroupManager] = GroupManager(
@@ -69,4 +66,3 @@ requests_manager: Optional[RequestManager] = RequestManager(
# 管理员命令管理器
admin_manager = AdminManager()
-1
View File
@@ -299,4 +299,3 @@ class GroupManager(StaticData):
del self._data["super"]["close_plugins"]
return _x
return None