nonebot-plugin-parser 2.2.4__tar.gz → 2.3.0__tar.gz

{nonebot_plugin_parser-2.2.4 → nonebot_plugin_parser-2.3.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: nonebot-plugin-parser
-Version: 2.2.4
+Version: 2.3.0
 Summary: NoneBot2 链接分享解析 Alconna 版, 通用媒体卡片渲染(PIL 实现), 支持 B站/抖音/快手/微博/小红书/youtube/tiktok/twitter/acfun/nga
 Keywords: acfun,bilibili,douyin,kuaishou,nga,nonebot,nonebot2,tiktok,twitter,video,weibo,xiaohongshu,youtube
 Author: fllesser
@@ -21,12 +21,12 @@ Classifier: Topic :: Internet :: WWW/HTTP
 Classifier: Topic :: Multimedia :: Video
 Requires-Dist: nonebot2>=2.4.3,<3.0.0
 Requires-Dist: pillow>=11.0.0
-Requires-Dist: pilmoji-for-parser>=0.1.3
 Requires-Dist: tqdm>=4.67.1,<5.0.0
 Requires-Dist: aiofiles>=25.1.0
 Requires-Dist: curl-cffi>=0.13.0,<1.0.0
 Requires-Dist: httpx>=0.27.2,<1.0.0
 Requires-Dist: msgspec>=0.20.0,<1.0.0
+Requires-Dist: apilmoji[tqdm]>=0.1.2,<1.0.0
 Requires-Dist: beautifulsoup4>=4.12.0,<5.0.0
 Requires-Dist: bilibili-api-python>=17.4.0,<18.0.0
 Requires-Dist: nonebot-plugin-alconna>=0.59.4,<1.0.0
@@ -258,6 +258,10 @@ parser_custom_font="LXGWZhenKaiGB-Regular.ttf"
 # [可选] 是否需要转发媒体内容(超过 4 项时始终使用合并转发)
 parser_need_forward_contents=True
 
+# [可选] emoji 渲染 CDN
+# 例如 ELK_SH_CDN = "https://emojicdn.elk.sh", MQRIO_DEV_CDN = "https://emoji-cdn.mqrio.dev"
+parser_emoji_cdn="https://emojicdn.elk.sh"
+
 # [可选] emoji 渲染样式 "apple", "google", "twitter", "facebook"(默认)
 parser_emoji_style="facebook"
 ```

{nonebot_plugin_parser-2.2.4 → nonebot_plugin_parser-2.3.0}/README.md

@@ -210,6 +210,10 @@ parser_custom_font="LXGWZhenKaiGB-Regular.ttf"
 # [可选] 是否需要转发媒体内容(超过 4 项时始终使用合并转发)
 parser_need_forward_contents=True
 
+# [可选] emoji 渲染 CDN
+# 例如 ELK_SH_CDN = "https://emojicdn.elk.sh", MQRIO_DEV_CDN = "https://emoji-cdn.mqrio.dev"
+parser_emoji_cdn="https://emojicdn.elk.sh"
+
 # [可选] emoji 渲染样式 "apple", "google", "twitter", "facebook"(默认)
 parser_emoji_style="facebook"
 ```

{nonebot_plugin_parser-2.2.4 → nonebot_plugin_parser-2.3.0}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "nonebot-plugin-parser"
-version = "2.2.4"
+version = "2.3.0"
 description = "NoneBot2 链接分享解析 Alconna 版, 通用媒体卡片渲染(PIL 实现), 支持 B站/抖音/快手/微博/小红书/youtube/tiktok/twitter/acfun/nga"
 readme = "README.md"
 requires-python = ">=3.10"
@@ -41,12 +41,12 @@ classifiers = [
 dependencies = [
   "nonebot2>=2.4.3,<3.0.0",
   "pillow>=11.0.0",
-  "pilmoji-for-parser>=0.1.3",
   "tqdm>=4.67.1,<5.0.0",
   "aiofiles>=25.1.0",
   "curl_cffi>=0.13.0,<1.0.0",
   "httpx>=0.27.2,<1.0.0",
   "msgspec>=0.20.0,<1.0.0",
+  "apilmoji[tqdm]>=0.1.2,<1.0.0",
   "beautifulsoup4>=4.12.0,<5.0.0",
   "bilibili-api-python>=17.4.0,<18.0.0",
   "nonebot-plugin-alconna>=0.59.4,<1.0.0",
@@ -105,12 +105,12 @@ conflicts = [
 ]
 
 [tool.uv.sources]
-nonebug = { git = "https://github.com/fllesser/nonebug", rev = "dev/migrate-uv" }
+nonebug = { git = "https://github.com/nonebot/nonebug" }
 
 [tool.bumpversion]
 tag = true
 commit = true
-current_version = "2.2.4"
+current_version = "2.3.0"
 message = "release: bump vesion from {current_version} to {new_version}"
 
 [[tool.bumpversion.files]]
@@ -136,9 +136,9 @@ adapters = [
 plugins = ["nonebot_plugin_parser"]
 
 [tool.poe.tasks]
-test_others = "pytest tests/others --cov=src --cov-report=xml --junitxml=junit.xml -n auto"
-test_parsers = "pytest tests/parsers --cov=src --cov-report=xml --junitxml=junit.xml -n auto"
-test_render = "pytest tests/render --cov=src --cov-report=xml --junitxml=junit.xml"
+test-other = "pytest tests/others --cov=src --cov-report=xml --junitxml=junit.xml -n auto"
+test-parser = "pytest tests/parsers --cov=src --cov-report=xml --junitxml=junit.xml -n auto"
+test-render = "pytest tests/renders --cov=src --cov-report=xml --junitxml=junit.xml"
 bump = "bump-my-version bump"
 show-bump = "bump-my-version show-bump"
 

{nonebot_plugin_parser-2.2.4 → nonebot_plugin_parser-2.3.0}/src/nonebot_plugin_parser/config.py

@@ -2,7 +2,7 @@ from enum import Enum
 from pathlib import Path
 
 from nonebot import require, get_driver, get_plugin_config
-from pilmoji import EmojiStyle
+from apilmoji import ELK_SH_CDN, EmojiStyle
 from pydantic import BaseModel
 from bilibili_api.video import VideoCodecs, VideoQuality
 
@@ -56,6 +56,8 @@ class Config(BaseModel):
     """自定义字体"""
     parser_need_forward_contents: bool = True
     """是否需要转发媒体内容"""
+    parser_emoji_cdn: str = ELK_SH_CDN
+    """Pilmoji 表情 CDN"""
     parser_emoji_style: EmojiStyle = EmojiStyle.FACEBOOK
     """Pilmoji 表情样式"""
 
@@ -149,6 +151,11 @@ class Config(BaseModel):
         """是否需要转发媒体内容"""
         return self.parser_need_forward_contents
 
+    @property
+    def emoji_cdn(self) -> str:
+        """Pilmoji 表情 CDN"""
+        return self.parser_emoji_cdn
+
     @property
     def emoji_style(self) -> EmojiStyle:
         """Pilmoji 表情样式"""

{nonebot_plugin_parser-2.2.4 → nonebot_plugin_parser-2.3.0}/src/nonebot_plugin_parser/download/__init__.py

@@ -63,7 +63,7 @@ class StreamDownloader:
                     raise ZeroSizeException
 
                 if (file_size := content_length / 1024 / 1024) > pconfig.max_size:
-                    logger.warning(f"媒体 url: {url} 大小 {file_size:.2f} MB 超过 {{pconfig.max_size}} MB, 取消下载")
+                    logger.warning(f"媒体 url: {url} 大小 {file_size:.2f} MB 超过 {pconfig.max_size} MB, 取消下载")
                     raise SizeLimitException
 
                 with self.get_progress_bar(file_name, content_length) as bar:

{nonebot_plugin_parser-2.2.4 → nonebot_plugin_parser-2.3.0}/src/nonebot_plugin_parser/renders/common.py

@@ -8,7 +8,7 @@ from typing_extensions import override
 
 from PIL import Image, ImageDraw, ImageFont
 from nonebot import logger
-from pilmoji import Pilmoji, EmojiCDNSource
+from apilmoji import Apilmoji, EmojiCDNSource
 
 from .base import ParseResult, ImageRenderer
 from ..config import pconfig
@@ -299,9 +299,12 @@ class CommonRenderer(ImageRenderer):
     DEFAULT_VIDEO_BUTTON_PATH: ClassVar[Path] = RESOURCES_DIR / _BUTTON_FILENAME
     """默认视频按钮路径"""
     EMOJI_SOURCE: ClassVar[EmojiCDNSource] = EmojiCDNSource(
-        style=pconfig.emoji_style, cache_dir=pconfig.cache_dir / _EMOJIS
+        base_url=pconfig.emoji_cdn,
+        style=pconfig.emoji_style,
+        cache_dir=pconfig.cache_dir / _EMOJIS,
+        enable_tqdm=True,
     )
-    PILMOJI: ClassVar[Pilmoji] = Pilmoji(source=EMOJI_SOURCE)
+    """Emoji Source"""
 
     @classmethod
     def load_resources(cls):
@@ -346,13 +349,22 @@ class CommonRenderer(ImageRenderer):
     async def text(
         cls,
         ctx: RenderContext,
-        text: str,
         xy: tuple[int, int],
+        lines: list[str],
+        font: FontInfo,
         fill: Color,
-        font: ImageFont.FreeTypeFont,
-    ):
+    ) -> int:
         """绘制文本"""
-        await cls.PILMOJI.text(ctx.image, xy, text, fill=fill, font=font)
+        await Apilmoji.text(
+            ctx.image,
+            xy,
+            lines,
+            font.font,
+            fill=fill,
+            line_height=font.line_height,
+            source=cls.EMOJI_SOURCE,
+        )
+        return font.line_height * len(lines)
 
     @override
     async def render_image(self, result: ParseResult) -> bytes:
@@ -931,28 +943,24 @@ class CommonRenderer(ImageRenderer):
         text_y = text_start_y
 
         # 发布者名称（蓝色）
-        for line in section.name_lines:
-            await self.text(
-                ctx,
-                line,
-                (text_x, text_y),
-                self.HEADER_COLOR,
-                self.fontset.name_font.font,
-            )
-            text_y += self.fontset.name_font.line_height
+        text_y += await self.text(
+            ctx,
+            (text_x, text_y),
+            section.name_lines,
+            self.fontset.name_font,
+            fill=self.HEADER_COLOR,
+        )
 
         # 时间（灰色）
         if section.time_lines:
             text_y += self.NAME_TIME_GAP
-            for line in section.time_lines:
-                await self.text(
-                    ctx,
-                    line,
-                    (text_x, text_y),
-                    self.EXTRA_COLOR,
-                    self.fontset.extra_font.font,
-                )
-                text_y += self.fontset.extra_font.line_height
+            text_y += await self.text(
+                ctx,
+                (text_x, text_y),
+                section.time_lines,
+                self.fontset.extra_font,
+                fill=self.EXTRA_COLOR,
+            )
 
         # 在右侧绘制平台 logo（仅在非转发内容时绘制）
         if ctx.not_repost:
@@ -969,15 +977,14 @@ class CommonRenderer(ImageRenderer):
 
     async def _draw_title(self, ctx: RenderContext, lines: list[str]) -> None:
         """绘制标题"""
-        for line in lines:
-            await self.text(
-                ctx,
-                line,
-                (self.PADDING, ctx.y_pos),
-                self.TEXT_COLOR,
-                self.fontset.title_font.font,
-            )
-            ctx.y_pos += self.fontset.title_font.line_height
+        ctx.y_pos += await self.text(
+            ctx,
+            (self.PADDING, ctx.y_pos),
+            lines,
+            self.fontset.title_font,
+            self.TEXT_COLOR,
+        )
+
         ctx.y_pos += self.SECTION_SPACING
 
     def _draw_cover(self, ctx: RenderContext, cover_img: PILImage) -> None:
@@ -1000,30 +1007,26 @@ class CommonRenderer(ImageRenderer):
 
     async def _draw_text(self, ctx: RenderContext, lines: list[str]) -> None:
         """绘制文本内容"""
-        for line in lines:
-            await self.text(
-                ctx,
-                line,
-                (self.PADDING, ctx.y_pos),
-                self.TEXT_COLOR,
-                self.fontset.text_font.font,
-            )
-            ctx.y_pos += self.fontset.text_font.line_height
+        ctx.y_pos += await self.text(
+            ctx,
+            (self.PADDING, ctx.y_pos),
+            lines,
+            self.fontset.text_font,
+            fill=self.TEXT_COLOR,
+        )
         ctx.y_pos += self.SECTION_SPACING
 
     async def _draw_graphics(self, ctx: RenderContext, section: GraphicsSectionData) -> None:
         """绘制图文内容"""
         # 绘制文本内容（如果有）
         if section.text_lines:
-            for line in section.text_lines:
-                await self.text(
-                    ctx,
-                    line,
-                    (self.PADDING, ctx.y_pos),
-                    self.TEXT_COLOR,
-                    self.fontset.text_font.font,
-                )
-                ctx.y_pos += self.fontset.text_font.line_height
+            ctx.y_pos += await self.text(
+                ctx,
+                (self.PADDING, ctx.y_pos),
+                section.text_lines,
+                self.fontset.text_font,
+                fill=self.TEXT_COLOR,
+            )
             ctx.y_pos += self.SECTION_SPACING  # 文本和图片之间的间距
 
         # 绘制图片（居中）
@@ -1038,28 +1041,25 @@ class CommonRenderer(ImageRenderer):
             extra_font_info = self.fontset.extra_font
             text_width = extra_font_info.get_text_width(section.alt_text)
             text_x = self.PADDING + (ctx.content_width - text_width) // 2
-            await self.text(
+            ctx.y_pos += await self.text(
                 ctx,
-                section.alt_text,
                 (text_x, ctx.y_pos),
-                self.EXTRA_COLOR,
-                extra_font_info.font,
+                [section.alt_text],
+                self.fontset.extra_font,
+                fill=self.EXTRA_COLOR,
             )
-            ctx.y_pos += extra_font_info.line_height
 
         ctx.y_pos += self.SECTION_SPACING
 
     async def _draw_extra(self, ctx: RenderContext, lines: list[str]) -> None:
         """绘制额外信息"""
-        for line in lines:
-            await self.text(
-                ctx,
-                line,
-                (self.PADDING, ctx.y_pos),
-                self.EXTRA_COLOR,
-                self.fontset.extra_font.font,
-            )
-            ctx.y_pos += self.fontset.extra_font.line_height
+        ctx.y_pos += await self.text(
+            ctx,
+            (self.PADDING, ctx.y_pos),
+            lines,
+            self.fontset.extra_font,
+            fill=self.EXTRA_COLOR,
+        )
 
     def _draw_repost(self, ctx: RenderContext, section: RepostSectionData) -> None:
         """绘制转发内容"""
@@ -1273,8 +1273,8 @@ class CommonRenderer(ImageRenderer):
         if not text:
             return []
 
-        lines = []
-        paragraphs = text.split("\n")
+        lines: list[str] = []
+        paragraphs = text.splitlines()
 
         def is_punctuation(char: str) -> bool:
             """判断是否为不能为行首的标点符号"""