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

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: nonebot-plugin-parser
-Version: 2.6.0
+Version: 2.6.1
 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
@@ -19,20 +19,20 @@ Classifier: Programming Language :: Python :: 3.14
 Classifier: Topic :: Communications :: Chat
 Classifier: Topic :: Internet :: WWW/HTTP
 Classifier: Topic :: Multimedia :: Video
-Requires-Dist: nonebot2>=2.4.3,<3.0.0
 Requires-Dist: rich>=13.0.0
 Requires-Dist: pillow>=11.0.0
 Requires-Dist: aiofiles>=25.1.0
 Requires-Dist: httpx>=0.27.2,<1.0.0
 Requires-Dist: msgspec>=0.20.0,<1.0.0
+Requires-Dist: nonebot2>=2.4.3,<3.0.0
 Requires-Dist: apilmoji[rich]>=0.3.1,<1.0.0
 Requires-Dist: beautifulsoup4>=4.12.0,<5.0.0
 Requires-Dist: curl-cffi>=0.13.0,!=0.14.0,<1.0.0
 Requires-Dist: bilibili-api-python>=17.4.1,<18.0.0
+Requires-Dist: nonebot-plugin-uninfo>=0.10.1,<1.0.0
 Requires-Dist: nonebot-plugin-alconna>=0.60.4,<1.0.0
-Requires-Dist: nonebot-plugin-apscheduler>=0.5.0,<1.0.0
 Requires-Dist: nonebot-plugin-localstore>=0.7.4,<1.0.0
-Requires-Dist: nonebot-plugin-uninfo>=0.10.1,<1.0.0
+Requires-Dist: nonebot-plugin-apscheduler>=0.5.0,<1.0.0
 Requires-Dist: nonebot-plugin-htmlkit>=0.1.0rc4 ; extra == 'all'
 Requires-Dist: nonebot-plugin-htmlrender>=0.6.7 ; extra == 'all'
 Requires-Dist: yt-dlp[default]>=2026.3.13 ; extra == 'all'
@@ -416,7 +416,7 @@ class ExampleParser(BaseParser):
 <details>
 <summary>辅助函数</summary>
 
-> 构建作者信息
+> 构建作者
 
 ```python
 author = self.create_author(
@@ -473,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.6.0 → nonebot_plugin_parser-2.6.1}/README.md

@@ -362,7 +362,7 @@ class ExampleParser(BaseParser):
 <details>
 <summary>辅助函数</summary>
 
-> 构建作者信息
+> 构建作者
 
 ```python
 author = self.create_author(
@@ -419,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.6.0 → nonebot_plugin_parser-2.6.1}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "nonebot-plugin-parser"
-version = "2.6.0"
+version = "2.6.1"
 description = "NoneBot2 链接分享解析 Alconna 版, 现支持B站|抖音|快手|微博|小红书|YouTube|TikTok|Twitter|AcFun|NGA"
 readme = "README.md"
 requires-python = ">=3.10"
@@ -39,20 +39,20 @@ classifiers = [
 ]
 
 dependencies = [
-  "nonebot2>=2.4.3,<3.0.0",
   "rich>=13.0.0",
   "pillow>=11.0.0",
   "aiofiles>=25.1.0",
   "httpx>=0.27.2,<1.0.0",
   "msgspec>=0.20.0,<1.0.0",
+  "nonebot2>=2.4.3,<3.0.0",
   "apilmoji[rich]>=0.3.1,<1.0.0",
   "beautifulsoup4>=4.12.0,<5.0.0",
   "curl_cffi>=0.13.0,<1.0.0,!=0.14.0",
   "bilibili-api-python>=17.4.1,<18.0.0",
+  "nonebot-plugin-uninfo>=0.10.1,<1.0.0",
   "nonebot-plugin-alconna>=0.60.4,<1.0.0",
-  "nonebot-plugin-apscheduler>=0.5.0,<1.0.0",
   "nonebot-plugin-localstore>=0.7.4,<1.0.0",
-  "nonebot-plugin-uninfo>=0.10.1,<1.0.0",
+  "nonebot-plugin-apscheduler>=0.5.0,<1.0.0",
 ]
 
 [project.urls]
