parsehub 2.0.26__tar.gz → 2.0.28__tar.gz

{parsehub-2.0.26/src/parsehub.egg-info → parsehub-2.0.28}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: parsehub
-Version: 2.0.26
+Version: 2.0.28
 Summary: 轻量、异步、开箱即用的社交媒体聚合解析库
 Author-email: 梓澪 <zilingmio@gmail.com>
 License: MIT

{parsehub-2.0.26 → parsehub-2.0.28}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "parsehub"
-version = "2.0.26"
+version = "2.0.28"
 description = "轻量、异步、开箱即用的社交媒体聚合解析库"
 readme = "README.md"
 requires-python = ">=3.12.0"

{parsehub-2.0.26 → parsehub-2.0.28}/src/parsehub/parsers/parser/douyin.py

@@ -12,6 +12,7 @@ from ...types import (
     LivePhotoRef,
     MultimediaParseResult,
     ParseError,
+    ParseResult,
     Platform,
     VideoParseResult,
     VideoRef,
@@ -57,13 +58,13 @@ class DouyinParser(BaseParser):
     @staticmethod
     def _build_image_result(result: "DouyinApiResult") -> ImageParseResult:
         """构建图片解析结果"""
-        return ImageParseResult(
+        return DouyinImageParseResult(
             title=result.desc,
             photo=result.image_list,
         )
 
 
-class DouyinVideoParseResult(VideoParseResult):
+class DouyinParseResult(ParseResult):
     async def _do_download(
         self,
         *,
@@ -87,6 +88,12 @@ class DouyinVideoParseResult(VideoParseResult):
         )
 
 
+class DouyinVideoParseResult(DouyinParseResult, VideoParseResult): ...
+
+
+class DouyinImageParseResult(DouyinParseResult, ImageParseResult): ...
+
+
 def remove_video_watermark(url: str) -> str:
     """移除抖音视频水印标识 (playwm -> play)"""
     return url.replace("playwm", "play")

{parsehub-2.0.26 → parsehub-2.0.28}/src/parsehub/provider_api/twitter.py

@@ -29,14 +29,13 @@ class Twitter:
             "authorization": self.authorization,
             "content-type": "application/json",
             "user-agent": GlobalConfig.ua,
-            "x-guest-token": await self.get_guest_token(url),
             "x-twitter-active-user": "yes",
             "x-twitter-client-language": "zh-cn",
         }
 
         cookie = None
         if self.cookie and self.check_cookie():
-            headers["x-csrf-token"] = self.cookie.get("ct0")
+            headers["x-csrf-token"] = self.cookie.get("ct0", "")
             cookie = self.cookie
 
         params = {
@@ -158,15 +157,6 @@ class Twitter:
             raise ValueError(f"Invalid tweet url: {url}")
         return match[1]
 
-    async def get_guest_token(self, url: str):
-        async with httpx.AsyncClient(proxy=self.proxy) as client:
-            response = await client.post(url)
-            response.raise_for_status()
-        guest_token = re.search(r'cookie="gt=(\d+);', response.text)
-        if not guest_token:
-            raise Exception("error -5: 获取 guest_token 失败")
-        return guest_token[1]
-
     def check_cookie(self) -> bool:
         if not self.cookie:
             return False

{parsehub-2.0.26 → parsehub-2.0.28/src/parsehub.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: parsehub
-Version: 2.0.26
+Version: 2.0.28
 Summary: 轻量、异步、开箱即用的社交媒体聚合解析库
 Author-email: 梓澪 <zilingmio@gmail.com>
 License: MIT