nonebot-plugin-parser 2.6.7__tar.gz → 2.6.9__tar.gz

{nonebot_plugin_parser-2.6.7 → nonebot_plugin_parser-2.6.9}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: nonebot-plugin-parser
-Version: 2.6.7
+Version: 2.6.9
 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.6.9/pyproject.toml

@@ -0,0 +1,224 @@
+[project]
+name = "nonebot-plugin-parser"
+version = "2.6.9"
+description = "NoneBot2 链接分享解析 Alconna 版, 现支持B站|抖音|快手|微博|小红书|YouTube|TikTok|Twitter|AcFun|NGA"
+readme = "README.md"
+requires-python = ">=3.10"
+keywords = [
+    "acfun",
+    "bilibili",
+    "douyin",
+    "kuaishou",
+    "nga",
+    "nonebot",
+    "nonebot2",
+    "tiktok",
+    "twitter",
+    "video",
+    "weibo",
+    "xiaohongshu",
+    "youtube",
+]
+classifiers = [
+    "Development Status :: 5 - Production/Stable",
+    "Framework :: AsyncIO",
+    "Operating System :: OS Independent",
+    "Programming Language :: Python :: 3",
+    "Programming Language :: Python :: 3 :: Only",
+    "Programming Language :: Python :: 3.10",
+    "Programming Language :: Python :: 3.11",
+    "Programming Language :: Python :: 3.12",
+    "Programming Language :: Python :: 3.13",
+    "Programming Language :: Python :: 3.14",
+    "Topic :: Communications :: Chat",
+    "Topic :: Internet :: WWW/HTTP",
+    "Topic :: Multimedia :: Video",
+]
+dependencies = [
+    "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.5.0,<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.2,<18.0.0",
+    "nonebot-plugin-uninfo>=0.10.1,<1.0.0",
+    "nonebot-plugin-alconna>=0.60.4,<1.0.0",
+    "nonebot-plugin-localstore>=0.7.4,<1.0.0",
+    "nonebot-plugin-apscheduler>=0.5.0,<1.0.0",
+]
+
+[[project.authors]]
+name = "fllesser"
+email = "fllessive@gmail.com"
+
+[project.urls]
+IssueTracker = "https://github.com/fllesser/nonebot-plugin-parser/issues"
+Release = "https://github.com/fllesser/nonebot-plugin-parser/releases"
+Repository = "https://github.com/fllesser/nonebot-plugin-parser"
+
+[project.optional-dependencies]
+htmlkit = ["nonebot-plugin-htmlkit>=0.1.0rc4"]
+htmlrender = ["nonebot-plugin-htmlrender>=0.6.7"]
+ytdlp = ["yt-dlp[default]>=2025.2.21"]
+emosvg = ["emosvg>=0.1.7"]
+all = [
+    "nonebot-plugin-htmlkit>=0.1.0rc4",
+    "nonebot-plugin-htmlrender>=0.6.7",
+    "yt-dlp[default]>=2026.3.13",
+    "emosvg>=0.1.7",
+]
+
+[dependency-groups]
+dev = [
+    "nonebot2[fastapi]>=2.5.0,<3.0.0",
+    "nonebot-adapter-onebot>=2.4.6",
+    "ruff>=0.15.6,<1.0.0",
+    { include-group = "extras" },
+    { include-group = "test" },
+]
+extras = [
+    "emosvg>=0.1.7",
+    "nonebot-plugin-htmlkit>=0.1.0rc4",
+    "nonebot-plugin-htmlrender>=0.6.7",
+    "yt-dlp[default]>=2026.3.13",
+    "types-yt-dlp>=2026.3.13.20260314",
+]
+test = [
+    "nonebug>=0.4.4,<1.0.0",
+    "poethepoet>=0.42.1,<1.0.0",
+    "pytest-asyncio>=1.3.0,<1.4.0",
+    "pytest-cov>=7.0.0",
+    "pytest-xdist>=3.8.0,<4.0.0",
+    "respx>=0.22.0",
+]
+pydantic-v1 = ["pydantic<2.0.0"]
+pydantic-v2 = ["pydantic>=2.0.0"]
+telegram = ["nonebot-adapter-telegram>=0.1.0b20"]
+
+[build-system]
+requires = ["uv_build>=0.11.0,<0.12.0"]
+build-backend = "uv_build"
+
+[tool.uv]
+conflicts = [[
+    { group = "pydantic-v1" },
+    { group = "pydantic-v2" },
+    { group = "telegram" },
+]]
+
+[tool.bumpversion]
+tag = true
+commit = true
+current_version = "2.6.9"
+message = "release: bump vesion from {current_version} to {new_version}"
+
+[[tool.bumpversion.files]]
+filename = "uv.lock"
+search = """
+name = "nonebot-plugin-parser"
+version = "{current_version}""""
+replace = """
+name = "nonebot-plugin-parser"
+version = "{new_version}""""
+
+[tool.coverage.report]
+show_missing = true
+exclude_lines = [
+    "raise NotImplementedError",
+    "if TYPE_CHECKING:",
+    "@overload",
+    "except",
+    "raise",
+]
+
+[tool.nonebot]
+plugins = ["nonebot_plugin_parser"]
+
+[[tool.nonebot.adapters]]
+name = "Onebot V11"
+module_name = "nonebot.adapters.onebot.v11"
+
+[tool.poe.tasks]
+test-other = "pytest tests/others --cov=src --cov-report=xml --junitxml=junit.xml -n auto"
+test-parser = "pytest tests/parsers --cov=src --cov-report=xml --junitxml=junit.xml -n auto"
+test-render = "pytest tests/renders --cov=src --cov-report=xml --junitxml=junit.xml"
+bump = "bump-my-version bump"
+show-bump = "bump-my-version show-bump"
+
+[tool.basedpyright]
+pythonVersion = "3.10"
+pythonPlatform = "All"
+typeCheckingMode = "standard"
+disableBytesTypePromotions = true
+
+[tool.basedpyright.defineConstant]
+PYDANTIC_V2 = true
+
+[[tool.basedpyright.executionEnvironments]]
+root = "./tests"
+extraPaths = ["./src"]
+
+[[tool.basedpyright.executionEnvironments]]
+root = "./src"
+
+[tool.pytest]
+addopts = [
+    "--import-mode=prepend",
+    "--strict-markers",
+    "--tb=short",
+    "-ra",
+    "-s",
+    "-v",
+]
+pythonpath = ["src"]
+asyncio_mode = "auto"
+asyncio_default_fixture_loop_scope = "session"
+
+[tool.ruff]
+line-length = 120
+
+[tool.ruff.format]
+line-ending = "lf"
+
+[tool.ruff.lint]
+select = [
+    "F",
+    "W",
+    "E",
+    "I",
+    "UP",
+    "Q",
+    "PYI",
+    "T10",
+    "T20",
+    "C4",
+    "PT",
+    "TID",
+    "ASYNC",
+    "RUF",
+]
+ignore = [
+    "E402",
+    "UP037",
+    "RUF001",
+    "RUF002",
+    "RUF003",
+    "W191",
+    "TID252",
+    "ASYNC240",
+]
+
+[tool.ruff.lint.isort]
+length-sort = true
+known-first-party = [
+    "nonebot_plugin_parser",
+    "tests/*",
+]
+extra-standard-library = ["typing_extensions"]
+
+[tool.ruff.lint.pyupgrade]
+keep-runtime-typing = true

