nonebot-plugin-parser 2.6.8__tar.gz → 2.6.10__tar.gz

{nonebot_plugin_parser-2.6.8 → nonebot_plugin_parser-2.6.10}/PKG-INFO

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

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

{nonebot_plugin_parser-2.6.8 → nonebot_plugin_parser-2.6.10}/pyproject.toml.orig

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

{nonebot_plugin_parser-2.6.8 → nonebot_plugin_parser-2.6.10}/src/nonebot_plugin_parser/download/__init__.py

@@ -7,7 +7,7 @@ import aiofiles
 import curl_cffi
 from nonebot import logger, get_driver
 
-from .rich import progress_bar, add_progress_task
+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
@@ -61,15 +61,14 @@ class StreamDownloader:
             response.raise_for_status()
             content_length = self._validate_content_length(response)
 
-            with progress_bar:
-                update_progress = add_progress_task(
-                    f"httpx | {file_path.name}",
-                    content_length,
-                )
-                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))
+            update_progress = add_progress_task(
+                f"httpx | {file_path.name}",
+                content_length,
+            )
+            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
 
@@ -90,15 +89,14 @@ class StreamDownloader:
             response.raise_for_status()
             content_length = self._validate_content_length(response)
 
-            with progress_bar:
-                update_progress = add_progress_task(
-                    f"curl_cffi | {file_path.name}",
-                    content_length,
-                )
-                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))
+            update_progress = add_progress_task(
+                f"curl_cffi | {file_path.name}",
+                content_length,
+            )
+            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
 
@@ -220,14 +218,13 @@ class StreamDownloader:
         video_path = pconfig.cache_dir / video_name
 
         try:
-            with progress_bar:
-                async with aiofiles.open(video_path, "wb") as f:
-                    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))
+            async with aiofiles.open(video_path, "wb") as f:
+                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.8 → nonebot_plugin_parser-2.6.10}/src/nonebot_plugin_parser/download/rich.py

@@ -23,3 +23,18 @@ def add_progress_task(
     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.8 → nonebot_plugin_parser-2.6.10}/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,
@@ -35,6 +41,7 @@ class BilibiliParser(BaseParser):
     platform: ClassVar[Platform] = Platform(name=PlatformEnum.BILIBILI, display_name="哔哩哔哩")
 
     def __init__(self):
+        super().__init__()
         self.headers = HEADERS.copy()
         self._credential: Credential | None = None
         self._cookies_file = pconfig.config_dir / "bilibili_cookies.json"
@@ -353,18 +360,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.8 → nonebot_plugin_parser-2.6.10}/src/nonebot_plugin_parser/parsers/douyin/__init__.py

@@ -74,20 +74,6 @@ class DouyinParser(BaseParser):
             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:
@@ -107,6 +93,20 @@ class DouyinParser(BaseParser):
                             self.create_video(url_or_task=image_video.play_addr.url),
                         ]
                     )
+            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,
+                            )
+                        )
         # 添加视频内容
         elif video := aweme.video:
             result.video = self.create_video(

{nonebot_plugin_parser-2.6.8 → nonebot_plugin_parser-2.6.10}/src/nonebot_plugin_parser/parsers/twitter.py

@@ -57,6 +57,10 @@ decoder = Decoder(VxTwitterResponse)
 class TwitterParser(BaseParser):
     platform: ClassVar[Platform] = Platform(name=PlatformEnum.TWITTER, display_name="小蓝鸟")
 
+    def __init__(self):
+        super().__init__()
+        self.headers = {"User-Agent": "python-httpx/0.28.1"}
+
     @handle("x.com", r"x.com/[0-9-a-zA-Z_]{1,20}/status/([0-9]+)")
     async def _parse(self, searched: re.Match[str]) -> ParseResult:
         url = f"https://{searched.group(0)}"