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

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: nonebot-plugin-parser
-Version: 2.5.2
+Version: 2.5.3
 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.2 → nonebot_plugin_parser-2.5.3}/pyproject.toml

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

{nonebot_plugin_parser-2.5.2 → nonebot_plugin_parser-2.5.3}/src/nonebot_plugin_parser/download/__init__.py

@@ -41,8 +41,7 @@ class StreamDownloader:
             task_id = progress.add_task(description=desc, total=total)
             yield partial(progress.update, task_id)
 
-    @auto_task
-    async def download_file(
+    async def _download_file(
         self,
         url: str,
         *,
@@ -87,6 +86,23 @@ class StreamDownloader:
 
         return file_path
 
+    @auto_task
+    async def download_file(
+        self,
+        url: str,
+        *,
+        file_name: str | None = None,
+        ext_headers: dict[str, str] | None = None,
+        chunk_size: int = 64 * 1024,
+    ) -> Path:
+        """download file by url with stream"""
+        return await self._download_file(
+            url,
+            file_name=file_name,
+            ext_headers=ext_headers,
+            chunk_size=chunk_size,
+        )
+
     @auto_task
     async def download_video(
         self,
@@ -99,7 +115,7 @@ class StreamDownloader:
         if video_name is None:
             video_name = generate_file_name(url, ".mp4")
 
-        return await self.download_file(
+        return await self._download_file(
             url,
             file_name=video_name,
             ext_headers=ext_headers,
@@ -118,7 +134,7 @@ class StreamDownloader:
         if audio_name is None:
             audio_name = generate_file_name(url, ".mp3")
 
-        return await self.download_file(
+        return await self._download_file(
             url,
             file_name=audio_name,
             ext_headers=ext_headers,
@@ -136,7 +152,7 @@ class StreamDownloader:
         if img_name is None:
             img_name = generate_file_name(url, ".jpg")
 
-        return await self.download_file(
+        return await self._download_file(
             url,
             file_name=img_name,
             ext_headers=ext_headers,
@@ -153,25 +169,12 @@ class StreamDownloader:
     ) -> Path:
         """download video and audio file by url with stream and merge"""
         v_path, a_path = await asyncio.gather(
-            self.download_video(v_url, ext_headers=ext_headers),
-            self.download_audio(a_url, ext_headers=ext_headers),
+            self._download_file(v_url, ext_headers=ext_headers),
+            self._download_file(a_url, ext_headers=ext_headers),
         )
         await merge_av(v_path=v_path, a_path=a_path, output_path=output_path)
         return output_path
 
-    async def download_imgs_without_raise(
-        self,
-        urls: list[str],
-        *,
-        ext_headers: dict[str, str] | None = None,
-    ) -> list[Path]:
-        """download image files by urls with stream, ignore errors"""
-        paths_or_errs = await asyncio.gather(
-            *[self.download_img(url, ext_headers=ext_headers) for url in urls],
-            return_exceptions=True,
-        )
-        return [p for p in paths_or_errs if isinstance(p, Path)]
-
     @auto_task
     async def download_m3u8(
         self,

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

@@ -61,10 +61,7 @@ class BaseRenderer(ABC):
                 case AudioContent():
                     yield UniMessage(UniHelper.record_seg(path))
                 case ImageContent():
-                    img_seg = UniHelper.img_seg(path)
-                    if cont.alt:
-                        img_seg += cont.alt
-                    forwardable_segs.append(img_seg)
+                    forwardable_segs.append(UniHelper.img_seg(path))
                 case DynamicContent():
                     dynamic_segs.append(UniHelper.video_seg(path))
 
@@ -81,7 +78,10 @@ class BaseRenderer(ABC):
                 continue
 
             if path := await cont.path_task.safe_get(on_error):
-                forwardable_segs.append(UniHelper.img_seg(path))
+                img_seg = UniHelper.img_seg(path)
+                if cont.alt:
+                    img_seg += cont.alt
+                forwardable_segs.append(img_seg)
 
         if forwardable_segs:
             if pconfig.need_forward_contents or len(forwardable_segs) > 4: