nonebot-plugin-parser 2.5.3__tar.gz → 2.6.0__tar.gz

{nonebot_plugin_parser-2.5.3 → nonebot_plugin_parser-2.6.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: nonebot-plugin-parser
-Version: 2.5.3
+Version: 2.6.0
 Summary: NoneBot2 链接分享解析 Alconna 版, 现支持B站|抖音|快手|微博|小红书|YouTube|TikTok|Twitter|AcFun|NGA
 Keywords: acfun,bilibili,douyin,kuaishou,nga,nonebot,nonebot2,tiktok,twitter,video,weibo,xiaohongshu,youtube
 Author: fllesser
@@ -71,7 +71,7 @@ Description-Content-Type: text/markdown
 
 </div>
 
-> [!IMPORTANT] 
+> [!IMPORTANT]
 > **收藏项目**，你将从 GitHub 上无延迟地接收所有发布通知～ ⭐️
 
 <img width="100%" src="https://starify.komoridevs.icu/api/starify?owner=fllesser&repo=nonebot-plugin-parser" alt="starify" />
@@ -81,14 +81,14 @@ Description-Content-Type: text/markdown
 | 平台    | 触发的消息形态                    | 视频 | 图集 | 音频 |
 | ------- | --------------------------------- | ---- | ---- | ---- |
 | B 站    | av 号/BV 号/链接/短链/卡片/小程序 | ✅​  | ✅​  | ✅​  |
-| 抖音    | 链接(分享链接，兼容电脑端链接)    | ✅​  | ✅​  | ❌️  |
-| 微博    | 链接(博文，视频，show, 文章)      | ✅​  | ✅​  | ❌️  |
-| 小红书  | 链接(含短链)/卡片                 | ✅​  | ✅​  | ❌️  |
-| 快手    | 链接(包含标准链接和短链)          | ✅​  | ✅​  | ❌️  |
-| acfun   | 链接                              | ✅​  | ❌️  | ❌️  |
-| youtube | 链接(含短链)                      | ✅​  | ❌️  | ✅​  |
-| tiktok  | 链接                              | ✅​  | ❌️  | ❌️  |
-| twitter | 链接                              | ✅​  | ✅​  | ❌️  |
+| 抖音    | 链接(分享链接，兼容电脑端链接)    | ✅​  | ✅​  | ❌️   |
+| 微博    | 链接(博文，视频，show, 文章)      | ✅​  | ✅​  | ❌️   |
+| 小红书  | 链接(含短链)/卡片                 | ✅​  | ✅​  | ❌️   |
+| 快手    | 链接(包含标准链接和短链)          | ✅​  | ✅​  | ❌️   |
+| acfun   | 链接                              | ✅​  | ❌️   | ❌️   |
+| youtube | 链接(含短链)                      | ✅​  | ❌️   | ✅​  |
+| tiktok  | 链接                              | ✅​  | ❌️   | ❌️   |
+| twitter | 链接                              | ✅​  | ✅​  | ❌️   |
 
 支持的链接，可参考 [测试链接](https://github.com/fllesser/nonebot-plugin-parser/blob/master/tests/others/test_urls.md)
 
@@ -108,7 +108,7 @@ Description-Content-Type: text/markdown
 
 ## 💿 安装
 
-> [!Warning] 
+> [!Warning]
 > **如果你已经在使用 nonebot-plugin-resolver[2]，请在安装此插件前卸载**
 
 <details>
@@ -304,6 +304,9 @@ parser_append_url=False
 # 例如: ./config/nonebot_plugin_parser/
 parser_custom_font="LXGWZhenKaiGB-Regular.ttf"
 
+# [可选] 用户名及标题字体粗细程度(仅 htmlrender)，如果使用 LXGW ZhenKai 字体建议设置为 500～600 之间
+parser_custom_font_weight: int = 700
+
 # [可选] 是否需要转发媒体内容(超过 4 项时始终使用合并转发)
 parser_need_forward_contents=True
 
@@ -390,18 +393,19 @@ class ExampleParser(BaseParser):
 
         # 4. 视频内容
         author = self.create_author(author_name, avatar_url)
-        video = self.create_video_content(video_url, cover_url, duration)
+        video = self.create_video(video_url, cover_url, duration)
 
         # 5. 图集内容
         image_urls = data.get("images")
-        images = self.create_image_contents(image_urls)
+        images = self.create_image(image_urls)
 
         # 6. 返回解析结果
         return self.result(
             title=title,
             text=description,
             author=author,
-            contents=[video, *images],
+            video=video,
+            contents=[*images],
             timestamp=timestamp,
             url=f"https://example.com/video/{video_id}",
         )
@@ -426,7 +430,7 @@ author = self.create_author(
 
 ```python
 # 方式1：传入 URL，自动下载
-video = self.create_video_content(
+video = self.create_video(
     url_or_task="https://example.com/video.mp4",
     cover_url="https://example.com/cover.jpg",  # 可选
     duration=120.5                               # 可选，单位：秒
@@ -435,7 +439,7 @@ video = self.create_video_content(
 # 方式2：传入已创建的下载任务
 from nonebot_plugin_parser.download import DOWNLOADER
 video_task = DOWNLOADER.download_video(url, ext_headers=self.headers)
-video = self.create_video_content(
+video = self.create_video(
     url_or_task=video_task,
     cover_url=cover_url,
     duration=duration
@@ -446,21 +450,12 @@ video = self.create_video_content(
 
 ```python
 # 并发下载图集内容
-images = self.create_image_contents([
+images = self.create_images([
     "https://example.com/img1.jpg",
     "https://example.com/img2.jpg",
 ])
 ```
 
-> 创建动图内容（GIF)，平台一般只提供视频（后续插件会做自动转为 gif 的处理)
-
-```python
-dynamics = self.create_dynamic_contents([
-    "https://example.com/dynamic1.mp4",
-    "https://example.com/dynamic2.mp4",
-])
-```
-
 > 重定向 url
 
 ```python
@@ -478,5 +473,5 @@ real_url = await self.get_redirect_url(
 
 ## 🎉 致谢
 
-[nonebot-plugin-resolver](https://github.com/zhiyu1998/nonebot-plugin-resolver)
-[parse-video-py](https://github.com/wujunwei928/parse-video-py)
+- [nonebot-plugin-resolver](https://github.com/zhiyu1998/nonebot-plugin-resolver) | 初代解析插件
+- [parse-video-py](https://github.com/wujunwei928/parse-video-py) | 借鉴了抖音解析

{nonebot_plugin_parser-2.5.3 → nonebot_plugin_parser-2.6.0}/README.md

@@ -17,7 +17,7 @@
 
 </div>
 
-> [!IMPORTANT] 
+> [!IMPORTANT]
 > **收藏项目**，你将从 GitHub 上无延迟地接收所有发布通知～ ⭐️
 
 <img width="100%" src="https://starify.komoridevs.icu/api/starify?owner=fllesser&repo=nonebot-plugin-parser" alt="starify" />
@@ -27,14 +27,14 @@
 | 平台    | 触发的消息形态                    | 视频 | 图集 | 音频 |
 | ------- | --------------------------------- | ---- | ---- | ---- |
 | B 站    | av 号/BV 号/链接/短链/卡片/小程序 | ✅​  | ✅​  | ✅​  |
-| 抖音    | 链接(分享链接，兼容电脑端链接)    | ✅​  | ✅​  | ❌️  |
-| 微博    | 链接(博文，视频，show, 文章)      | ✅​  | ✅​  | ❌️  |
-| 小红书  | 链接(含短链)/卡片                 | ✅​  | ✅​  | ❌️  |
-| 快手    | 链接(包含标准链接和短链)          | ✅​  | ✅​  | ❌️  |
-| acfun   | 链接                              | ✅​  | ❌️  | ❌️  |
-| youtube | 链接(含短链)                      | ✅​  | ❌️  | ✅​  |
-| tiktok  | 链接                              | ✅​  | ❌️  | ❌️  |
-| twitter | 链接                              | ✅​  | ✅​  | ❌️  |
+| 抖音    | 链接(分享链接，兼容电脑端链接)    | ✅​  | ✅​  | ❌️   |
+| 微博    | 链接(博文，视频，show, 文章)      | ✅​  | ✅​  | ❌️   |
+| 小红书  | 链接(含短链)/卡片                 | ✅​  | ✅​  | ❌️   |
+| 快手    | 链接(包含标准链接和短链)          | ✅​  | ✅​  | ❌️   |
+| acfun   | 链接                              | ✅​  | ❌️   | ❌️   |
+| youtube | 链接(含短链)                      | ✅​  | ❌️   | ✅​  |
+| tiktok  | 链接                              | ✅​  | ❌️   | ❌️   |
+| twitter | 链接                              | ✅​  | ✅​  | ❌️   |
 
 支持的链接，可参考 [测试链接](https://github.com/fllesser/nonebot-plugin-parser/blob/master/tests/others/test_urls.md)
 
@@ -54,7 +54,7 @@
 
 ## 💿 安装
 
-> [!Warning] 
+> [!Warning]
 > **如果你已经在使用 nonebot-plugin-resolver[2]，请在安装此插件前卸载**
 
 <details>
@@ -250,6 +250,9 @@ parser_append_url=False
 # 例如: ./config/nonebot_plugin_parser/
 parser_custom_font="LXGWZhenKaiGB-Regular.ttf"
 
+# [可选] 用户名及标题字体粗细程度(仅 htmlrender)，如果使用 LXGW ZhenKai 字体建议设置为 500～600 之间
+parser_custom_font_weight: int = 700
+
 # [可选] 是否需要转发媒体内容(超过 4 项时始终使用合并转发)
 parser_need_forward_contents=True
 
@@ -336,18 +339,19 @@ class ExampleParser(BaseParser):
 
         # 4. 视频内容
         author = self.create_author(author_name, avatar_url)
-        video = self.create_video_content(video_url, cover_url, duration)
+        video = self.create_video(video_url, cover_url, duration)
 
         # 5. 图集内容
         image_urls = data.get("images")
-        images = self.create_image_contents(image_urls)
+        images = self.create_image(image_urls)
 
         # 6. 返回解析结果
         return self.result(
             title=title,
             text=description,
             author=author,
-            contents=[video, *images],
+            video=video,
+            contents=[*images],
             timestamp=timestamp,
             url=f"https://example.com/video/{video_id}",
         )
@@ -372,7 +376,7 @@ author = self.create_author(
 
 ```python
 # 方式1：传入 URL，自动下载
-video = self.create_video_content(
+video = self.create_video(
     url_or_task="https://example.com/video.mp4",
     cover_url="https://example.com/cover.jpg",  # 可选
     duration=120.5                               # 可选，单位：秒
@@ -381,7 +385,7 @@ video = self.create_video_content(
 # 方式2：传入已创建的下载任务
 from nonebot_plugin_parser.download import DOWNLOADER
 video_task = DOWNLOADER.download_video(url, ext_headers=self.headers)
-video = self.create_video_content(
+video = self.create_video(
     url_or_task=video_task,
     cover_url=cover_url,
     duration=duration
@@ -392,21 +396,12 @@ video = self.create_video_content(
 
 ```python
 # 并发下载图集内容
-images = self.create_image_contents([
+images = self.create_images([
     "https://example.com/img1.jpg",
     "https://example.com/img2.jpg",
 ])
 ```
 
-> 创建动图内容（GIF)，平台一般只提供视频（后续插件会做自动转为 gif 的处理)
-
-```python
-dynamics = self.create_dynamic_contents([
-    "https://example.com/dynamic1.mp4",
-    "https://example.com/dynamic2.mp4",
-])
-```
-
 > 重定向 url
 
 ```python
@@ -424,5 +419,5 @@ real_url = await self.get_redirect_url(
 
 ## 🎉 致谢
 
-[nonebot-plugin-resolver](https://github.com/zhiyu1998/nonebot-plugin-resolver)
-[parse-video-py](https://github.com/wujunwei928/parse-video-py)
+- [nonebot-plugin-resolver](https://github.com/zhiyu1998/nonebot-plugin-resolver) | 初代解析插件
+- [parse-video-py](https://github.com/wujunwei928/parse-video-py) | 借鉴了抖音解析

{nonebot_plugin_parser-2.5.3 → nonebot_plugin_parser-2.6.0}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "nonebot-plugin-parser"
-version = "2.5.3"
+version = "2.6.0"
 description = "NoneBot2 链接分享解析 Alconna 版, 现支持B站|抖音|快手|微博|小红书|YouTube|TikTok|Twitter|AcFun|NGA"
 readme = "README.md"
 requires-python = ">=3.10"
@@ -118,7 +118,7 @@ nonebug = { git = "https://github.com/nonebot/nonebug", rev = "master" }
 [tool.bumpversion]
 tag = true
 commit = true
-current_version = "2.5.3"
+current_version = "2.6.0"
 message = "release: bump vesion from {current_version} to {new_version}"
 
 [[tool.bumpversion.files]]

{nonebot_plugin_parser-2.5.3 → nonebot_plugin_parser-2.6.0}/src/nonebot_plugin_parser/config.py

@@ -48,6 +48,8 @@ class Config(BaseModel):
     """Renderer 类型"""
     parser_custom_font: str | None = None
     """自定义字体"""
+    parser_custom_font_weight: int = 700
+    """字体粗细程度"""
     parser_need_forward_contents: bool = True
     """是否需要转发媒体内容"""
     parser_emoji_cdn: str = ELK_SH_CDN
@@ -160,6 +162,11 @@ class Config(BaseModel):
 
                 return font_path
 
+    @property
+    def custom_font_weight(self) -> int:
+        """字体粗细程度"""
+        return self.parser_custom_font_weight
+
     @property
     def need_forward_contents(self) -> bool:
         """是否需要转发媒体内容"""

nonebot_plugin_parser-2.6.0/src/nonebot_plugin_parser/download/task.py

@@ -0,0 +1,20 @@
+from typing import Any, TypeVar, ParamSpec
+from asyncio import Task, create_task
+from pathlib import Path
+from functools import wraps
+from collections.abc import Callable, Coroutine
+
+P = ParamSpec("P")
+T = TypeVar("T")
+
+
+def auto_task(func: Callable[P, Coroutine[Any, Any, Path]]) -> Callable[P, Task[Path]]:
+    """装饰器：自动将异步函数调用转换为 Task, 完整保留类型提示"""
+
+    @wraps(func)
+    def wrapper(*args: P.args, **kwargs: P.kwargs) -> Task[Path]:
+        coro = func(*args, **kwargs)
+        name = " | ".join(str(arg) for arg in args if isinstance(arg, str))
+        return create_task(coro, name=func.__name__ + " | " + name)
+
+    return wrapper

{nonebot_plugin_parser-2.5.3 → nonebot_plugin_parser-2.6.0}/src/nonebot_plugin_parser/helper.py

@@ -78,7 +78,11 @@ class UniHelper:
             return Voice(path=audio_path)
 
     @classmethod
-    def video_seg(cls, video_path: Path) -> Video | File | Text:
+    def video_seg(
+        cls,
+        video_path: Path,
+        thumbnail: Path | None = None,
+    ) -> Video | File | Text:
         """视频 Seg"""
         # 检测文件大小
         file_size_byte_count = int(video_path.stat().st_size)
@@ -89,9 +93,15 @@ class UniHelper:
             return cls.file_seg(video_path, display_name=video_path.name)
         else:
             if pconfig.use_base64:
-                return Video(raw=video_path.read_bytes())
+                video = Video(raw=video_path.read_bytes())
+                if thumbnail and thumbnail.stat().st_size > 0:
+                    video.thumbnail = cls.img_seg(thumbnail.read_bytes())
+                return video
             else:
-                return Video(path=video_path)
+                video = Video(path=video_path)
+                if thumbnail and thumbnail.stat().st_size > 0:
+                    video.thumbnail = cls.img_seg(thumbnail)
+                return video
 
     @staticmethod
     def file_seg(

{nonebot_plugin_parser-2.5.3 → nonebot_plugin_parser-2.6.0}/src/nonebot_plugin_parser/parsers/__init__.py

@@ -22,14 +22,12 @@ from .data import (
     AudioContent,
     ImageContent,
     VideoContent,
-    DynamicContent,
 )
 
 __all__ = [
     "AudioContent",
     "Author",
     "BaseParser",
-    "DynamicContent",
     "ImageContent",
     "ParseResult",
     "Platform",

{nonebot_plugin_parser-2.5.3 → nonebot_plugin_parser-2.6.0}/src/nonebot_plugin_parser/parsers/acfun/__init__.py

@@ -40,7 +40,7 @@ class AcfunParser(BaseParser):
             video_name=f"acfun_{acid}.mp4",
         )
 
-        video_content = self.create_video_content(
+        video_content = self.create_video(
             video_task,
             cover_url=video_info.coverUrl,
         )

{nonebot_plugin_parser-2.5.3 → nonebot_plugin_parser-2.6.0}/src/nonebot_plugin_parser/parsers/base.py

@@ -7,6 +7,7 @@ from collections.abc import Callable, Coroutine
 from typing_extensions import Unpack, final
 
 from .data import Platform, ParseResult, ImageContent, ParseResultKwargs
+from .task import PathTask
 from ..config import pconfig as pconfig
 from ..download import DOWNLOADER
 from ..constants import IOS_HEADER, COMMON_HEADER, ANDROID_HEADER, COMMON_TIMEOUT
@@ -15,7 +16,6 @@ from ..constants import PlatformEnum as PlatformEnum
 from ..exception import ParseException
 from ..exception import IgnoreException as IgnoreException
 from ..exception import DownloadException as DownloadException
-from ..download.task import PathTask, OptionalPathTask
 
 T = TypeVar("T", bound="BaseParser")
 HandlerFunc = Callable[[T, Match[str]], Coroutine[Any, Any, ParseResult]]
@@ -167,34 +167,45 @@ class BaseParser:
         """创建作者对象"""
         from .data import Author
 
-        avatar_task = None
+        author = Author(name=name, description=description)
+
         if avatar_url:
-            avatar_task = DOWNLOADER.download_img(avatar_url, ext_headers=self.headers)
-        return Author(name=name, avatar=OptionalPathTask(avatar_task), description=description)
+            author.avatar = PathTask(DOWNLOADER.download_img(avatar_url, ext_headers=self.headers))
+
+        return author
 
-    def create_video_content(
+    def create_video(
         self,
-        url_or_task: str | Task[Path] | PathTask,
+        url_or_task: str | Task[Path],
         cover_url: str | None = None,
         duration: float | None = None,
     ):
         """创建视频内容"""
         from .data import VideoContent
-
-        cover_task = None
-        if cover_url:
-            cover_task = DOWNLOADER.download_img(cover_url, ext_headers=self.headers)
+        from ..utils import extract_video_cover
 
         if isinstance(url_or_task, str):
             path_task = DOWNLOADER.download_video(url_or_task, ext_headers=self.headers)
         elif isinstance(url_or_task, Task):
-            path_task = PathTask(url_or_task)
-        elif isinstance(url_or_task, PathTask):
             path_task = url_or_task
 
-        return VideoContent(path_task, OptionalPathTask(cover_task), duration)
+        if cover_url:
+            cover_task = DOWNLOADER.download_img(cover_url, ext_headers=self.headers)
+        else:
+            # 如果没有封面 URL，尝试从视频中提取封面
+            async def extract_cover():
+                video_path = await path_task
+                return await extract_video_cover(video_path)
+
+            cover_task = extract_cover()
+
+        return VideoContent(
+            PathTask(path_task),
+            cover=PathTask(cover_task),
+            duration=duration,
+        )
 
-    def create_image_contents(
+    def create_images(
         self,
         image_urls: list[str],
     ):
@@ -202,56 +213,25 @@ class BaseParser:
         contents: list[ImageContent] = []
         for url in image_urls:
             task = DOWNLOADER.download_img(url, ext_headers=self.headers)
-            contents.append(ImageContent(task))
+            contents.append(ImageContent(PathTask(task)))
         return contents
 
-    def create_image_content(
+    def create_image(
         self,
-        url_or_task: str | Task[Path] | PathTask,
+        url_or_task: str | Task[Path],
         alt: str | None = None,
     ):
-        """创建图片内容"""
+        """创建单个图片内容"""
         if isinstance(url_or_task, str):
             path_task = DOWNLOADER.download_img(url_or_task, ext_headers=self.headers)
         elif isinstance(url_or_task, Task):
-            path_task = PathTask(url_or_task)
-        elif isinstance(url_or_task, PathTask):
-            path_task = url_or_task
-
-        return ImageContent(path_task, alt=alt)
-
-    def create_dynamic_contents(
-        self,
-        dynamic_urls: list[str],
-    ):
-        """创建动态图片内容列表"""
-        from .data import DynamicContent
-
-        contents: list[DynamicContent] = []
-        for url in dynamic_urls:
-            task = DOWNLOADER.download_video(url, ext_headers=self.headers)
-            contents.append(DynamicContent(task))
-        return contents
-
-    def create_dynamic_content(
-        self,
-        url_or_task: str | Task[Path] | PathTask,
-    ):
-        """创建动态图片内容"""
-        from .data import DynamicContent
-
-        if isinstance(url_or_task, str):
-            path_task = DOWNLOADER.download_video(url_or_task, ext_headers=self.headers)
-        elif isinstance(url_or_task, Task):
-            path_task = PathTask(url_or_task)
-        elif isinstance(url_or_task, PathTask):
             path_task = url_or_task
 
-        return DynamicContent(path_task)
+        return ImageContent(PathTask(path_task), alt=alt)
 
-    def create_audio_content(
+    def create_audio(
         self,
-        url_or_task: str | Task[Path] | PathTask,
+        url_or_task: str | Task[Path],
         duration: float = 0.0,
     ):
         """创建音频内容"""
@@ -260,11 +240,9 @@ class BaseParser:
         if isinstance(url_or_task, str):
             path_task = DOWNLOADER.download_audio(url_or_task, ext_headers=self.headers)
         elif isinstance(url_or_task, Task):
-            path_task = PathTask(url_or_task)
-        elif isinstance(url_or_task, PathTask):
             path_task = url_or_task
 
-        return AudioContent(path_task, duration)
+        return AudioContent(PathTask(path_task), duration)
 
     @property
     def downloader(self):

{nonebot_plugin_parser-2.5.3 → nonebot_plugin_parser-2.6.0}/src/nonebot_plugin_parser/parsers/bilibili/__init__.py

@@ -148,7 +148,7 @@ class BilibiliParser(BaseParser):
                 )
             return path
 
-        video_content = self.create_video_content(
+        video_content = self.create_video(
             asyncio.create_task(download_video()),
             page_info.cover,
             page_info.duration,
@@ -188,7 +188,7 @@ class BilibiliParser(BaseParser):
         # 下载图片
         author = self.create_author(dynamic_info.name, dynamic_info.avatar)
         contents: list[MediaContent] = []
-        contents.extend(self.create_image_contents(dynamic_info.image_urls))
+        contents.extend(self.create_images(dynamic_info.image_urls))
 
         repost = None
         if dynamic_info.type == "DYNAMIC_TYPE_FORWARD" and dynamic_info.orig is not None:
@@ -234,7 +234,7 @@ class BilibiliParser(BaseParser):
             if isinstance(node, str):
                 result.graphics.append(node)
             else:
-                result.graphics.append(self.create_image_content(node.url, alt=node.alt))
+                result.graphics.append(self.create_image(node.url, alt=node.alt))
 
         return result
 
@@ -252,12 +252,12 @@ class BilibiliParser(BaseParser):
         # 下载封面
         if cover := room_data.cover:
             cover_task = self.downloader.download_img(cover, ext_headers=self.headers)
-            contents.append(ImageContent(cover_task))
+            contents.append(self.create_image(cover_task))
 
         # 下载关键帧
         if keyframe := room_data.keyframe:
             keyframe_task = self.downloader.download_img(keyframe, ext_headers=self.headers)
-            contents.append(ImageContent(keyframe_task))
+            contents.append(self.create_image(keyframe_task))
 
         author = self.create_author(room_data.name, room_data.avatar)
 
@@ -288,7 +288,7 @@ class BilibiliParser(BaseParser):
 
         graphics: list[str | ImageContent] = []
         for fav in favdata.medias:
-            graphics.append(self.create_image_content(fav.cover, alt=fav.desc))
+            graphics.append(self.create_image(fav.cover, alt=fav.desc))
             graphics.append(fav.desc)
 
         return self.result(