nonebot_plugin_parser-2.6.7/pyproject.toml → nonebot_plugin_parser-2.6.9/pyproject.toml.orig

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

{nonebot_plugin_parser-2.6.7 → nonebot_plugin_parser-2.6.9}/src/nonebot_plugin_parser/download/__init__.py

@@ -1,20 +1,13 @@
 import asyncio
 from pathlib import Path
-from functools import partial
-from contextlib import contextmanager
 from urllib.parse import urljoin
 
 import httpx
 import aiofiles
 import curl_cffi
 from nonebot import logger, get_driver
-from rich.progress import (
-    Progress,
-    BarColumn,
-    TextColumn,
-    DownloadColumn,
-)
 
+from .rich import add_progress_task
 from .task import auto_task
 from ..utils import merge_av, safe_unlink, generate_file_name, is_module_available
 from ..config import pconfig
@@ -31,22 +24,6 @@ class StreamDownloader:
     async def aclose(self):
         await self.client.aclose()
 
-    @staticmethod
-    @contextmanager
-    def rich_progress(
-        desc: str,
-        total: int | None = None,
-    ):
-        with Progress(
-            TextColumn("[bold blue]{task.description}", justify="right"),
-            BarColumn(bar_width=None),
-            "[progress.percentage]{task.percentage:>3.1f}%",
-            "•",
-            DownloadColumn(),
-        ) as progress:
-            task_id = progress.add_task(description=desc, total=total)
-            yield partial(progress.update, task_id)
-
     @staticmethod
     def _validate_content_length(
         response: httpx.Response | curl_cffi.Response,
@@ -84,14 +61,14 @@ class StreamDownloader:
             response.raise_for_status()
             content_length = self._validate_content_length(response)
 
-            with self.rich_progress(
+            update_progress = add_progress_task(
                 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))
+            )
+            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))
 
         return file_path
 