@@ -118,7 +118,7 @@ nonebug = { git = "https://github.com/nonebot/nonebug", rev = "master" }
 [tool.bumpversion]
 tag = true
 commit = true
-current_version = "2.6.0"
+current_version = "2.6.1"
 message = "release: bump vesion from {current_version} to {new_version}"
 
 [[tool.bumpversion.files]]
@@ -150,7 +150,7 @@ test-render = "pytest tests/renders --cov=src --cov-report=xml --junitxml=junit.
 bump = "bump-my-version bump"
 show-bump = "bump-my-version show-bump"
 
-[tool.pyright]
+[tool.basedpyright]
 pythonVersion = "3.10"
 pythonPlatform = "All"
 defineConstant = { PYDANTIC_V2 = true }

{nonebot_plugin_parser-2.6.0 → nonebot_plugin_parser-2.6.1}/src/nonebot_plugin_parser/download/__init__.py

@@ -4,9 +4,10 @@ from functools import partial
 from contextlib import contextmanager
 from urllib.parse import urljoin
 
+import httpx
 import aiofiles
-from httpx import HTTPError, AsyncClient
-from nonebot import logger
+import curl_cffi
+from nonebot import logger, get_driver
 from rich.progress import (
     Progress,
     BarColumn,
@@ -15,22 +16,27 @@ from rich.progress import (
 )
 
 from .task import auto_task
-from ..utils import merge_av, safe_unlink, generate_file_name
+from ..utils import merge_av, safe_unlink, generate_file_name, is_module_available
 from ..config import pconfig
 from ..constants import COMMON_HEADER, DOWNLOAD_TIMEOUT
 from ..exception import IgnoreException, DownloadException
 
 
 class StreamDownloader:
-    """Downloader class for downloading files with stream"""
-
     def __init__(self):
         self.headers: dict[str, str] = COMMON_HEADER.copy()
         self.cache_dir: Path = pconfig.cache_dir
-        self.client: AsyncClient = AsyncClient(timeout=DOWNLOAD_TIMEOUT, verify=False)
+        self.client: httpx.AsyncClient = httpx.AsyncClient(timeout=DOWNLOAD_TIMEOUT, verify=False)
+
+    async def aclose(self):
+        await self.client.aclose()
 
+    @staticmethod
     @contextmanager
-    def rich_progress(self, desc: str, total: int | None = None):
+    def rich_progress(
+        desc: str,
+        total: int | None = None,
+    ):
         with Progress(
             TextColumn("[bold blue]{task.description}", justify="right"),
             BarColumn(bar_width=None),
@@ -41,53 +47,83 @@ class StreamDownloader:
             task_id = progress.add_task(description=desc, total=total)
             yield partial(progress.update, task_id)
 
-    async def _download_file(
+    @staticmethod
+    def _validate_content_length(
+        response: httpx.Response | curl_cffi.Response,
+    ) -> int:
+        """获取文件长度"""
+        content_length = response.headers.get("Content-Length")
+        content_length = int(content_length) if content_length else 0
+
+        if content_length == 0:
+            logger.warning(f"媒体 url: {response.url}, 大小为 0, 取消下载")
+            raise IgnoreException
+
+        if (file_size := content_length / 1024 / 1024) > pconfig.max_size:
+            logger.warning(f"媒体 url: {response.url} 大小 {file_size:.2f} MB, 超过 {pconfig.max_size} MB, 取消下载")
+            raise IgnoreException
+
+        return content_length
+
+    async def _download_file_with_httpx(
         self,
         url: str,
         *,
-        file_name: str | None = None,
-        ext_headers: dict[str, str] | None = None,
+        file_path: Path,
+        headers: dict[str, str],
         chunk_size: int = 64 * 1024,
     ) -> Path:
         """download file by url with stream"""
-        if not file_name:
-            file_name = generate_file_name(url)
-        file_path = self.cache_dir / file_name
-        # 如果文件存在，则直接返回
-        if file_path.exists():
-            return file_path
 
-        headers = {**self.headers, **(ext_headers or {})}
+        async with self.client.stream(
+            "GET",
+            url,
+            headers=headers,
+            follow_redirects=True,
+        ) as response:
+            response.raise_for_status()
+            content_length = self._validate_content_length(response)
+
+            with self.rich_progress(
+                f"httpx | {file_path.name}",
+                content_length,
+            ) as update_progress:
+                async with aiofiles.open(file_path, "wb") as file:
+                    async for chunk in response.aiter_bytes(chunk_size):
+                        await file.write(chunk)
+                        update_progress(advance=len(chunk))
 
-        try:
-            async with self.client.stream("GET", url, headers=headers, follow_redirects=True) as response:
-                response.raise_for_status()
-                content_length = response.headers.get("Content-Length")
-                content_length = int(content_length) if content_length else 0
-
-                if content_length == 0:
-                    logger.warning(f"媒体 url: {url}, 大小为 0, 取消下载")
-                    raise IgnoreException
-
-                if (file_size := content_length / 1024 / 1024) > pconfig.max_size:
-                    logger.warning(f"媒体 url: {url} 大小 {file_size:.2f} MB, 超过 {pconfig.max_size} MB, 取消下载")
-                    raise IgnoreException
-
-                with self.rich_progress(file_name, content_length) as update_progress:
-                    async with aiofiles.open(file_path, "wb") as file:
-                        async for chunk in response.aiter_bytes(chunk_size):
-                            await file.write(chunk)
-                            update_progress(advance=len(chunk))
-
-        except HTTPError:
-            await safe_unlink(file_path)
-            logger.exception(f"下载失败 | url: {url}, file_path: {file_path}")
-            raise DownloadException("媒体下载失败")
+        return file_path
+
+    async def _download_file_with_curl_cffi(
+        self,
+        url: str,
+        *,
+        file_path: Path,
+        headers: dict[str, str],
+    ) -> Path:
+        async with curl_cffi.AsyncSession(allow_redirects=True) as session:
+            response: curl_cffi.Response = await session.get(
+                url,
+                headers=headers,
+                timeout=DOWNLOAD_TIMEOUT,
+                stream=True,
+            )
+            response.raise_for_status()
+            content_length = self._validate_content_length(response)
+
+            with self.rich_progress(
+                f"curl_cffi | {file_path.name}",
+                content_length,
+            ) as update_progress:
+                async with aiofiles.open(file_path, "wb") as file:
+                    async for chunk in response.aiter_content(chunk_size=8192):
+                        await file.write(chunk)
+                        update_progress(advance=len(chunk))
 
         return file_path
 
-    @auto_task
-    async def download_file(
+    async def _download_file(
         self,
         url: str,
         *,
@@ -95,13 +131,28 @@ class StreamDownloader:
         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,
-        )
+        """download file by url with fallback"""
+        if not file_name:
+            file_name = generate_file_name(url)
+        file_path = self.cache_dir / file_name
+        if file_path.exists():
+            return file_path
+
+        headers = {**self.headers, **(ext_headers or {})}
+
+        try:
+            path = await self._download_file_with_httpx(
+                url, file_path=file_path, headers=headers, chunk_size=chunk_size
+            )
+        except httpx.HTTPError:
+            logger.opt(exception=True).warning(f"下载失败(httpx) | url: {url}")
+            try:
+                path = await self._download_file_with_curl_cffi(url, file_path=file_path, headers=headers)
+            except curl_cffi.CurlError:
+                logger.opt(exception=True).warning(f"下载失败(curl_cffi) | url: {url}")
+                raise DownloadException("媒体下载失败")
+
+        return path
 
     @auto_task
     async def download_video(
@@ -199,7 +250,7 @@ class StreamDownloader:
                                 await f.write(chunk)
                                 total_size += len(chunk)
                                 update_progress(advance=len(chunk), total=total_size)
-        except HTTPError:
+        except httpx.HTTPError:
             await safe_unlink(video_path)
             logger.exception("m3u8 视频下载失败")
             raise DownloadException("m3u8 视频下载失败")
@@ -224,13 +275,18 @@ class StreamDownloader:
         return slices
 
 
-DOWNLOADER: StreamDownloader = StreamDownloader()
-
-try:
-    import yt_dlp as yt_dlp
+downloader: StreamDownloader = StreamDownloader()
+"""全局下载器实例，提供下载功能"""
+yt_dlp_downloader = None
+"""yt-dlp 下载器实例，提供下载视频功能，若 yt-dlp 未安装则为 None"""
 
+if is_module_available("yt_dlp"):
     from .ytdlp import YtdlpDownloader
 
-    YTDLP_DOWNLOADER = YtdlpDownloader()
-except ImportError:
-    YTDLP_DOWNLOADER = None
+    yt_dlp_downloader = YtdlpDownloader()
+
+
+@get_driver().on_shutdown
+async def close_download_client():
+    logger.debug("正在关闭下载器...")
+    await downloader.aclose()

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

@@ -31,6 +31,14 @@ EMOJI_MAP = {
     "resolving": ("424", "👀"),
     "done": ("144", "🎉"),
 }
+"""emoji 映射"""
+
+ID_ADAPTERS = {
+    SupportAdapter.onebot11,
+    SupportAdapter.qq,
+    SupportAdapter.milky,
+}
+"""支持的传入 emoji id 发送 reaction 的适配器"""
 
 
 class UniHelper:
@@ -127,15 +135,12 @@ class UniHelper:
         message_id = uniseg.get_message_id(event)
         target = uniseg.get_target(event)
 
-        if target.adapter in (SupportAdapter.onebot11, SupportAdapter.qq):
-            emoji = EMOJI_MAP[status][0]
-        else:
-            emoji = EMOJI_MAP[status][1]
+        emoji = EMOJI_MAP[status][0 if target.adapter in ID_ADAPTERS else 1]
 
         try:
             await uniseg.message_reaction(emoji, message_id=message_id)
         except Exception:
-            logger.warning(f"reaction {emoji} to {message_id} failed, maybe not support")
+            logger.opt(exception=True).warning(f"reaction {emoji} to {message_id} failed, maybe not support")
 
     @classmethod
     def with_reaction(cls, func: Callable[..., Awaitable[Any]]):

{nonebot_plugin_parser-2.6.0 → nonebot_plugin_parser-2.6.1}/src/nonebot_plugin_parser/matchers/__init__.py

@@ -112,9 +112,9 @@ async def _(message: Message = CommandArg()):
         await UniMessage(UniHelper.file_seg(audio_path)).send()
 
 
-from ..download import YTDLP_DOWNLOADER
+from ..download import yt_dlp_downloader
 
-if YTDLP_DOWNLOADER is not None:
+if yt_dlp_downloader is not None:
     from ..parsers import YouTubeParser
 
     @on_command("ym", priority=3, block=True).handle()
@@ -128,7 +128,7 @@ if YTDLP_DOWNLOADER is not None:
 
         url = matched.group(0)
 
-        audio_path = await YTDLP_DOWNLOADER.download_audio(url)
+        audio_path = await yt_dlp_downloader.download_audio(url)
         await UniMessage(UniHelper.record_seg(audio_path)).send()
 
         if pconfig.need_upload:

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

@@ -7,10 +7,10 @@ from .douyin import DouyinParser as DouyinParser
 from .twitter import TwitterParser as TwitterParser
 from .bilibili import BilibiliParser as BilibiliParser
 from .kuaishou import KuaiShouParser as KuaiShouParser
-from ..download import YTDLP_DOWNLOADER
+from ..download import yt_dlp_downloader as yt_dlp_downloader
 from .xiaohongshu import XiaoHongShuParser as XiaoHongShuParser
 
-if YTDLP_DOWNLOADER is not None:
+if yt_dlp_downloader is not None:
     from .tiktok import TikTokParser as TikTokParser
     from .youtube import YouTubeParser as YouTubeParser
 

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

@@ -1,15 +1,15 @@
 from re import Match, Pattern, compile
 from abc import ABC
-from typing import TYPE_CHECKING, Any, TypeVar, ClassVar, cast
+from typing import TYPE_CHECKING, Any, TypeVar, ClassVar, cast, final
 from asyncio import Task
 from pathlib import Path
 from collections.abc import Callable, Coroutine
-from typing_extensions import Unpack, final
+from typing_extensions import Unpack
 
 from .data import Platform, ParseResult, ImageContent, ParseResultKwargs
 from .task import PathTask
 from ..config import pconfig as pconfig
-from ..download import DOWNLOADER
+from ..download import downloader
 from ..constants import IOS_HEADER, COMMON_HEADER, ANDROID_HEADER, COMMON_TIMEOUT
 from ..constants import DOWNLOAD_TIMEOUT as DOWNLOAD_TIMEOUT
 from ..constants import PlatformEnum as PlatformEnum
@@ -170,7 +170,7 @@ class BaseParser:
         author = Author(name=name, description=description)
 
         if avatar_url:
-            author.avatar = PathTask(DOWNLOADER.download_img(avatar_url, ext_headers=self.headers))
+            author.avatar = PathTask(downloader.download_img(avatar_url, ext_headers=self.headers))
 
         return author
 
@@ -185,12 +185,12 @@ class BaseParser:
         from ..utils import extract_video_cover
 
         if isinstance(url_or_task, str):
-            path_task = DOWNLOADER.download_video(url_or_task, ext_headers=self.headers)
+            path_task = downloader.download_video(url_or_task, ext_headers=self.headers)
         elif isinstance(url_or_task, Task):
             path_task = url_or_task
 
         if cover_url:
-            cover_task = DOWNLOADER.download_img(cover_url, ext_headers=self.headers)
+            cover_task = downloader.download_img(cover_url, ext_headers=self.headers)
         else:
             # 如果没有封面 URL，尝试从视频中提取封面
             async def extract_cover():
@@ -212,7 +212,7 @@ class BaseParser:
         """创建图片内容列表"""
         contents: list[ImageContent] = []
         for url in image_urls:
-            task = DOWNLOADER.download_img(url, ext_headers=self.headers)
+            task = downloader.download_img(url, ext_headers=self.headers)
             contents.append(ImageContent(PathTask(task)))
         return contents
 
@@ -223,7 +223,7 @@ class BaseParser:
     ):
         """创建单个图片内容"""
         if isinstance(url_or_task, str):
-            path_task = DOWNLOADER.download_img(url_or_task, ext_headers=self.headers)
+            path_task = downloader.download_img(url_or_task, ext_headers=self.headers)
         elif isinstance(url_or_task, Task):
             path_task = url_or_task
 
@@ -238,7 +238,7 @@ class BaseParser:
         from .data import AudioContent
 
         if isinstance(url_or_task, str):
-            path_task = DOWNLOADER.download_audio(url_or_task, ext_headers=self.headers)
+            path_task = downloader.download_audio(url_or_task, ext_headers=self.headers)
         elif isinstance(url_or_task, Task):
             path_task = url_or_task
 
@@ -246,4 +246,4 @@ class BaseParser:
 
     @property
     def downloader(self):
-        return DOWNLOADER
+        return downloader

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

@@ -141,7 +141,7 @@ class BilibiliParser(BaseParser):
                     ext_headers=self.headers,
                 )
             else:
-                path = await self.downloader.download_file(
+                path = await self.downloader._download_file(
                     v_url,
                     file_name=output_path.name,
                     ext_headers=self.headers,

{nonebot_plugin_parser-2.6.0 → nonebot_plugin_parser-2.6.1}/src/nonebot_plugin_parser/parsers/data.py

@@ -50,6 +50,8 @@ class VideoContent(MediaContent):
         repr = f"VideoContent({self.path_task}"
         if self.cover is not None:
             repr += f", cover={self.cover}"
+        if self.duration:
+            repr += f", duration={self.duration}"
         return repr + ")"
 
 

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

@@ -54,7 +54,6 @@ class KuaiShouParser(BaseParser):
         # 构建作者
         author = self.create_author(photo.name, photo.head_url)
 
-        # 先以部分数据构建结果，后续再填充内容，避免使用临时变量
         result = self.result(
             title=photo.caption,
             author=author,
@@ -64,7 +63,11 @@ class KuaiShouParser(BaseParser):
 
         # 添加视频内容
         if video_url := photo.video_url:
-            result.video = self.create_video(video_url, photo.cover_url, photo.duration)
+            result.video = self.create_video(
+                video_url,
+                photo.cover_url,
+                photo.duration_in_seconds,
+            )
 
         # 添加图片内容
         if img_urls := photo.img_urls:

{nonebot_plugin_parser-2.6.0 → nonebot_plugin_parser-2.6.1}/src/nonebot_plugin_parser/parsers/kuaishou/states.py

@@ -42,6 +42,10 @@ class Photo(Struct):
     def name(self) -> str:
         return self.user_name.replace("\u3164", "").strip()
 
+    @property
+    def duration_in_seconds(self):
+        return self.duration // 1000
+
     @property
     def cover_url(self):
         return choice(self.cover_urls).url if len(self.cover_urls) != 0 else None

{nonebot_plugin_parser-2.6.0 → nonebot_plugin_parser-2.6.1}/src/nonebot_plugin_parser/parsers/tiktok.py

@@ -3,7 +3,7 @@ from typing import ClassVar
 
 from .base import BaseParser, PlatformEnum, handle
 from .data import Author, Platform
-from ..download import YTDLP_DOWNLOADER
+from ..download import yt_dlp_downloader
 
 
 class TikTokParser(BaseParser):
@@ -18,10 +18,10 @@ class TikTokParser(BaseParser):
             url = await self.get_redirect_url(url)
 
         # 获取视频信息
-        video_info = await YTDLP_DOWNLOADER.extract_video_info(url)
+        video_info = await yt_dlp_downloader.extract_video_info(url)
 
         # 下载封面和视频
-        video = YTDLP_DOWNLOADER.download_video(url)
+        video = yt_dlp_downloader.download_video(url)
         video_content = self.create_video(
             video,
             video_info.thumbnail,

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

@@ -5,7 +5,7 @@ from httpx import AsyncClient
 
 from ..base import Platform, BaseParser, PlatformEnum, handle, pconfig
 from ..cookie import save_cookies_with_netscape
-from ...download import YTDLP_DOWNLOADER
+from ...download import yt_dlp_downloader
 
 
 class YouTubeParser(BaseParser):
@@ -28,7 +28,7 @@ class YouTubeParser(BaseParser):
         return await self.parse_video(url)
 
     async def parse_video(self, url: str):
-        video_info = await YTDLP_DOWNLOADER.extract_video_info(url, self.cookies_file)
+        video_info = await yt_dlp_downloader.extract_video_info(url, self.cookies_file)
         author = await self._fetch_author_info(video_info.channel_id)
 
         result = self.result(
@@ -38,7 +38,7 @@ class YouTubeParser(BaseParser):
         )
 
         if video_info.duration <= pconfig.duration_maximum:
-            video = YTDLP_DOWNLOADER.download_video(url, self.cookies_file)
+            video = yt_dlp_downloader.download_video(url, self.cookies_file)
             result.video = self.create_video(
                 video,
                 video_info.thumbnail,

{nonebot_plugin_parser-2.6.0 → nonebot_plugin_parser-2.6.1}/src/nonebot_plugin_parser/renders/__init__.py

@@ -6,19 +6,12 @@ from .base import BaseRenderer
 from .common import CommonRenderer
 from .default import DefaultRenderer
 
+RENDERER: type[BaseRenderer] | None = None
 
-def is_module_available(module_name: str) -> bool:
-    """检查模块是否可用"""
-    import importlib.util
-
-    return importlib.util.find_spec(module_name) is not None
-
-
+from ..utils import is_module_available
 from ..config import pconfig
 from ..constants import RenderType
 
-RENDERER: type[BaseRenderer] | None = None
-
 match pconfig.render_type:
     case RenderType.common:
         RENDERER = CommonRenderer

{nonebot_plugin_parser-2.6.0 → nonebot_plugin_parser-2.6.1}/src/nonebot_plugin_parser/utils.py

@@ -195,3 +195,10 @@ def write_json_to_data(data: dict[str, Any] | str, file_name: str):
     with open(path, "w") as f:
         json.dump(data, f, ensure_ascii=False, indent=4)
     logger.success(f"数据写入 {path} 成功")
+
+
+def is_module_available(module_name: str) -> bool:
+    """检查模块是否可用"""
+    import importlib.util
+
+    return importlib.util.find_spec(module_name) is not None