nonebot-plugin-parser 2.0.8__tar.gz → 2.0.10__tar.gz

{nonebot_plugin_parser-2.0.8 → nonebot_plugin_parser-2.0.10}/PKG-INFO

@@ -1,7 +1,7 @@
 Metadata-Version: 2.3
 Name: nonebot-plugin-parser
-Version: 2.0.8
-Summary: NoneBot2 链接分享解析器自动解析, BV号/链接/小程序/卡片 | B站/抖音/快手/微博/小红书/youtube/tiktok/twitter/acfun
+Version: 2.0.10
+Summary: NoneBot2 链接分享解析 Alconna 版, 通用媒体卡片渲染(PIL 实现), 支持 B站/抖音/快手/微博/小红书/youtube/tiktok/twitter/acfun/nga
 Keywords: nonebot,nonebot2,video,bilibili,youtube,tiktok,twitter,kuaishou,acfun,weibo,xiaohongshu,nga,douyin
 Author: fllesser
 Author-email: fllesser <fllessive@gmail.com>
@@ -19,7 +19,7 @@ Requires-Dist: nonebot-plugin-localstore>=0.7.4,<1.0.0
 Requires-Dist: nonebot-plugin-apscheduler>=0.5.0,<1.0.0
 Requires-Dist: nonebot-plugin-alconna>=0.59.4
 Requires-Dist: nonebot-plugin-uninfo>=0.9.0
-Requires-Dist: nonebot-plugin-htmlkit>=0.1.0rc1 ; extra == 'htmlkit'
+Requires-Dist: nonebot-plugin-htmlkit>=0.1.0rc3 ; extra == 'htmlkit'
 Requires-Dist: jinja2>=3.1.6 ; extra == 'htmlkit'
 Requires-Python: >=3.10
 Project-URL: IssueTracker, https://github.com/fllesser/nonebot-plugin-parser/issues
@@ -52,8 +52,6 @@ Description-Content-Type: text/markdown
 
 ## 📖 介绍
 