@@ -112,14 +89,14 @@ class StreamDownloader:
             response.raise_for_status()
             content_length = self._validate_content_length(response)
 
-            with self.rich_progress(
+            update_progress = add_progress_task(
                 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))
+            )
+            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
 
@@ -242,14 +219,12 @@ class StreamDownloader:
 
         try:
             async with aiofiles.open(video_path, "wb") as f:
-                total_size = 0
-                with self.rich_progress(desc=video_name) as update_progress:
-                    for url in await self._get_m3u8_slices(m3u8_url):
-                        async with self.client.stream("GET", url, headers=ext_headers) as response:
-                            async for chunk in response.aiter_bytes(chunk_size=1024 * 1024):
-                                await f.write(chunk)
-                                total_size += len(chunk)
-                                update_progress(advance=len(chunk), total=total_size)
+                update_progress = add_progress_task(desc=video_name)
+                for url in await self._get_m3u8_slices(m3u8_url):
+                    async with self.client.stream("GET", url, headers=ext_headers) as response:
+                        async for chunk in response.aiter_bytes(chunk_size=1024 * 1024):
+                            await f.write(chunk)
+                            update_progress(advance=len(chunk))
         except httpx.HTTPError:
             await safe_unlink(video_path)
             logger.exception("m3u8 视频下载失败")

nonebot_plugin_parser-2.6.9/src/nonebot_plugin_parser/download/rich.py

@@ -0,0 +1,40 @@
+from functools import partial
+
+from rich.progress import (
+    Progress,
+    BarColumn,
+    TextColumn,
+    DownloadColumn,
+)
+
+progress_bar: Progress = Progress(
+    TextColumn("[bold blue]{task.description}", justify="right"),
+    BarColumn(bar_width=None),
+    "[progress.percentage]{task.percentage:>3.1f}%",
+    "•",
+    DownloadColumn(),
+)
+
+
+def add_progress_task(
+    desc: str,
+    total: int | None = None,
+):
+    task_id = progress_bar.add_task(description=desc, total=total)
+    progress_bar.start_task(task_id)
+    return partial(progress_bar.update, task_id)
+
+
+from nonebot import get_driver
+
+driver = get_driver()
+
+
+@driver.on_startup
+async def enter_progress_bar():
+    progress_bar.start()
+
+
+@driver.on_shutdown
+async def exit_progress_bar():
+    progress_bar.stop()

