nonebot-plugin-parser 2.5.1__tar.gz → 2.5.2__tar.gz

{nonebot_plugin_parser-2.5.1 → nonebot_plugin_parser-2.5.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: nonebot-plugin-parser
-Version: 2.5.1
+Version: 2.5.2
 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

{nonebot_plugin_parser-2.5.1 → nonebot_plugin_parser-2.5.2}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "nonebot-plugin-parser"
-version = "2.5.1"
+version = "2.5.2"
 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.1"
+current_version = "2.5.2"
 message = "release: bump vesion from {current_version} to {new_version}"
 
 [[tool.bumpversion.files]]

{nonebot_plugin_parser-2.5.1 → nonebot_plugin_parser-2.5.2}/src/nonebot_plugin_parser/download/task.py

@@ -20,11 +20,16 @@ class PathTask:
     def __await__(self):
         return self.get().__await__()
 
-    async def safe_get(self) -> Path | None:
+    async def safe_get(
+        self,
+        on_error: Callable[[Exception], None] | None = None,
+    ) -> Path | None:
         """任务失败, 返回 None"""
         try:
             return await self.get()
-        except Exception:
+        except Exception as e:
+            if on_error is not None:
+                on_error(e)
             return None
 
     @property
@@ -52,11 +57,14 @@ class OptionalPathTask:
     def __await__(self):
         return self.get().__await__()
 
-    async def safe_get(self) -> Path | None:
+    async def safe_get(
+        self,
+        on_error: Callable[[Exception], None] | None = None,
+    ) -> Path | None:
         """任务失败, 返回 None"""
         if self._path_task is None:
             return None
-        return await self._path_task.safe_get()
+        return await self._path_task.safe_get(on_error)
 
     @property
     def uri(self) -> str | None:

{nonebot_plugin_parser-2.5.1 → nonebot_plugin_parser-2.5.2}/src/nonebot_plugin_parser/renders/base.py

@@ -36,25 +36,23 @@ class BaseRenderer(ABC):
         forwardable_segs: list[ForwardNodeInner] = []
         dynamic_segs: list[ForwardNodeInner] = []
 
+        def on_error(e: Exception):
+            if isinstance(e, IgnoreException):
+                pass
+            elif isinstance(e, DownloadException):
+                nonlocal failed_count
+                failed_count += 1
+
         if self.result.video:
-            video_path = await self.result.video.path_task.get()
-            yield UniMessage(UniHelper.video_seg(video_path))
+            if video_path := await self.result.video.path_task.safe_get(on_error):
+                yield UniMessage(UniHelper.video_seg(video_path))
 
         for cont in chain(
             self.result.contents,
-            self.result.graphics,
-            *(self.result.repost.contents, self.result.repost.graphics) if self.result.repost else (),
+            self.result.repost.contents if self.result.repost else (),
         ):
-            if isinstance(cont, str):
-                forwardable_segs.append(cont)
-                continue
-
-            try:
-                path = await cont.path_task.get()
-            except IgnoreException:
-                continue
-            except DownloadException:
-                failed_count += 1
+            path = await cont.path_task.safe_get(on_error)
+            if path is None:
                 continue
 
             match cont:
@@ -71,8 +69,19 @@ class BaseRenderer(ABC):
                     dynamic_segs.append(UniHelper.video_seg(path))
 
         if self.result.repost and self.result.repost.video:
-            video_path = await self.result.repost.video.path_task.get()
-            yield UniMessage(UniHelper.video_seg(video_path))
+            if video_path := await self.result.repost.video.path_task.safe_get(on_error):
+                yield UniMessage(UniHelper.video_seg(video_path))
+
+        for cont in chain(
+            self.result.graphics,
+            self.result.repost.graphics if self.result.repost else (),
+        ):
+            if isinstance(cont, str):
+                forwardable_segs.append(cont)
+                continue
+
+            if path := await cont.path_task.safe_get(on_error):
+                forwardable_segs.append(UniHelper.img_seg(path))
 
         if forwardable_segs:
             if pconfig.need_forward_contents or len(forwardable_segs) > 4: