From 574c950afbc5e4e81d78516e09beb6e2097b2248 Mon Sep 17 00:00:00 2001 From: felinae98 <731499577@qq.com> Date: Fri, 26 Feb 2021 20:47:58 +0800 Subject: [PATCH] update to 0.2.5, suport windows --- pyproject.toml | 2 +- src/plugins/nonebot_hk_reporter/utils.py | 18 +++++++++--------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/pyproject.toml b/pyproject.toml index 3d76c77..d5e1996 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,6 +1,6 @@ [tool.poetry] name = "nonebot-hk-reporter" -version = "0.2.4" +version = "0.2.5" description = "Subscribe message from social medias" authors = ["felinae98 "] license = "MIT" diff --git a/src/plugins/nonebot_hk_reporter/utils.py b/src/plugins/nonebot_hk_reporter/utils.py index b43329d..4fbcfd9 100644 --- a/src/plugins/nonebot_hk_reporter/utils.py +++ b/src/plugins/nonebot_hk_reporter/utils.py @@ -5,6 +5,7 @@ import nonebot from nonebot import logger import base64 from pyppeteer import launch +from pyppeteer.chromium_downloader import check_chromium, download_chromium from html import escape from hashlib import sha256 from tempfile import NamedTemporaryFile @@ -20,6 +21,10 @@ class Singleton(type): supported_target_type = ('weibo', 'bilibili', 'rss') +if not plugin_config.hk_reporter_use_local and not check_chromium(): + os.environ['PYPPETEER_DOWNLOAD_HOST'] = 'http://npm.taobao.org/mirrors' + download_chromium() + class Render(metaclass=Singleton): def __init__(self): @@ -62,15 +67,10 @@ class Render(metaclass=Singleton): # logger.debug(code) return code -async def parse_text(text: str): +async def parse_text(text: str) -> str: + 'return raw text if don\'t use pic, otherwise return rendered opcode' if plugin_config.hk_reporter_use_pic: - r = Render() - return await r.text_to_pic_cqcode(text) + render = Render() + return await render.text_to_pic_cqcode(text) else: return text - -async def test(): - ren = Render() - res = await ren.text_to_pic('12333333') - logger.debug(res) -nonebot.get_driver().on_startup(test)