parsehub 2.2.2__tar.gz → 2.2.4__tar.gz
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- {parsehub-2.2.2/src/parsehub.egg-info → parsehub-2.2.4}/PKG-INFO +1 -1
- {parsehub-2.2.2 → parsehub-2.2.4}/pyproject.toml +1 -1
- {parsehub-2.2.2 → parsehub-2.2.4}/src/parsehub/__init__.py +2 -0
- {parsehub-2.2.2 → parsehub-2.2.4}/src/parsehub/parsers/parser/xhs.py +14 -0
- {parsehub-2.2.2 → parsehub-2.2.4}/src/parsehub/provider_api/xhs.py +6 -3
- {parsehub-2.2.2 → parsehub-2.2.4/src/parsehub.egg-info}/PKG-INFO +1 -1
- {parsehub-2.2.2 → parsehub-2.2.4}/test/test_core_offline.py +1 -0
- {parsehub-2.2.2 → parsehub-2.2.4}/LICENSE +0 -0
- {parsehub-2.2.2 → parsehub-2.2.4}/README.md +0 -0
- {parsehub-2.2.2 → parsehub-2.2.4}/setup.cfg +0 -0
- {parsehub-2.2.2 → parsehub-2.2.4}/src/__init__.py +0 -0
- {parsehub-2.2.2 → parsehub-2.2.4}/src/parsehub/cli.py +0 -0
- {parsehub-2.2.2 → parsehub-2.2.4}/src/parsehub/cli_config.py +0 -0
- {parsehub-2.2.2 → parsehub-2.2.4}/src/parsehub/config/__init__.py +0 -0
- {parsehub-2.2.2 → parsehub-2.2.4}/src/parsehub/config/config.py +0 -0
- {parsehub-2.2.2 → parsehub-2.2.4}/src/parsehub/errors.py +0 -0
- {parsehub-2.2.2 → parsehub-2.2.4}/src/parsehub/parsers/__init__.py +0 -0
- {parsehub-2.2.2 → parsehub-2.2.4}/src/parsehub/parsers/base/__init__.py +0 -0
- {parsehub-2.2.2 → parsehub-2.2.4}/src/parsehub/parsers/base/base.py +0 -0
- {parsehub-2.2.2 → parsehub-2.2.4}/src/parsehub/parsers/base/ytdlp.py +0 -0
- {parsehub-2.2.2 → parsehub-2.2.4}/src/parsehub/parsers/parser/__init__.py +0 -0
- {parsehub-2.2.2 → parsehub-2.2.4}/src/parsehub/parsers/parser/bilibili.py +0 -0
- {parsehub-2.2.2 → parsehub-2.2.4}/src/parsehub/parsers/parser/coolapk.py +0 -0
- {parsehub-2.2.2 → parsehub-2.2.4}/src/parsehub/parsers/parser/douban.py +0 -0
- {parsehub-2.2.2 → parsehub-2.2.4}/src/parsehub/parsers/parser/douyin.py +0 -0
- {parsehub-2.2.2 → parsehub-2.2.4}/src/parsehub/parsers/parser/facebook.py +0 -0
- {parsehub-2.2.2 → parsehub-2.2.4}/src/parsehub/parsers/parser/instagram.py +0 -0
- {parsehub-2.2.2 → parsehub-2.2.4}/src/parsehub/parsers/parser/kuaishou.py +0 -0
- {parsehub-2.2.2 → parsehub-2.2.4}/src/parsehub/parsers/parser/pipix.py +0 -0
- {parsehub-2.2.2 → parsehub-2.2.4}/src/parsehub/parsers/parser/snapchat.py +0 -0
- {parsehub-2.2.2 → parsehub-2.2.4}/src/parsehub/parsers/parser/threads.py +0 -0
- {parsehub-2.2.2 → parsehub-2.2.4}/src/parsehub/parsers/parser/tieba.py +0 -0
- {parsehub-2.2.2 → parsehub-2.2.4}/src/parsehub/parsers/parser/tiktok.py +0 -0
- {parsehub-2.2.2 → parsehub-2.2.4}/src/parsehub/parsers/parser/twitter.py +0 -0
- {parsehub-2.2.2 → parsehub-2.2.4}/src/parsehub/parsers/parser/weibo.py +0 -0
- {parsehub-2.2.2 → parsehub-2.2.4}/src/parsehub/parsers/parser/weixin.py +0 -0
- {parsehub-2.2.2 → parsehub-2.2.4}/src/parsehub/parsers/parser/xiaoheihe.py +0 -0
- {parsehub-2.2.2 → parsehub-2.2.4}/src/parsehub/parsers/parser/youtube.py +0 -0
- {parsehub-2.2.2 → parsehub-2.2.4}/src/parsehub/parsers/parser/zhihu.py +0 -0
- {parsehub-2.2.2 → parsehub-2.2.4}/src/parsehub/parsers/parser/zuiyou.py +0 -0
- {parsehub-2.2.2 → parsehub-2.2.4}/src/parsehub/provider_api/__init__.py +0 -0
- {parsehub-2.2.2 → parsehub-2.2.4}/src/parsehub/provider_api/bilibili.py +0 -0
- {parsehub-2.2.2 → parsehub-2.2.4}/src/parsehub/provider_api/coolapk.py +0 -0
- {parsehub-2.2.2 → parsehub-2.2.4}/src/parsehub/provider_api/douban.py +0 -0
- {parsehub-2.2.2 → parsehub-2.2.4}/src/parsehub/provider_api/douyin.py +0 -0
- {parsehub-2.2.2 → parsehub-2.2.4}/src/parsehub/provider_api/instagram.py +0 -0
- {parsehub-2.2.2 → parsehub-2.2.4}/src/parsehub/provider_api/kuaishou.py +0 -0
- {parsehub-2.2.2 → parsehub-2.2.4}/src/parsehub/provider_api/pipix.py +0 -0
- {parsehub-2.2.2 → parsehub-2.2.4}/src/parsehub/provider_api/threads.py +0 -0
- {parsehub-2.2.2 → parsehub-2.2.4}/src/parsehub/provider_api/tieba.py +0 -0
- {parsehub-2.2.2 → parsehub-2.2.4}/src/parsehub/provider_api/tiktok.py +0 -0
- {parsehub-2.2.2 → parsehub-2.2.4}/src/parsehub/provider_api/twitter.py +0 -0
- {parsehub-2.2.2 → parsehub-2.2.4}/src/parsehub/provider_api/weibo.py +0 -0
- {parsehub-2.2.2 → parsehub-2.2.4}/src/parsehub/provider_api/weixin.py +0 -0
- {parsehub-2.2.2 → parsehub-2.2.4}/src/parsehub/provider_api/xiaoheihe.py +0 -0
- {parsehub-2.2.2 → parsehub-2.2.4}/src/parsehub/provider_api/zhihu.py +0 -0
- {parsehub-2.2.2 → parsehub-2.2.4}/src/parsehub/provider_api/zuiyou.py +0 -0
- {parsehub-2.2.2 → parsehub-2.2.4}/src/parsehub/types/__init__.py +0 -0
- {parsehub-2.2.2 → parsehub-2.2.4}/src/parsehub/types/callback.py +0 -0
- {parsehub-2.2.2 → parsehub-2.2.4}/src/parsehub/types/media_file.py +0 -0
- {parsehub-2.2.2 → parsehub-2.2.4}/src/parsehub/types/media_ref.py +0 -0
- {parsehub-2.2.2 → parsehub-2.2.4}/src/parsehub/types/platform.py +0 -0
- {parsehub-2.2.2 → parsehub-2.2.4}/src/parsehub/types/post.py +0 -0
- {parsehub-2.2.2 → parsehub-2.2.4}/src/parsehub/types/result.py +0 -0
- {parsehub-2.2.2 → parsehub-2.2.4}/src/parsehub/utils/downloader.py +0 -0
- {parsehub-2.2.2 → parsehub-2.2.4}/src/parsehub/utils/helpers.py +0 -0
- {parsehub-2.2.2 → parsehub-2.2.4}/src/parsehub/utils/media_info.py +0 -0
- {parsehub-2.2.2 → parsehub-2.2.4}/src/parsehub.egg-info/SOURCES.txt +0 -0
- {parsehub-2.2.2 → parsehub-2.2.4}/src/parsehub.egg-info/dependency_links.txt +0 -0
- {parsehub-2.2.2 → parsehub-2.2.4}/src/parsehub.egg-info/entry_points.txt +0 -0
- {parsehub-2.2.2 → parsehub-2.2.4}/src/parsehub.egg-info/requires.txt +0 -0
- {parsehub-2.2.2 → parsehub-2.2.4}/src/parsehub.egg-info/top_level.txt +0 -0
- {parsehub-2.2.2 → parsehub-2.2.4}/test/test_cli.py +0 -0
- {parsehub-2.2.2 → parsehub-2.2.4}/test/test_cli_config.py +0 -0
- {parsehub-2.2.2 → parsehub-2.2.4}/test/test_downloader.py +0 -0
|
@@ -14,6 +14,7 @@ from ...types import (
|
|
|
14
14
|
VideoParseResult,
|
|
15
15
|
VideoRef,
|
|
16
16
|
)
|
|
17
|
+
from ...utils.helpers import UA
|
|
17
18
|
from ..base import BaseParser
|
|
18
19
|
|
|
19
20
|
|
|
@@ -24,6 +25,19 @@ class XHSParser(BaseParser):
|
|
|
24
25
|
__redirect_keywords__ = ["xhslink"]
|
|
25
26
|
__after_clean_parameters__ = ["xsec_token"]
|
|
26
27
|
|
|
28
|
+
async def get_raw_url(self, url: str, *, clean_all: bool = False, headers: dict | None = None) -> str:
|
|
29
|
+
headers = {
|
|
30
|
+
"User-Agent": UA,
|
|
31
|
+
"accept": "text/html,application/xhtml+xml,application/xml;q=0.9,image/avif,image/webp,image/apng,"
|
|
32
|
+
"*/*;q=0.8,application/signed-exchange;v=b3;q=0.7",
|
|
33
|
+
}
|
|
34
|
+
url = await super().get_raw_url(url, clean_all=clean_all, headers=headers)
|
|
35
|
+
if "/login" in url:
|
|
36
|
+
raise ParseError("该帖子需要登录后查看")
|
|
37
|
+
elif "/404" in url:
|
|
38
|
+
raise ParseError("帖子不存在")
|
|
39
|
+
return url
|
|
40
|
+
|
|
27
41
|
async def _do_parse(self, raw_url: str) -> Union["VideoParseResult", "ImageParseResult", "MultimediaParseResult"]:
|
|
28
42
|
xhs = XHSAPI(proxy=self.proxy, cookie=self.cookie.get_value())
|
|
29
43
|
result = await xhs.extract(raw_url)
|
|
@@ -10,9 +10,8 @@ from typing import Any, cast
|
|
|
10
10
|
import httpx
|
|
11
11
|
from bs4 import BeautifulSoup
|
|
12
12
|
|
|
13
|
-
from parsehub.utils.helpers import UA
|
|
14
|
-
|
|
15
13
|
from ..errors import ParseError
|
|
14
|
+
from ..utils.helpers import UA
|
|
16
15
|
|
|
17
16
|
|
|
18
17
|
class XHSAPI:
|
|
@@ -24,7 +23,11 @@ class XHSAPI:
|
|
|
24
23
|
async with httpx.AsyncClient(proxy=self.proxy, cookies=self.cookie, follow_redirects=True) as client:
|
|
25
24
|
result = await client.get(
|
|
26
25
|
url,
|
|
27
|
-
headers={
|
|
26
|
+
headers={
|
|
27
|
+
"User-Agent": UA,
|
|
28
|
+
"accept": "text/html,application/xhtml+xml,application/xml;q=0.9,image/avif,image/webp"
|
|
29
|
+
",image/apng,*/*;q=0.8,application/signed-exchange;v=b3;q=0.7",
|
|
30
|
+
},
|
|
28
31
|
timeout=30,
|
|
29
32
|
)
|
|
30
33
|
if "/login" in str(result.url):
|
|
@@ -660,6 +660,7 @@ class TestPlatformUrlMatching(unittest.TestCase):
|
|
|
660
660
|
"https://www.zhihu.com/question/2057559076813510452",
|
|
661
661
|
"https://zhuanlan.zhihu.com/p/1989096494578558904",
|
|
662
662
|
"https://www.zhihu.com/question/597674895/answer/3004370705",
|
|
663
|
+
"https://daily.zhihu.com/story/9792555",
|
|
663
664
|
],
|
|
664
665
|
}
|
|
665
666
|
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|