{nonebot_plugin_parser-2.6.7 → nonebot_plugin_parser-2.6.9}/src/nonebot_plugin_parser/parsers/bilibili/__init__.py

@@ -6,10 +6,16 @@ from collections.abc import AsyncGenerator
 
 from msgspec import convert
 from nonebot import logger
-from bilibili_api import HEADERS, Credential, select_client, request_settings
+from bilibili_api import (
+    HEADERS,
+    Credential,
+    get_client,
+    select_client,
+    request_settings,
+)
 from bilibili_api.opus import Opus
 from bilibili_api.video import Video
-from bilibili_api.login_v2 import QrCodeLogin, QrCodeLoginEvents
+from bilibili_api.login_v2 import QrCodeLogin, QrCodeLoginEvents, QrCodeLoginChannel
 
 from ..base import (
     BaseParser,
@@ -353,18 +359,48 @@ class BilibiliParser(BaseParser):
 
     async def login_with_qrcode(self) -> bytes:
         """通过二维码登录获取哔哩哔哩登录凭证"""
-        self._qr_login = QrCodeLogin()
+        self._qr_login = QrCodeLogin(platform=QrCodeLoginChannel.WEB)
         await self._qr_login.generate_qrcode()
 
         qr_pic = self._qr_login.get_qrcode_picture()
         return qr_pic.content
 
+    @staticmethod
+    async def check_state(qr: QrCodeLogin):
+        client = get_client()
+        resp = await client.request(
+            method="GET",
+            url="https://passport.bilibili.com/x/passport-login/web/qrcode/poll",
+            params={"qrcode_key": qr._QrCodeLogin__qr_key},  # pyright: ignore[reportAttributeAccessIssue]
+        )
+        result: dict = resp.json()["data"]  # pyright: ignore[reportIndexIssue]
+        code = result["code"]
+        if code == 86101:
+            return QrCodeLoginEvents.SCAN
+        elif code == 86090:
+            return QrCodeLoginEvents.CONF
+        elif code == 86038:
+            return QrCodeLoginEvents.TIMEOUT
+        else:
+            ac_time_value = result["refresh_token"]
+            cookies = resp.cookies
+            sessdata = cookies["SESSDATA"]
+            bili_jct = cookies["bili_jct"]
+            dedeuserid = cookies["DedeUserID"]
+            qr._QrCodeLogin__credential = Credential(  # pyright: ignore[reportAttributeAccessIssue]
+                sessdata=sessdata,
+                bili_jct=bili_jct,
+                dedeuserid=dedeuserid,
+                ac_time_value=ac_time_value,
+            )
+            return QrCodeLoginEvents.DONE
+
     async def check_qr_state(self) -> AsyncGenerator[str]:
         """检查二维码登录状态"""
         scan_tip_pending = True
 
         for _ in range(30):
-            state = await self._qr_login.check_state()
+            state = await self.check_state(self._qr_login)
             match state:
                 case QrCodeLoginEvents.DONE:
                     yield "登录成功"

nonebot_plugin_parser-2.6.9/src/nonebot_plugin_parser/parsers/douyin/__init__.py

@@ -0,0 +1,118 @@
+import re
+import json
+from typing import ClassVar
+
+from httpx import AsyncClient
+
+from ..base import (
+    COMMON_TIMEOUT,
+    Platform,
+    BaseParser,
+    PlatformEnum,
+    ParseException,
+    handle,
+)
+from .aweme import decoder
+
+
+class DouyinParser(BaseParser):
+    platform: ClassVar[Platform] = Platform(name=PlatformEnum.DOUYIN, display_name="抖音")
+
+    def __init__(self):
+        super().__init__()
+        self.headers.update(
+            {
+                "Origin": "https://open.douyin.com",
+                "Referer": "https://open.douyin.com/",
+            }
+        )
+
+    # https://v.douyin.com/_2ljF4AmKL8
+    @handle("v.douyin", r"v\.douyin\.com/[a-zA-Z0-9_\-]+")
+    @handle("jx.douyin", r"jx\.douyin\.com/[a-zA-Z0-9_\-]+")
+    async def _parse_short_link(self, searched: re.Match[str]):
+        url = f"https://{searched.group(0)}"
+        return await self.parse_with_redirect(url)
+
+    # https://www.douyin.com/video/7521023890996514083
+    # https://www.douyin.com/note/7469411074119322899
+    @handle("douyin", r"douyin\.com/[a-z]+/(?P<aweme_id>\d+)")
+    @handle("iesdouyin", r"iesdouyin\.com/share/[a-z]+/(?P<aweme_id>\d+)")
+    @handle("m.douyin", r"m\.douyin\.com/share/[a-z]+/(?P<aweme_id>\d+)")
+    # https://jingxuan.douyin.com/m/video/7574300896016862490?app=yumme&utm_source=copy_link
+    @handle("jingxuan.douyin", r"jingxuan\.douyin.com/m/[a-z]+/(?P<aweme_id>\d+)")
+    async def _parse_douyin(self, searched: re.Match[str]):
+        aweme_id = searched.group("aweme_id")
+        return await self.parse_aweme(aweme_id)
+
+    async def parse_aweme(self, aweme_id: str):
+        async with AsyncClient(
+            headers=self.headers,
+            timeout=COMMON_TIMEOUT,
+            follow_redirects=True,
+            verify=False,
+        ) as client:
+            response = await client.get(
+                "https://www.douyin.com/aweme/v1/web/aweme/detail/",
+                params={"aweme_id": aweme_id, "aid": "6383"},
+            )
+            if response.status_code != 200:
+                raise ParseException(f"status: {response.status_code}")
+            aweme = decoder.decode(response.content).aweme_detail
+
+        # 作者
+        author = self.create_author(
+            aweme.author.nickname,
+            aweme.author.avatar_thumb.url_list[-1],
+            aweme.author.signature,
+        )
+
+        # 先以部分数据构建结果，后续再填充内容，避免使用临时变量
+        result = self.result(
+            text=aweme.share_info.text,
+            author=author,
+            timestamp=aweme.create_time,
+            url=aweme.share_url.split("?")[0],
+        )
+        if music := aweme.music:
+            if not music.is_original_sound:
+                if music.play_url.uri == "":
+                    extra = json.loads(music.extra)
+                    music_url = extra.get("original_song_url")
+                else:
+                    music_url = music.play_url.uri
+                if music_url:
+                    result.contents.append(
+                        self.create_audio(
+                            url_or_task=music_url,
+                            duration=music.duration,
+                        )
+                    )
+
+        # 添加图片内容
+        if images := aweme.images:
+            for image in images:
+                if image.clip_type == 2 or image.clip_type is None:
+                    result.contents.append(
+                        self.create_image(
+                            url_or_task=image.url_list[-1],
+                        )
+                    )
+                elif image_video := image.video:
+                    result.contents.extend(
+                        [
+                            self.create_image(
+                                url_or_task=image_video.cover.url_list[-1],
+                            ),
+                            self.create_video(url_or_task=image_video.play_addr.url),
+                        ]
+                    )
+        # 添加视频内容
+        elif video := aweme.video:
+            result.video = self.create_video(
+                video.play_addr.url,
+                video.cover_original_scale.url_list[-1] if video.cover_original_scale else video.cover.url_list[-1],
+                video.duration // 1000,
+            )
+
+        return result

nonebot_plugin_parser-2.6.9/src/nonebot_plugin_parser/parsers/douyin/aweme.py

@@ -0,0 +1,82 @@
+from msgspec import Struct, field
+from msgspec.json import Decoder
+
+
+class Addr(Struct):
+    uri: str
+
+    @property
+    def url(self) -> str:
+        return f"https://aweme.snssdk.com/aweme/v1/play/?video_id={self.uri}&ratio=1080p&line=0"
+
+
+class UrlList(Struct):
+    url_list: list[str]
+
+
+class Author(Struct):
+    uid: str
+    nickname: str
+    avatar_thumb: UrlList
+    """头像"""
+    signature: str | None = None
+
+
+class Video(Struct):
+    cover: UrlList
+    duration: int
+    """视频时长(/1000)"""
+    play_addr: Addr
+    cover_original_scale: UrlList | None = None
+
+    @property
+    def url(self) -> str:
+        return self.play_addr.url
+
+
+class Image(Struct):
+    url_list: list[str]
+    uri: str = field(default="")
+    clip_type: int | None = field(default=None)
+    """=2 or None 是普通图片"""
+    video: Video | None = field(default=None)
+    """Live Photo 视频"""
+
+
+class MusicPlayUrl(Struct):
+    uri: str
+
+
+class Music(Struct):
+    duration: int
+    mid: str
+    play_url: MusicPlayUrl
+    extra: str
+    is_original_sound: bool
+
+
+class ShareInfo(Struct):
+    share_desc: str
+    share_desc_info: str
+
+    @property
+    def text(self) -> str:
+        return self.share_desc_info.replace(f"#{self.share_desc}#", "", 1)
+
+
+class Aweme(Struct):
+    aweme_id: str
+    author: Author
+    share_info: ShareInfo
+    create_time: int
+    share_url: str
+    images: list[Image] | None = field(default=None)
+    music: Music | None = field(default=None)
+    video: Video | None = field(default=None)
+
+
+class Response(Struct):
+    aweme_detail: Aweme
+
+
+decoder = Decoder(Response)

nonebot_plugin_parser-2.6.7/src/nonebot_plugin_parser/parsers/douyin/__init__.py

@@ -1,137 +0,0 @@
-import re
-from typing import ClassVar
-
-from httpx import AsyncClient
-from nonebot import logger
-
-from ..base import (
-    COMMON_TIMEOUT,
-    Platform,
-    BaseParser,
-    PlatformEnum,
-    ParseException,
-    handle,
-)
-
-
-class DouyinParser(BaseParser):
-    platform: ClassVar[Platform] = Platform(name=PlatformEnum.DOUYIN, display_name="抖音")
-
-    # https://v.douyin.com/_2ljF4AmKL8
-    @handle("v.douyin", r"v\.douyin\.com/[a-zA-Z0-9_\-]+")
-    @handle("jx.douyin", r"jx\.douyin\.com/[a-zA-Z0-9_\-]+")
-    async def _parse_short_link(self, searched: re.Match[str]):
-        url = f"https://{searched.group(0)}"
-        return await self.parse_with_redirect(url)
-
-    # https://www.douyin.com/video/7521023890996514083
-    # https://www.douyin.com/note/7469411074119322899
-    @handle("douyin", r"douyin\.com/(?P<ty>video|note)/(?P<vid>\d+)")
-    @handle("iesdouyin", r"iesdouyin\.com/share/(?P<ty>slides|video|note)/(?P<vid>\d+)")
-    @handle("m.douyin", r"m\.douyin\.com/share/(?P<ty>slides|video|note)/(?P<vid>\d+)")
-    # https://jingxuan.douyin.com/m/video/7574300896016862490?app=yumme&utm_source=copy_link
-    @handle("jingxuan.douyin", r"jingxuan\.douyin.com/m/(?P<ty>slides|video|note)/(?P<vid>\d+)")
-    async def _parse_douyin(self, searched: re.Match[str]):
-        ty, vid = searched.group("ty"), searched.group("vid")
-        if ty == "slides":
-            return await self.parse_slides(vid)
-
-        for url in (self._build_m_douyin_url(ty, vid), self._build_iesdouyin_url(ty, vid)):
-            try:
-                return await self.parse_video(url)
-            except ParseException as e:
-                logger.warning(f"failed to parse {url}, error: {e}")
-                continue
-        raise ParseException("分享已删除或资源直链提取失败, 请稍后再试")
-
-    @staticmethod
-    def _build_iesdouyin_url(ty: str, vid: str) -> str:
-        return f"https://www.iesdouyin.com/share/{ty}/{vid}"
-
-    @staticmethod
-    def _build_m_douyin_url(ty: str, vid: str) -> str:
-        return f"https://m.douyin.com/share/{ty}/{vid}"
-
-    async def parse_video(self, url: str):
-        from . import video
-
-        async with AsyncClient(
-            headers=self.ios_headers,
-            timeout=COMMON_TIMEOUT,
-            follow_redirects=False,
-            verify=False,
-        ) as client:
-            response = await client.get(url)
-            if response.status_code != 200:
-                raise ParseException(f"status: {response.status_code}")
-            text = response.text
-
-        pattern = re.compile(
-            pattern=r"window\._ROUTER_DATA\s*=\s*(.*?)</script>",
-            flags=re.DOTALL,
-        )
-        matched = pattern.search(text)
-
-        if not matched or not matched.group(1):
-            raise ParseException("can't find _ROUTER_DATA in html")
-
-        video_data = video.decoder.decode(matched.group(1).strip()).video_data
-
-        # 作者
-        author = self.create_author(
-            video_data.author.nickname,
-            video_data.avatar_url,
-        )
-
-        # 先以部分数据构建结果，后续再填充内容，避免使用临时变量
-        result = self.result(
-            title=video_data.desc,
-            author=author,
-            timestamp=video_data.create_time,
-        )
-
-        # 添加图片内容
-        if image_urls := video_data.image_urls:
-            result.contents.extend(self.create_images(image_urls))
-        # 添加视频内容
-        elif video_url := video_data.video_url:
-            result.video = self.create_video(
-                video_url,
-                video_data.cover_url,
-                video_data.duration,
-            )
-
-        return result
-
-    async def parse_slides(self, video_id: str):
-        from . import slides
-
-        url = "https://www.iesdouyin.com/web/api/v2/aweme/slidesinfo/"
-        params = {
-            "aweme_ids": f"[{video_id}]",
-            "request_source": "200",
-        }
-        async with AsyncClient(headers=self.android_headers, verify=False) as client:
-            response = await client.get(url, params=params)
-            response.raise_for_status()
-
-        slides_data = slides.decoder.decode(response.content).aweme_details[0]
-
-        # 作者
-        author = self.create_author(slides_data.name, slides_data.avatar_url)
-
-        # 先以部分数据构建结果，后续再填充内容，避免使用临时变量
-        result = self.result(
-            title=slides_data.desc,
-            author=author,
-            timestamp=slides_data.create_time,
-        )
-
-        # 优先取动图
-        if dynamic_urls := slides_data.dynamic_urls:
-            for dynamic_url in dynamic_urls:
-                result.contents.append(self.create_gif(dynamic_url))
-        elif image_urls := slides_data.image_urls:
-            result.contents.extend(self.create_images(image_urls))
-
-        return result

nonebot_plugin_parser-2.6.7/src/nonebot_plugin_parser/parsers/douyin/slides.py

@@ -1,63 +0,0 @@
-from random import choice
-
-from msgspec import Struct, field
-from msgspec.json import Decoder
-
-
-class PlayAddr(Struct):
-    url_list: list[str]
-
-
-class Cover(Struct):
-    url_list: list[str]
-
-
-class Video(Struct):
-    play_addr: PlayAddr
-    cover: Cover
-    duration: int
-
-
-class Image(Struct):
-    video: Video | None = None
-    url_list: list[str] = field(default_factory=list)
-
-
-class Avatar(Struct):
-    url_list: list[str]
-
-
-class Author(Struct):
-    nickname: str
-    # avatar_larger: Avatar
-    avatar_thumb: Avatar
-
-
-class SlidesData(Struct):
-    author: Author
-    desc: str
-    create_time: int
-    images: list[Image]
-
-    @property
-    def name(self) -> str:
-        return self.author.nickname
-
-    @property
-    def avatar_url(self) -> str:
-        return choice(self.author.avatar_thumb.url_list)
-
-    @property
-    def image_urls(self) -> list[str]:
-        return [choice(image.url_list) for image in self.images]
-
-    @property
-    def dynamic_urls(self) -> list[str]:
-        return [choice(image.video.play_addr.url_list) for image in self.images if image.video]
-
-
-class SlidesInfo(Struct):
-    aweme_details: list[SlidesData] = field(default_factory=list)
-
-
-decoder = Decoder(SlidesInfo)

nonebot_plugin_parser-2.6.7/src/nonebot_plugin_parser/parsers/douyin/video.py

@@ -1,103 +0,0 @@
-from random import choice
-from typing import Any
-
-from msgspec import Struct, field
-from msgspec.json import Decoder
-
-from ..base import ParseException
-
-
-class Avatar(Struct):
-    url_list: list[str]
-
-
-class Author(Struct):
-    nickname: str
-    avatar_thumb: Avatar | None = None
-    avatar_medium: Avatar | None = None
-
-
-class PlayAddr(Struct):
-    url_list: list[str]
-
-
-class Cover(Struct):
-    url_list: list[str]
-
-
-class Video(Struct):
-    play_addr: PlayAddr
-    cover: Cover
-    duration: int
-
-
-class Image(Struct):
-    video: Video | None = None
-    url_list: list[str] = field(default_factory=list)
-
-
-class VideoData(Struct):
-    create_time: int
-    author: Author
-    desc: str
-    images: list[Image] | None = None
-    video: Video | None = None
-
-    @property
-    def image_urls(self) -> list[str]:
-        return [choice(image.url_list) for image in self.images] if self.images else []
-
-    @property
-    def video_url(self) -> str | None:
-        return choice(self.video.play_addr.url_list).replace("playwm", "play") if self.video else None
-
-    @property
-    def cover_url(self) -> str | None:
-        return choice(self.video.cover.url_list) if self.video else None
-
-    @property
-    def duration(self) -> int | None:
-        return self.video.duration // 1000 if self.video else None
-
-    @property
-    def avatar_url(self) -> str | None:
-        if avatar := self.author.avatar_thumb:
-            return choice(avatar.url_list)
-        elif avatar := self.author.avatar_medium:
-            return choice(avatar.url_list)
-        return None
-
-
-class VideoInfoRes(Struct):
-    item_list: list[VideoData] = field(default_factory=list)
-
-    @property
-    def video_data(self) -> VideoData:
-        if len(self.item_list) == 0:
-            raise ParseException("can't find data in videoInfoRes")
-        return choice(self.item_list)
-
-
-class VideoOrNotePage(Struct):
-    video_info_res: VideoInfoRes = field(name="videoInfoRes", default_factory=VideoInfoRes)
-
-
-class LoaderData(Struct):
-    video_page: VideoOrNotePage | None = field(name="video_(id)/page", default=None)
-    note_page: VideoOrNotePage | None = field(name="note_(id)/page", default=None)
-
-
-class RouterData(Struct):
-    loader_data: LoaderData = field(name="loaderData", default_factory=LoaderData)
-    errors: dict[str, Any] | None = None
-
-    @property
-    def video_data(self) -> VideoData:
-        if page := self.loader_data.video_page:
-            return page.video_info_res.video_data
-        elif page := self.loader_data.note_page:
-            return page.video_info_res.video_data
-        raise ParseException("can't find video_(id)/page or note_(id)/page in router data")
-
-
-decoder = Decoder(RouterData)