PaiGramTeam/PamGram
3
0
Fork 0
mirror of https://github.com/PaiGramTeam/PamGram.git synced 2024-09-28 11:47:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

⚡️ 提升性能

Browse Source 
异步并发下载素材
This commit is contained in:
Karako 2022-09-21 00:32:49 +08:00
parent 6f16002faf
commit 28b3c4dd9a
No known key found for this signature in database
GPG Key ID: 5920831B0095D4A0
2 changed files with 37 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
core/assets/service.py
View File

@ -45,17 +45,25 @@ class _AssetsService(ABC):
async def _download(self, url: StrOrURL, path: Path, retry: int = 5) -> Optional[Path]:
import asyncio
for _ in range(retry):
try:
response = await self._client.get(url, follow_redirects=False)
except (HTTPError, SSLZeroReturnError):
await asyncio.sleep(1)
continue
if response.status_code != 200:
return None
async with async_open(path, 'wb') as file:
await file.write(response.content)
return path
async def _task():
logger.debug(f"正在从 {url} 下载图标至 {path}")
for _ in range(retry):
try:
response = await self._client.get(url, follow_redirects=False)
except (HTTPError, SSLZeroReturnError):
await asyncio.sleep(1)
continue
if response.status_code != 200:
return None
async with async_open(path, 'wb') as file:
await file.write(response.content)
return path
task = asyncio.create_task(_task())
while not task.done():
await asyncio.sleep(0)
return task.result()
@abstractmethod
async def icon(self) -> Path:

25
plugins/genshin/daily/material.py
View File

@ -183,6 +183,7 @@ class DailyMaterial(Plugin, BasePlugin):
return
notice = await update.message.reply_text("派蒙可能需要找找图标素材，还请耐心等待哦~")
self._add_delete_message_job(context, notice.chat_id, notice.message_id, 5)
await update.message.reply_chat_action(ChatAction.TYPING)
# 获取已经缓存的秘境素材信息
@ -233,12 +234,22 @@ class DailyMaterial(Plugin, BasePlugin):
setattr(render_data, type_, areas)
await update.message.reply_chat_action(ChatAction.TYPING)
character_img_data = await self.template_service.render( # 渲染角色素材页
'genshin/daily_material', 'character.html', {'data': render_data}, {'width': 1164, 'height': 500}
)
weapon_img_data = await self.template_service.render( # 渲染武器素材页
'genshin/daily_material', 'weapon.html', {'data': render_data}, {'width': 1164, 'height': 500}
)
render_tasks = [
asyncio.create_task(
self.template_service.render( # 渲染角色素材页
'genshin/daily_material', 'character.html', {'data': render_data}, {'width': 1164, 'height': 500}
)
),
asyncio.create_task(
self.template_service.render( # 渲染武器素材页
'genshin/daily_material', 'weapon.html', {'data': render_data}, {'width': 1164, 'height': 500}
)
)]
while not all(map(lambda x: x.done(), render_tasks)):
await asyncio.sleep(0)
character_img_data, weapon_img_data = tuple(map(lambda x: x.result(), render_tasks))
await update.message.reply_chat_action(ChatAction.UPLOAD_PHOTO)
if full: # 是否发送原图
@ -250,7 +261,7 @@ class DailyMaterial(Plugin, BasePlugin):
await update.message.reply_media_group(
[InputMediaPhoto(character_img_data), InputMediaPhoto(weapon_img_data)]
)
await notice.delete()
logger.debug("角色、武器培养素材图发送成功")
@handler.command('refresh_daily_material', block=False)
@bot_admins_rights_check