-[nonebot-plugin-resolver](https://github.com/zhiyu1998/nonebot-plugin-resolver) 重制版
-
 | 平台    | 触发的消息形态                        | 视频 | 图集 | 音频 |
 | ------- | ------------------------------------- | ---- | ---- | ---- |
 | B站     | BV号/链接(包含短链,BV,av)/卡片/小程序 | ✅​   | ✅​   | ✅​   |
@@ -69,7 +67,7 @@ Description-Content-Type: text/markdown
 支持的链接，可参考 [测试链接](https://github.com/fllesser/nonebot-plugin-parser/blob/master/test_url.md)
 
 ## 🎨 效果图
-
+插件默认启用 PIL 实现的通用媒体卡片渲染，效果图如下
 <div align="center">
 
 <img src="https://raw.githubusercontent.com/fllesser/nonebot-plugin-parser/refs/heads/resources/resources/renderdamine/video.png" width="160" />
@@ -82,7 +80,7 @@ Description-Content-Type: text/markdown
 
 ## 💿 安装
 > [!Warning]
-> **如果你已经在使用 nonebot-plugin-resolver，请在安装此插件前卸载**
+> **如果你已经在使用 nonebot-plugin-resolver[2]，请在安装此插件前卸载**
     
 <details open>
 <summary>使用 nb-cli 安装/更新</summary>

{nonebot_plugin_parser-2.0.8 → nonebot_plugin_parser-2.0.10}/README.md

@@ -22,8 +22,6 @@
 
 ## 📖 介绍
 
-[nonebot-plugin-resolver](https://github.com/zhiyu1998/nonebot-plugin-resolver) 重制版
-
 | 平台    | 触发的消息形态                        | 视频 | 图集 | 音频 |
 | ------- | ------------------------------------- | ---- | ---- | ---- |
 | B站     | BV号/链接(包含短链,BV,av)/卡片/小程序 | ✅​   | ✅​   | ✅​   |
@@ -39,7 +37,7 @@
 支持的链接，可参考 [测试链接](https://github.com/fllesser/nonebot-plugin-parser/blob/master/test_url.md)
 
 ## 🎨 效果图
-
+插件默认启用 PIL 实现的通用媒体卡片渲染，效果图如下
 <div align="center">
 
 <img src="https://raw.githubusercontent.com/fllesser/nonebot-plugin-parser/refs/heads/resources/resources/renderdamine/video.png" width="160" />
@@ -52,7 +50,7 @@
 
 ## 💿 安装
 > [!Warning]
-> **如果你已经在使用 nonebot-plugin-resolver，请在安装此插件前卸载**
+> **如果你已经在使用 nonebot-plugin-resolver[2]，请在安装此插件前卸载**
     
 <details open>
 <summary>使用 nb-cli 安装/更新</summary>

{nonebot_plugin_parser-2.0.8 → nonebot_plugin_parser-2.0.10}/pyproject.toml

@@ -1,7 +1,7 @@
 [project]
 name = "nonebot-plugin-parser"
-version = "2.0.8"
-description = "NoneBot2 链接分享解析器自动解析, BV号/链接/小程序/卡片 | B站/抖音/快手/微博/小红书/youtube/tiktok/twitter/acfun"
+version = "2.0.10"
+description = "NoneBot2 链接分享解析 Alconna 版, 通用媒体卡片渲染(PIL 实现), 支持 B站/抖音/快手/微博/小红书/youtube/tiktok/twitter/acfun/nga"
 authors = [{ "name" = "fllesser", "email" = "fllessive@gmail.com" }]
 readme = "README.md"
 requires-python = ">=3.10"
@@ -41,7 +41,7 @@ dependencies = [
 ]
 
 [project.optional-dependencies]
-htmlkit = ["nonebot-plugin-htmlkit>=0.1.0rc1", "jinja2>=3.1.6"]
+htmlkit = ["nonebot-plugin-htmlkit>=0.1.0rc3", "jinja2>=3.1.6"]
 
 [project.urls]
 Repository = "https://github.com/fllesser/nonebot-plugin-parser"
@@ -54,7 +54,7 @@ dev = [
   "nonebot2[fastapi]>=2.4.3,<3.0.0",
   "nonebot-adapter-telegram>=0.1.0b20",
   "pre-commit>=4.3.0",
-  "ruff>=0.13.3,<1.0.0",
+  "ruff>=0.14.0,<1.0.0",
   "bump-my-version>=1.2.4",
 ]
 
@@ -72,7 +72,7 @@ test = [
 all_extras = ["nonebot-plugin-htmlkit>=0.1.0rc1", "jinja2>=3.1.6"]
 
 [tool.uv]
-required-version = ">=0.8.14"
+required-version = ">=0.9.2"
 default-groups = ["test", "dev", "all_extras"]
 
 [tool.nonebot]
@@ -99,7 +99,7 @@ addopts = [
 [tool.poe.tasks]
 test_others = "pytest tests/others --cov=src --cov-report=xml:coverage1.xml --junitxml=junit1.xml -n auto"
 test_parsers = "pytest tests/parsers --cov=src --cov-report=xml:coverage2.xml --junitxml=junit2.xml -n auto"
-test_render = "pytest tests/render --cov=src --cov-report=xml:coverage3.xml --junitxml=junit3.xml -n auto --log-cli-level=DEBUG"
+test_render = "pytest tests/render --cov=src --cov-report=xml:coverage3.xml --junitxml=junit3.xml"
 bump = "bump-my-version bump"
 show-bump = "bump-my-version show-bump"
 
@@ -186,7 +186,7 @@ build-backend = "uv_build"
 
 
 [tool.bumpversion]
-current_version = "2.0.8"
+current_version = "2.0.10"
 commit = true
 message = "🔖 release: bump vesion from {current_version} to {new_version}"
 tag = true

{nonebot_plugin_parser-2.0.8 → nonebot_plugin_parser-2.0.10}/src/nonebot_plugin_parser/__init__.py

@@ -11,8 +11,8 @@ from .matchers import clear_result_cache
 from .utils import safe_unlink
 
 __plugin_meta__ = PluginMetadata(
-    name="链接分享自动解析",
-    description="BV号/链接/小程序/卡片 | B站/抖音/快手/微博/小红书/youtube/tiktok/twitter/acfun",
+    name="链接分享解析 Alconna 版",
+    description="全新通用媒体卡片渲染(PIL 实现), 支持 B站/抖音/快手/微博/小红书/youtube/tiktok/twitter/acfun/nga",
     usage="发送支持平台的(BV号/链接/小程序/卡片)即可",
     type="application",
     homepage="https://github.com/fllesser/nonebot-plugin-parser",

{nonebot_plugin_parser-2.0.8 → nonebot_plugin_parser-2.0.10}/src/nonebot_plugin_parser/config.py

@@ -1,4 +1,5 @@
 from enum import Enum
+from functools import cached_property
 from pathlib import Path
 from typing import Literal
 
@@ -56,22 +57,22 @@ class Config(BaseModel):
     parser_need_forward_contents: bool = True
     """是否需要转发媒体内容"""
 
-    @property
+    @cached_property
     def nickname(self) -> str:
         """全局名称"""
         return _nickname
 
-    @property
+    @cached_property
     def cache_dir(self) -> Path:
         """插件缓存目录"""
         return _cache_dir
 
-    @property
+    @cached_property
     def config_dir(self) -> Path:
         """插件配置目录"""
         return _config_dir
 
-    @property
+    @cached_property
     def data_dir(self) -> Path:
         """插件数据目录"""
         return _data_dir
@@ -131,7 +132,7 @@ class Config(BaseModel):
         """是否在解析结果中附加原始URL"""
         return self.parser_append_url
 
-    @property
+    @cached_property
     def custom_font(self) -> Path | None:
         """自定义字体"""
         return (self.data_dir / self.parser_custom_font) if self.parser_custom_font else None

{nonebot_plugin_parser-2.0.8 → nonebot_plugin_parser-2.0.10}/src/nonebot_plugin_parser/matchers/__init__.py

@@ -12,7 +12,7 @@ from ..config import pconfig
 from ..parsers import BaseParser, ParseResult
 from ..renders import get_renderer
 from ..utils import LimitedSizeDict
-from .preprocess import KeyPatternMatched, Keyword, on_keyword_regex
+from .preprocess import Keyword, KwdRegexMatched, on_keyword_regex
 
 
 def _get_enabled_parser_classes() -> list[type[BaseParser]]:
@@ -60,7 +60,7 @@ parser_matcher = on_keyword_regex(*_get_enabled_patterns())
 async def _(
     event: Event,
     keyword: str = Keyword(),
-    matched: re.Match[str] = KeyPatternMatched(),
+    matched: re.Match[str] = KwdRegexMatched(),
 ):
     """统一的解析处理器"""
     # 响应用户处理中

{nonebot_plugin_parser-2.0.8 → nonebot_plugin_parser-2.0.10}/src/nonebot_plugin_parser/matchers/preprocess.py

@@ -13,9 +13,9 @@ from nonebot_plugin_alconna.uniseg import Hyper, UniMsg
 
 from .filter import is_not_in_disabled_groups
 
-R_KEYWORD_KEY: Literal["_r_keyword"] = "_r_keyword"
-R_EXTRACT_KEY: Literal["_r_extract"] = "_r_extract"
-R_KEY_REGEX_MATCHED_KEY: Literal["_r_key_regex_matched"] = "_r_key_regex_matched"
+PSR_KWD_KEY: Literal["_psr_kwd"] = "_psr_kwd"
+PSR_EXTRACT_KEY: Literal["_psr_extract"] = "_psr_extract"
+PSR_KWD_MATCHED_KEY: Literal["_psr_kwd_matched"] = "_psr_kwd_matched"
 
 
 def ExtractText() -> str:
@@ -23,7 +23,7 @@ def ExtractText() -> str:
 
 
 def _extract_text(state: T_State) -> str | None:
-    return state.get(R_EXTRACT_KEY)
+    return state.get(PSR_EXTRACT_KEY)
 
 
 def Keyword() -> str:
@@ -31,15 +31,15 @@ def Keyword() -> str:
 
 
 def _keyword(state: T_State) -> str | None:
-    return state.get(R_KEYWORD_KEY)
+    return state.get(PSR_KWD_KEY)
 
 
-def KeyPatternMatched() -> re.Match[str]:
-    return Depends(_key_pattern_matched)
+def KwdRegexMatched() -> re.Match[str]:
+    return Depends(_kwd_regex_matched)
 
 
-def _key_pattern_matched(state: T_State) -> re.Match[str] | None:
-    return state.get(R_KEY_REGEX_MATCHED_KEY)
+def _kwd_regex_matched(state: T_State) -> re.Match[str] | None:
+    return state.get(PSR_KWD_MATCHED_KEY)
 
 
 URL_KEY_MAPPING = {
@@ -104,12 +104,12 @@ def extract_msg_text(message: UniMsg, state: T_State) -> None:
     text: str | None = None
 
     if hyper := message.get(Hyper, 1):
-        state[R_EXTRACT_KEY] = _extract_json_url(hyper.pop())
+        state[PSR_EXTRACT_KEY] = _extract_json_url(hyper.pop())
         return
 
     # 提取纯文本
     if text := message.extract_plain_text().strip():
-        state[R_EXTRACT_KEY] = text
+        state[PSR_EXTRACT_KEY] = text
 
 
 class KeyPatternList(list[tuple[str, re.Pattern[str]]]):
@@ -145,8 +145,8 @@ class KeywordRegexRule:
             if keyword not in text:
                 continue
             if matched := pattern.search(text):
-                state[R_KEYWORD_KEY] = keyword
-                state[R_KEY_REGEX_MATCHED_KEY] = matched
+                state[PSR_KWD_KEY] = keyword
+                state[PSR_KWD_MATCHED_KEY] = matched
                 return True
             logger.debug(f"keyword '{keyword}' is in '{text}', but not matched")
         return False

{nonebot_plugin_parser-2.0.8 → nonebot_plugin_parser-2.0.10}/src/nonebot_plugin_parser/parsers/bilibili/__init__.py

@@ -61,21 +61,23 @@ class BilibiliParser(BaseParser):
         """
         # 从匹配对象中获取原始URL, 视频ID, 页码
         url, video_id, page_num = str(matched.group(0)), str(matched.group(1)), matched.group(2)
-
         # 处理短链
         if "b23.tv" in url or "bili2233.cn" in url:
             url = await self.get_redirect_url(url, self.headers)
 
         if not video_id:
-            if _matched := re.search(r"(BV[\dA-Za-z]{10})[^?]*?(?:\?[^#]*?p=(\d{1,3}))?", url):
-                video_id = _matched.group(1)
-                page_num = _matched.group(2)
-            elif _matched := re.search(r"av(\d{6,})[^?]*?(?:\?[^#]*?p=(\d{1,3}))?", url):
-                video_id = _matched.group(1)
-                page_num = _matched.group(2)
+            # https://www.bilibili.com/video/BV1584y167sD?a=20&p=40
+            if _matched := re.search(r"(?:(BV[\dA-Za-z]{10})|av(\d{6,}))", url):
+                video_id = _matched.group(1) or _matched.group(2)
             else:
                 return await self.parse_others(url)
 
+            # 匹配页码参数
+            if _matched := re.search(r"(?:&|\?)p=(\d{1,3})", url):
+                page_num = _matched.group(1)
+            else:
+                page_num = None
+
         avid, bvid = None, None
         page_num = int(page_num) if page_num and page_num.isdigit() else 1
 
@@ -282,18 +284,11 @@ class BilibiliParser(BaseParser):
         current_text = ""
 
         for node in opus_data.gen_text_img():
-            match node:
-                case ImageNode():
-                    contents.append(
-                        self.create_graphics_content(
-                            node.url,
-                            current_text.strip(),
-                            node.alt,
-                        )
-                    )
-                    current_text = ""
-                case TextNode():
-                    current_text += node.text
+            if isinstance(node, ImageNode):
+                contents.append(self.create_graphics_content(node.url, current_text.strip(), node.alt))
+                current_text = ""
+            elif isinstance(node, TextNode):
+                current_text += node.text
 
         return self.result(
             title=opus_data.title,
@@ -358,18 +353,11 @@ class BilibiliParser(BaseParser):
         contents: list[MediaContent] = []
         current_text = ""
         for child in article_info.gen_text_img():
-            match child:
-                case ImageNode():
-                    contents.append(
-                        self.create_graphics_content(
-                            child.url,
-                            current_text.strip(),
-                            child.alt,
-                        )
-                    )
-                    current_text = ""
-                case TextNode():
-                    current_text += child.text
+            if isinstance(child, ImageNode):
+                contents.append(self.create_graphics_content(child.url, current_text.strip(), child.alt))
+                current_text = ""
+            elif isinstance(child, TextNode):
+                current_text += child.text
 
         author = self.create_author(*article_info.author_info)
 

{nonebot_plugin_parser-2.0.8 → nonebot_plugin_parser-2.0.10}/src/nonebot_plugin_parser/renders/base.py

@@ -44,6 +44,7 @@ class BaseRenderer(ABC):
         """
         failed_count = 0
         forwardable_segs: list[ForwardNodeInner] = []
+        dynamic_segs: list[ForwardNodeInner] = []
 
         for cont in chain(result.contents, result.repost.contents if result.repost else ()):
             try:
@@ -65,7 +66,7 @@ class BaseRenderer(ABC):
                 case ImageContent():
                     forwardable_segs.append(UniHelper.img_seg(path))
                 case DynamicContent():
-                    forwardable_segs.append(UniHelper.video_seg(path))
+                    dynamic_segs.append(UniHelper.video_seg(path))
                 case GraphicsContent() as graphics:
                     graphics_msg = UniHelper.img_seg(path)
                     if graphics.text is not None:
@@ -76,11 +77,13 @@ class BaseRenderer(ABC):
 
         if forwardable_segs:
             if pconfig.need_forward_contents or len(forwardable_segs) > 4:
-                forward_msg = UniHelper.construct_forward_message(forwardable_segs)
+                forward_msg = UniHelper.construct_forward_message(forwardable_segs + dynamic_segs)
                 yield UniMessage(forward_msg)
             else:
-                for seg in forwardable_segs:
-                    yield UniMessage(seg)
+                yield UniMessage(forwardable_segs)
+
+                if dynamic_segs:
+                    yield UniMessage(UniHelper.construct_forward_message(dynamic_segs))
 
         if failed_count > 0:
             message = f"{failed_count} 项媒体下载失败"

{nonebot_plugin_parser-2.0.8 → nonebot_plugin_parser-2.0.10}/src/nonebot_plugin_parser/renders/common.py

@@ -1,4 +1,5 @@
 from dataclasses import dataclass
+from functools import lru_cache
 from io import BytesIO
 from pathlib import Path
 from typing import ClassVar
@@ -19,6 +20,53 @@ class FontInfo:
     cjk_width: int
     ascii_width: int
 
+    def __hash__(self) -> int:
+        """实现哈希方法以支持 @lru_cache"""
+        return hash((self.line_height, self.cjk_width, self.ascii_width))
+
+    @lru_cache(maxsize=100)
+    def get_char_width(self, char: str) -> int:
+        """获取字符宽度，使用缓存优化"""
+        bbox = self.font.getbbox(char)
+        width = int(bbox[2] - bbox[0])
+        return width
+
+    def get_char_width_fast(self, char: str) -> int:
+        """快速获取单个字符宽度"""
+        if self._is_cjk_char(char):
+            return self.cjk_width
+        elif self._is_ascii_char(char):
+            return self.ascii_width
+        else:
+            return self.get_char_width(char)
+
+    def get_text_width(self, text: str) -> int:
+        """计算文本宽度，使用预计算的字符宽度优化性能
+
+        Args:
+            text: 要计算宽度的文本
+
+        Returns:
+            文本宽度（像素）
+        """
+        if not text:
+            return 0
+
+        total_width = 0
+        for char in text:
+            total_width += self.get_char_width_fast(char)
+        return total_width
+
+    @staticmethod
+    def _is_cjk_char(char: str) -> bool:
+        """判断是否为中日韩字符"""
+        return "\u4e00" <= char <= "\u9fff"
+
+    @staticmethod
+    def _is_ascii_char(char: str) -> bool:
+        """判断是否为ASCII字符"""
+        return ord(char) < 128
+
 
 @dataclass(eq=False, frozen=True, slots=True)
 class FontSet:
@@ -28,6 +76,7 @@ class FontSet:
     title_font: FontInfo
     text_font: FontInfo
     extra_font: FontInfo
+    indicator_font: FontInfo
 
 
 @dataclass(eq=False, frozen=True, slots=True)
@@ -169,9 +218,9 @@ class CommonRenderer(ImageRenderer):
     """转发缩放比例"""
 
     # 字体大小和行高
-    FONT_SIZES: ClassVar[dict[str, int]] = {"name": 28, "title": 30, "text": 24, "extra": 24}
+    FONT_SIZES: ClassVar[dict[str, int]] = {"name": 28, "title": 30, "text": 24, "extra": 24, "indicator": 60}
     """字体大小"""
-    LINE_HEIGHTS: ClassVar[dict[str, int]] = {"name": 32, "title": 36, "text": 28, "extra": 28}
+    LINE_HEIGHTS: ClassVar[dict[str, int]] = {"name": 32, "title": 36, "text": 28, "extra": 28, "indicator": 68}
     """行高"""
 
     RESOURCES_DIR: ClassVar[Path] = Path(__file__).parent / "resources"
@@ -228,6 +277,7 @@ class CommonRenderer(ImageRenderer):
             title_font=font_infos["title"],
             text_font=font_infos["text"],
             extra_font=font_infos["extra"],
+            indicator_font=font_infos["indicator"],
         )
 
         logger.success(f"加载字体「{self.font_path.name}」成功")
@@ -859,11 +909,11 @@ class CommonRenderer(ImageRenderer):
         if section.alt_text:
             y_pos += self.SECTION_SPACING  # 图片和alt文本之间的间距
             # 计算文本居中位置
-            bbox = self.fontset.extra_font.font.getbbox(section.alt_text)
-            text_width = bbox[2] - bbox[0]
+            extra_font_info = self.fontset.extra_font
+            text_width = extra_font_info.get_text_width(section.alt_text)
             text_x = self.PADDING + (content_width - text_width) // 2
-            draw.text((text_x, y_pos), section.alt_text, fill=self.EXTRA_COLOR, font=self.fontset.extra_font.font)
-            y_pos += self.fontset.extra_font.line_height
+            draw.text((text_x, y_pos), section.alt_text, fill=self.EXTRA_COLOR, font=extra_font_info.font)
+            y_pos += extra_font_info.line_height
 
         return y_pos + self.SECTION_SPACING
 
@@ -985,19 +1035,14 @@ class CommonRenderer(ImageRenderer):
 
         # 绘制+N文字
         text = f"+{count}"
-        # 使用更大的字体
-        font_size = min(img_width, img_height) // 4
-        font = ImageFont.truetype(self.font_path, font_size)
-
+        font_info = self.fontset.indicator_font
         # 计算文字位置（居中）
-        bbox = font.getbbox(text)
-        text_width = bbox[2] - bbox[0]
-        text_height = bbox[3] - bbox[1]
+        text_width = font_info.get_text_width(text)
         text_x = img_x + (img_width - text_width) // 2
-        text_y = img_y + (img_height - text_height) // 2
+        text_y = img_y + (img_height - font_info.line_height) // 2
 
-        # 绘制白色文字
-        draw.text((text_x, text_y), text, fill=(255, 255, 255, 255), font=font)
+        # 绘制50%透明白色文字
+        draw.text((text_x, text_y), text, fill=(255, 255, 255), font=font_info.font)
 
     def _draw_rounded_rectangle(
         self, image: Image.Image, bbox: tuple[int, int, int, int], fill_color: tuple[int, int, int], radius: int = 8
@@ -1056,81 +1101,14 @@ class CommonRenderer(ImageRenderer):
         lines = []
         paragraphs = text.split("\n")
 
-        # 字符宽度缓存
-        char_width_cache = {}
-
-        def get_char_width(char: str) -> int:
-            """获取字符宽度，使用缓存优化"""
-            if char in char_width_cache:
-                return char_width_cache[char]
-
-            bbox = font_info.font.getbbox(char)
-            width = int(bbox[2] - bbox[0])
-            char_width_cache[char] = width
-            return width
-
-        def is_cjk_char(char: str) -> bool:
-            """判断是否为中日韩字符"""
-            return "\u4e00" <= char <= "\u9fff"
-
-        def is_ascii_char(char: str) -> bool:
-            """判断是否为ASCII字符"""
-            return ord(char) < 128
-
         def is_punctuation(char: str) -> bool:
-            """判断是否为标点符号"""
+            """判断是否为不能为行首的标点符号"""
             # 中文标点符号
-            chinese_punctuation = "，。！？；：、''（）【】《》〈〉「」『』〔〕〖〗〘〙〚〛…—·"
+            chinese_punctuation = "，。！？；：、）】》〉」』〕〗〙〛…—·"
             # 英文标点符号
-            english_punctuation = ",.;:!?()[]{}'\"-"
-            # Unicode 标点符号类别
-            import unicodedata
-
-            return (
-                char in chinese_punctuation or char in english_punctuation or unicodedata.category(char).startswith("P")
-            )
-
-        def get_text_width_fast(text: str) -> int:
-            """快速计算文本宽度"""
-            if not text:
-                return 0
-
-            total_width = 0
-            for char in text:
-                if is_cjk_char(char):
-                    total_width += font_info.cjk_width
-                elif is_ascii_char(char):
-                    total_width += font_info.ascii_width
-                else:
-                    total_width += get_char_width(char)
-            return total_width
-
-        def find_break_point(text: str) -> int:
-            """找到合适的断点位置，避免标点符号在行首"""
-            if not text:
-                return 0
-
-            # 从后往前找断点
-            for i in range(len(text) - 1, 0, -1):
-                char = text[i]
-
-                # 优先在空格处断行
-                if char == " ":
-                    return i
-
-                # 对于中文，可以在任意字符处断行
-                if is_cjk_char(char):
-                    return i
+            english_punctuation = ",.;:!?)]}"
 
-                # 对于标点符号，不能在行首，需要跳过
-                if is_punctuation(char):
-                    continue
-
-                # 其他字符可以作为断点
-                return i
-
-            # 如果找不到合适的断点，在中间位置断行
-            return max(1, len(text) // 2)
+            return char in chinese_punctuation or char in english_punctuation
 
         for paragraph in paragraphs:
             if not paragraph:
@@ -1138,51 +1116,41 @@ class CommonRenderer(ImageRenderer):
                 continue
 
             current_line = ""
+            current_line_width = 0
             remaining_text = paragraph
 
             while remaining_text:
+                next_char = remaining_text[0]
+                char_width = font_info.get_char_width_fast(next_char)
+
                 # 如果当前行为空，直接添加字符
                 if not current_line:
-                    current_line = remaining_text[0]
+                    current_line = next_char
+                    current_line_width = char_width
                     remaining_text = remaining_text[1:]
                     continue
 
-                # 测试添加下一个字符
-                test_line = current_line + remaining_text[0]
-                test_width = get_text_width_fast(test_line)
+                # 如果是标点符号，直接添加到当前行（标点符号不应该单独成行）
+                if is_punctuation(next_char):
+                    current_line += next_char
+                    current_line_width += char_width
+                    remaining_text = remaining_text[1:]
+                    continue
+
+                # 测试添加下一个字符后的宽度
+                test_width = current_line_width + char_width
 
                 if test_width <= max_width:
                     # 宽度合适，继续添加
-                    current_line = test_line
+                    current_line += next_char
+                    current_line_width = test_width
                     remaining_text = remaining_text[1:]
                 else:
                     # 宽度超限，需要断行
-                    if len(current_line) == 1:
-                        # 单个字符就超宽，强制添加
-                        lines.append(current_line)
-                        current_line = remaining_text[0]
-                        remaining_text = remaining_text[1:]
-                    else:
-                        # 尝试找到合适的断点
-                        break_point = find_break_point(current_line)
-
-                        # 保存当前行
-                        lines.append(current_line[:break_point].rstrip())
-
-                        # 开始新行，跳过行首的标点符号
-                        current_line = current_line[break_point:].lstrip()
-
-                        # 如果新行以标点符号开头，将其移到上一行
-                        while current_line and is_punctuation(current_line[0]):
-                            if lines:
-                                lines[-1] += current_line[0]
-                                current_line = current_line[1:]
-                            else:
-                                break
-
-                        if not current_line:
-                            current_line = remaining_text[0]
-                            remaining_text = remaining_text[1:]
+                    lines.append(current_line)
+                    current_line = next_char
+                    current_line_width = char_width
+                    remaining_text = remaining_text[1:]
 
             # 保存最后一行
             if current_line: