diff --git a/dota.py b/dota.py index 03e6693..4d88424 100644 --- a/dota.py +++ b/dota.py @@ -6,6 +6,7 @@ import json import players import utils from image_generator import ImageGenerator +import asyncio db = peewee.SqliteDatabase('dota.db') hero_client = opendota.HeroesApi() @@ -178,11 +179,12 @@ class Friend(BaseModel): }) # 生成图片报告 + image_url = None try: - image_url = image_generator.generate_recent_matches_image(name, matches[:limit]) + # 使用asyncio运行异步函数 + image_url = asyncio.run(image_generator.generate_recent_matches_image(name, matches[:limit])) except Exception as e: - logger.error(f"生成最近比赛报告图片失败: {str(e)}") - image_url = None + logger.error(f"生成最近比赛报告图片失败: {str(e)}") # 如果成功生成了图片,添加到第一个embed中 if image_url: @@ -319,11 +321,12 @@ def serialize_match_for_discord(match_): dire_indicator = ' 🌟' # 生成比赛报告图片 + image_url = None try: - image_url = image_generator.generate_match_report(match_) + # 使用asyncio运行异步函数 + image_url = asyncio.run(image_generator.generate_match_report(match_)) except Exception as e: logger.error(f"生成比赛报告图片失败: {str(e)}") - image_url = None data = { "content": content, diff --git a/image_generator.py b/image_generator.py index ae22100..624f934 100644 --- a/image_generator.py +++ b/image_generator.py @@ -1,9 +1,10 @@ -from playwright.sync_api import sync_playwright +from playwright.async_api import async_playwright from jinja2 import Environment, FileSystemLoader import utils import json import os import datetime +from loguru import logger class ImageGenerator: @@ -20,7 +21,7 @@ class ImageGenerator: return f"https://cdn.cloudflare.steamstatic.com{hero_info['img']}" return None - def generate_match_report(self, match_data): + async def generate_match_report(self, match_data): """ 根据match_data生成比赛报告图片 match_data应该是dota.py中serialize_match方法返回的格式 @@ -112,30 +113,38 @@ class ImageGenerator: html_content = template.render(**template_data) # 使用Playwright生成图片 - with sync_playwright() as playwright: - browser = playwright.chromium.launch() - page = browser.new_page() - page.set_content(html_content) - page.set_viewport_size({"width": 800, "height": 800}) + async with async_playwright() as playwright: + browser = await playwright.chromium.launch() + page = await browser.new_page() + await page.set_content(html_content) + await page.set_viewport_size({"width": 800, "height": 800}) # 等待内容完全加载 - page.wait_for_timeout(1000) + await page.wait_for_timeout(1000) # 调整截图高度以适应内容 - body_height = page.evaluate('document.body.scrollHeight') - body_width = page.evaluate('document.body.offsetWidth') - page.set_viewport_size({"width": body_width, "height": body_height}) + body_height = await page.evaluate('document.body.scrollHeight') + body_width = await page.evaluate('document.body.offsetWidth') + await page.set_viewport_size({"width": body_width, "height": body_height}) # 截图 - image_path = "match_report_%s.png" % match_data.get('match_id') - page.screenshot(path=image_path, full_page=True) - browser.close() - image_url = utils.upload_image(image_path, image_path) - os.remove(image_path) + image_path = f"match_report_{match_data.get('match_id')}.png" + await page.screenshot(path=image_path, full_page=True) + await browser.close() + + # 上传图片 + image_url = utils.upload_image(image_path) + + # 删除本地文件 + try: + os.remove(image_path) + except Exception as e: + logger.warning(f"删除本地图片文件失败: {str(e)}") + return image_url return None - def generate_recent_matches_image(self, player_name, matches): + async def generate_recent_matches_image(self, player_name, matches): """ 生成玩家最近比赛的图片报告 @@ -187,30 +196,33 @@ class ImageGenerator: ) # 使用Playwright生成图片 - with sync_playwright() as playwright: - browser = playwright.chromium.launch() - page = browser.new_page() - page.set_content(html_content) - page.set_viewport_size({"width": 800, "height": 800}) + async with async_playwright() as playwright: + browser = await playwright.chromium.launch() + page = await browser.new_page() + await page.set_content(html_content) + await page.set_viewport_size({"width": 800, "height": 800}) # 等待内容完全加载 - page.wait_for_timeout(1000) + await page.wait_for_timeout(1000) # 调整截图高度以适应内容 - body_height = page.evaluate('document.body.scrollHeight') - body_width = page.evaluate('document.body.offsetWidth') - page.set_viewport_size({"width": body_width, "height": body_height}) + body_height = await page.evaluate('document.body.scrollHeight') + body_width = await page.evaluate('document.body.offsetWidth') + await page.set_viewport_size({"width": body_width, "height": body_height}) # 截图 image_path = f"recent_matches_{player_name.replace(' ', '_')}_{datetime.datetime.now().strftime('%Y%m%d%H%M%S')}.png" - page.screenshot(path=image_path, full_page=True) - browser.close() + await page.screenshot(path=image_path, full_page=True) + await browser.close() # 上传图片 image_url = utils.upload_image(image_path) # 删除本地文件 - os.remove(image_path) + try: + os.remove(image_path) + except Exception as e: + logger.warning(f"删除本地图片文件失败: {str(e)}") return image_url \ No newline at end of file