♻️ 重构模板截图部分以解决导航导致的报错 (#553)

* ♻️ 把 path 放到数据模型里

* ♻️ 使用通用函数来生成模板图片

* 🎨 同步模板项目结构

* 🐛 修正导入路径

nonebot_plugin_tetris_stats/games/tetrio/rank/all.py

@@ -9,16 +9,14 @@ from sqlalchemy import select
 from sqlalchemy.orm import selectinload
 
 from ....db import trigger
-from ....utils.host import HostPage, get_self_netloc
 from ....utils.lang import get_lang
 from ....utils.metrics import get_metrics
-from ....utils.render import render
+from ....utils.render import render_image
 from ....utils.render.schemas.v1.tetrio.rank import Data as DataV1
 from ....utils.render.schemas.v1.tetrio.rank import ItemData as ItemDataV1
 from ....utils.render.schemas.v2.tetrio.rank import AverageData as AverageDataV2
 from ....utils.render.schemas.v2.tetrio.rank import Data as DataV2
 from ....utils.render.schemas.v2.tetrio.rank import ItemData as ItemDataV2
-from ....utils.screenshot import screenshot
 from .. import alc
 from ..constant import GAME_TYPE
 from ..models import TETRIOLeagueStats
@@ -94,49 +92,41 @@ async def _(event_session: Uninfo, template: Template | None = None):
 
 
 async def make_image_v1(latest_data: TETRIOLeagueStats, compare_data: TETRIOLeagueStats) -> bytes:
-    async with HostPage(
-        await render(
-            'v1/tetrio/rank',
-            DataV1(
-                items={
-                    i[0].rank: ItemDataV1(
-                        trending=round(i[0].tr_line - i[1].tr_line, 2),
-                        require_tr=round(i[0].tr_line, 2),
-                        players=i[0].player_count,
-                    )
-                    for i in zip(latest_data.fields, compare_data.fields, strict=True)
-                },
-                updated_at=latest_data.update_time,
-                lang=get_lang(),
-            ),
-        )
-    ) as page_hash:
-        return await screenshot(f'http://{get_self_netloc()}/host/{page_hash}.html')
+    return await render_image(
+        DataV1(
+            items={
+                i[0].rank: ItemDataV1(
+                    trending=round(i[0].tr_line - i[1].tr_line, 2),
+                    require_tr=round(i[0].tr_line, 2),
+                    players=i[0].player_count,
+                )
+                for i in zip(latest_data.fields, compare_data.fields, strict=True)
+            },
+            updated_at=latest_data.update_time,
+            lang=get_lang(),
+        ),
+    )
 
 
 async def make_image_v2(latest_data: TETRIOLeagueStats, compare_data: TETRIOLeagueStats) -> bytes:
-    async with HostPage(
-        await render(
-            'v2/tetrio/rank',
-            DataV2(
-                items={
-                    i[0].rank: ItemDataV2(
-                        require_tr=round(i[0].tr_line, 2),
-                        trending=round(i[0].tr_line - i[1].tr_line, 2),
-                        average_data=AverageDataV2(
-                            pps=(metrics := get_metrics(pps=i[0].avg_pps, apm=i[0].avg_apm, vs=i[0].avg_vs)).pps,
-                            apm=metrics.apm,
-                            apl=metrics.apl,
-                            vs=metrics.vs,
-                            adpl=metrics.adpl,
-                        ),
-                        players=i[0].player_count,
-                    )
-                    for i in zip(latest_data.fields, compare_data.fields, strict=True)
-                },
-                updated_at=latest_data.update_time,
-                lang=get_lang(),
-            ),
-        )
-    ) as page_hash:
-        return await screenshot(f'http://{get_self_netloc()}/host/{page_hash}.html')
+    return await render_image(
+        DataV2(
+            items={
+                i[0].rank: ItemDataV2(
+                    require_tr=round(i[0].tr_line, 2),
+                    trending=round(i[0].tr_line - i[1].tr_line, 2),
+                    average_data=AverageDataV2(
+                        pps=(metrics := get_metrics(pps=i[0].avg_pps, apm=i[0].avg_apm, vs=i[0].avg_vs)).pps,
+                        apm=metrics.apm,
+                        apl=metrics.apl,
+                        vs=metrics.vs,
+                        adpl=metrics.adpl,
+                    ),
+                    players=i[0].player_count,
+                )
+                for i in zip(latest_data.fields, compare_data.fields, strict=True)
+            },
+            updated_at=latest_data.update_time,
+            lang=get_lang(),
+        ),
+    )

nonebot_plugin_tetris_stats/games/tetrio/rank/detail.py

@@ -11,12 +11,10 @@ from sqlalchemy import select
 from sqlalchemy.orm import selectinload
 
 from ....db import trigger
-from ....utils.host import HostPage, get_self_netloc
 from ....utils.lang import get_lang
 from ....utils.metrics import get_metrics
-from ....utils.render import render
+from ....utils.render import render_image
 from ....utils.render.schemas.v2.tetrio.rank.detail import Data, SpecialData
-from ....utils.screenshot import screenshot
 from .. import alc
 from ..api.typedefs import ValidRank
 from ..constant import GAME_TYPE
@@ -114,40 +112,36 @@ async def make_image(rank: ValidRank, latest: TETRIOLeagueStats, compare: TETRIO
     max_vs = get_metrics(
         pps=latest_data.high_vs.league.pps, apm=latest_data.high_vs.league.apm, vs=latest_data.high_vs.league.vs
     )
-    async with HostPage(
-        await render(
-            'v2/tetrio/rank/detail',
-            Data(
-                name=latest_data.rank,
-                trending=round(latest_data.tr_line - compare_data.tr_line, 2),
-                require_tr=round(latest_data.tr_line, 2),
-                players=latest_data.player_count,
-                minimum_data=SpecialData(
-                    apm=low_apm.apm,
-                    pps=low_pps.pps,
-                    lpm=low_pps.lpm,
-                    vs=low_vs.vs,
-                    adpm=low_vs.adpm,
-                    apm_holder=latest_data.low_apm.username.upper(),
-                    pps_holder=latest_data.low_pps.username.upper(),
-                    vs_holder=latest_data.low_vs.username.upper(),
-                ),
-                average_data=SpecialData(
-                    apm=avg.apm, pps=avg.pps, lpm=avg.lpm, vs=avg.vs, adpm=avg.adpm, apl=avg.apl, adpl=avg.adpl
-                ),
-                maximum_data=SpecialData(
-                    apm=max_apm.apm,
-                    pps=max_pps.pps,
-                    lpm=max_pps.lpm,
-                    vs=max_vs.vs,
-                    adpm=max_vs.adpm,
-                    apm_holder=latest_data.high_apm.username.upper(),
-                    pps_holder=latest_data.high_pps.username.upper(),
-                    vs_holder=latest_data.high_vs.username.upper(),
-                ),
-                updated_at=latest.update_time.replace(tzinfo=UTC).astimezone(ZoneInfo('Asia/Shanghai')),
-                lang=get_lang(),
+    return await render_image(
+        Data(
+            name=latest_data.rank,
+            trending=round(latest_data.tr_line - compare_data.tr_line, 2),
+            require_tr=round(latest_data.tr_line, 2),
+            players=latest_data.player_count,
+            minimum_data=SpecialData(
+                apm=low_apm.apm,
+                pps=low_pps.pps,
+                lpm=low_pps.lpm,
+                vs=low_vs.vs,
+                adpm=low_vs.adpm,
+                apm_holder=latest_data.low_apm.username.upper(),
+                pps_holder=latest_data.low_pps.username.upper(),
+                vs_holder=latest_data.low_vs.username.upper(),
             ),
-        )
-    ) as page_hash:
-        return await screenshot(f'http://{get_self_netloc()}/host/{page_hash}.html')
+            average_data=SpecialData(
+                apm=avg.apm, pps=avg.pps, lpm=avg.lpm, vs=avg.vs, adpm=avg.adpm, apl=avg.apl, adpl=avg.adpl
+            ),
+            maximum_data=SpecialData(
+                apm=max_apm.apm,
+                pps=max_pps.pps,
+                lpm=max_pps.lpm,
+                vs=max_vs.vs,
+                adpm=max_vs.adpm,
+                apm_holder=latest_data.high_apm.username.upper(),
+                pps_holder=latest_data.high_pps.username.upper(),
+                vs_holder=latest_data.high_vs.username.upper(),
+            ),
+            updated_at=latest.update_time.replace(tzinfo=UTC).astimezone(ZoneInfo('Asia/Shanghai')),
+            lang=get_lang(),
+        ),
+    )