parsehub 2.0.1__tar.gz → 2.0.3__tar.gz

{parsehub-2.0.1/src/parsehub.egg-info → parsehub-2.0.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: parsehub
-Version: 2.0.1
+Version: 2.0.3
 Summary: 轻量、异步、开箱即用的社交媒体聚合解析库
 Author-email: 梓澪 <zilingmio@gmail.com>
 License: MIT
@@ -125,26 +125,21 @@ print(result)
 
 ```python
 from parsehub import ParseHub
-from parsehub.config import ParseConfig
 
-config = ParseConfig(
-    cookie="key1=value1; key2=value2",  # 从浏览器中获取
-    proxy="http://127.0.0.1:7890",  # 可选
-)
-ph = ParseHub(config=config)
+ph = ParseHub(cookie="key1=value1; key2=value2", proxy="http://127.0.0.1:7890",)
 ```
 
 Cookie 支持多种格式传入：
 
 ```python
 # 字符串
-ParseConfig(cookie="key1=value1; key2=value2")
+ParseHub(cookie="key1=value1; key2=value2")
 
 # JSON 字符串
-ParseConfig(cookie='{"key1": "value1", "key2": "value2"}')
+ParseHub(cookie='{"key1": "value1", "key2": "value2"}')
 
 # 字典
-ParseConfig(cookie={"key1": "value1", "key2": "value2"})
+ParseHub(cookie={"key1": "value1", "key2": "value2"})
 ```
 
 目前支持 Cookie 登录的平台:
@@ -158,9 +153,6 @@ from parsehub.config import GlobalConfig
 
 # 自定义默认下载目录
 GlobalConfig.default_save_dir = "./my_downloads"
-
-# 视频时长限制 (超过此时长将下载最低画质，0 为不限制)
-GlobalConfig.duration_limit = 600  # 秒
 ```
 
 ## 🤝 参考项目

{parsehub-2.0.1 → parsehub-2.0.3}/README.md

@@ -88,26 +88,21 @@ print(result)
 
 ```python
 from parsehub import ParseHub
-from parsehub.config import ParseConfig
 
-config = ParseConfig(
-    cookie="key1=value1; key2=value2",  # 从浏览器中获取
-    proxy="http://127.0.0.1:7890",  # 可选
-)
-ph = ParseHub(config=config)
+ph = ParseHub(cookie="key1=value1; key2=value2", proxy="http://127.0.0.1:7890",)
 ```
 
 Cookie 支持多种格式传入：
 
 ```python
 # 字符串
-ParseConfig(cookie="key1=value1; key2=value2")
+ParseHub(cookie="key1=value1; key2=value2")
 
 # JSON 字符串
-ParseConfig(cookie='{"key1": "value1", "key2": "value2"}')
+ParseHub(cookie='{"key1": "value1", "key2": "value2"}')
 
 # 字典
-ParseConfig(cookie={"key1": "value1", "key2": "value2"})
+ParseHub(cookie={"key1": "value1", "key2": "value2"})
 ```
 
 目前支持 Cookie 登录的平台:
@@ -121,9 +116,6 @@ from parsehub.config import GlobalConfig
 
 # 自定义默认下载目录
 GlobalConfig.default_save_dir = "./my_downloads"
-
-# 视频时长限制 (超过此时长将下载最低画质，0 为不限制)
-GlobalConfig.duration_limit = 600  # 秒
 ```
 
 ## 🤝 参考项目

{parsehub-2.0.1 → parsehub-2.0.3}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "parsehub"
-version = "2.0.1"
+version = "2.0.3"
 description = "轻量、异步、开箱即用的社交媒体聚合解析库"
 readme = "README.md"
 requires-python = ">=3.12.0"
@@ -52,9 +52,7 @@ Issues = "https://github.com/z-mio/parsehub/issues"
 
 [tool.ruff]
 line-length = 120
-exclude = [
-    "test",
-]
+
 [tool.ruff.lint]
 select = [
     "E", # pycodestyle 错误检查

{parsehub-2.0.1 → parsehub-2.0.3}/src/parsehub/__init__.py

@@ -2,7 +2,6 @@ from pathlib import Path
 
 from loguru import logger
 
-from .config.config import ParseConfig
 from .errors import ParseError, UnknownPlatform
 from .parsers.base import BaseParser
 from .types import Platform
@@ -14,31 +13,37 @@ logger.disable(__name__)
 
 
 class ParseHub:
-    def __init__(self, config: ParseConfig = None):
-        """初始化解析器"""
-        self.config = config
+    def __init__(self):
         self.parsers: list[type[BaseParser]] = BaseParser.get_registry()
 
-    async def parse(self, url: str) -> AnyParseResult:
+    async def parse(self, url: str, *, proxy: str | None = None, cookie: str | dict | None = None) -> AnyParseResult:
         """解析
         :param url: 分享文案 / 分享链接
+        :param proxy: 代理
+        :param cookie: cookie
+        :return: AnyParseResult
         """
         parser = self.get_parser(url)
-        p = parser(config=self.config)
+        if not parser:
+            raise UnknownPlatform(url)
+        p = parser(proxy=proxy, cookie=cookie)
         return await p.parse(url)
 
-    def parse_sync(self, url: str) -> AnyParseResult:
+    def parse_sync(self, url: str, *, proxy: str | None = None, cookie: str | dict | None = None) -> AnyParseResult:
         """
         同步解析
         :param url: 分享文案 / 分享链接
+        :param proxy: 代理
+        :param cookie: cookie
         :return: AnyParseResult
         """
-        return get_event_loop().run_until_complete(self.parse(url))
+        return get_event_loop().run_until_complete(self.parse(url, proxy=proxy, cookie=cookie))
 
     async def download(
         self,
         url: str,
         path: str | Path = None,
+        *,
         callback: ProgressCallback = None,
         callback_args: tuple = (),
         proxy: str | None = None,
@@ -63,13 +68,13 @@ class ParseHub:
                 - ``count``: 计数进度，用于多文件下载时报告已完成/总文件数
         """
         result = await self.parse(url)
-        return await result.download(path, callback, callback_args, proxy)
+        return await result.download(path, callback=callback, callback_args=callback_args, proxy=proxy)
 
     def download_sync(
         self,
         url: str,
-        path: str | Path = None,
-        callback: ProgressCallback = None,
+        path: str | Path | None = None,
+        callback: ProgressCallback | None = None,
         callback_args: tuple = (),
         proxy: str | None = None,
     ) -> DownloadResult:
@@ -93,34 +98,46 @@ class ParseHub:
                 - ``bytes``: 字节进度，用于单文件下载时报告已下载/总字节数
                 - ``count``: 计数进度，用于多文件下载时报告已完成/总文件数
         """
-        return get_event_loop().run_until_complete(self.download(url, path, callback, callback_args, proxy))
+        return get_event_loop().run_until_complete(
+            self.download(url, path, callback=callback, callback_args=callback_args, proxy=proxy)
+        )
 
-    async def get_raw_url(self, url: str) -> str:
-        """获取原始链接"""
+    async def get_raw_url(self, url: str, proxy: str | None = None) -> str:
+        """获取原始链接
+        :param url: 分享文案 / 分享链接
+        :param proxy: 代理
+        :return: 原始链接
+        """
         parser = self.get_parser(url)
         try:
-            return await parser(config=self.config).get_raw_url(url)
+            return await parser(proxy=proxy).get_raw_url(url)
         except Exception as e:
             raise ParseError from e
 
     def _select_parser(self, url: str) -> type[BaseParser] | None:
-        """选择解析器"""
+        """选择解析器
+        :param url: 分享文案 / 分享链接
+        """
         for parser in self.parsers:
             if parser.match(url):
                 return parser
         return None
 
-    def get_parser(self, url) -> type[BaseParser]:
-        """获取解析器"""
+    def get_parser(self, url) -> type[BaseParser] | None:
+        """获取解析器
+        :param url: 分享文案 / 分享链接
+        """
         if parser := self._select_parser(url):
             return parser
-        raise UnknownPlatform(url)
+        return None
 
-    def get_platform(self, url) -> Platform:
-        """获取平台"""
+    def get_platform(self, url) -> Platform | None:
+        """获取平台
+        :param url: 分享文案 / 分享链接
+        """
         if parser := self._select_parser(url):
             return parser.__platform__
-        raise UnknownPlatform(url)
+        return None
 
     def get_platforms(self) -> list[dict]:
         """获取所有解析器的信息

parsehub-2.0.3/src/parsehub/config/__init__.py

@@ -0,0 +1,3 @@
+from .config import GlobalConfig
+
+__all__ = ["GlobalConfig"]

parsehub-2.0.3/src/parsehub/config/config.py

@@ -0,0 +1,20 @@
+import sys
+from pathlib import Path
+
+from pydantic import BaseModel, ConfigDict, HttpUrl
+
+
+class _GlobalConfig(BaseModel):
+    model_config = ConfigDict(validate_assignment=True)
+
+    ua: str = (
+        "Mozilla/5.0 (Windows NT 10.0; Win64; x64) "
+        "AppleWebKit/537.36 (KHTML, like Gecko) Chrome/144.0.0.0 Safari/537.36"
+    )
+    douyin_api: HttpUrl = "https://douyin.wtf/"
+    """抖音解析API, 建议自行部署: https://github.com/Evil0ctal/Douyin_TikTok_Download_API"""
+    default_save_dir: Path = Path(sys.argv[0]).parent / "downloads"
+    """默认下载目录"""
+
+
+GlobalConfig = _GlobalConfig()

{parsehub-2.0.1 → parsehub-2.0.3}/src/parsehub/parsers/base/base.py

@@ -7,31 +7,30 @@ from urllib.parse import parse_qs, urlencode, urlparse
 import httpx
 
 from ... import parsers
-from ...config.config import GlobalConfig, ParseConfig
+from ...config.config import GlobalConfig
 from ...types import AnyParseResult, ParseError
 from ...types.platform import Platform
-from ...utils.utils import match_url
+from ...utils.utils import match_url, normalize_cookie
 
 
 class BaseParser(ABC):
     _registry: list[type["BaseParser"]] = []
     _registry_initialized: bool = False
 
-    __platform__: Platform = None
+    __platform__: Platform | None = None
     """平台"""
     __supported_type__: list[str] = []
     """支持的类型, 例如: 图文, 视频, 动态"""
-    __match__: str = None
+    __match__: str | None = None
     """匹配规则"""
     __reserved_parameters__: list[str] = []
     """要保留的参数, 例如翻页. 默认清除全部参数"""
     __redirect_keywords__: list[str] = []
     """如果链接包含其中之一, 则遵循重定向规则"""
 
-    def __init__(self, config: ParseConfig = None):
-        if config is None:
-            config = ParseConfig()
-        self.cfg = config
+    def __init__(self, *, proxy: str | None = None, cookie: str | dict | None = None):
+        self.proxy = proxy
+        self.cookie = normalize_cookie(cookie)
 
     def __init_subclass__(cls, /, register=True, **kwargs):
         super().__init_subclass__(**kwargs)
@@ -84,7 +83,7 @@ class BaseParser(ABC):
         if not url.startswith("http"):
             url = f"https://{url}"
         if any(x in url for x in self.__redirect_keywords__):
-            async with httpx.AsyncClient(proxy=self.cfg.proxy, timeout=30) as client:
+            async with httpx.AsyncClient(proxy=self.proxy, timeout=30) as client:
                 try:
                     r = await client.get(
                         url,

{parsehub-2.0.1 → parsehub-2.0.3}/src/parsehub/parsers/base/ytdlp.py

@@ -6,7 +6,6 @@ from typing import Union
 
 from yt_dlp import YoutubeDL
 
-from ...config.config import GlobalConfig
 from ...types import (
     DownloadError,
     DownloadResult,
@@ -36,13 +35,11 @@ class YtParser(BaseParser, register=False):
 
     async def _do_parse(self, raw_url: str) -> Union["YtVideoParseResult"]:
         video_info = await self._parse(raw_url)
-        _d = {
-            "title": video_info.title,
-            "content": video_info.description,
-            "raw_url": raw_url,
-            "dl": video_info,
-        }
         return YtVideoParseResult(
+            dl=video_info,
+            title=video_info.title,
+            content=video_info.description,
+            raw_url=raw_url,
             video=VideoRef(
                 url=raw_url,
                 thumb_url=video_info.thumbnail,
@@ -50,7 +47,6 @@ class YtParser(BaseParser, register=False):
                 height=video_info.height,
                 duration=video_info.duration,
             ),
-            **_d,
         )
 
     async def _parse(self, url) -> "YtVideoInfo":
@@ -84,8 +80,8 @@ class YtParser(BaseParser, register=False):
 
     def _extract_info(self, url):
         params = self.params.copy()
-        if self.cfg.proxy:
-            params["proxy"] = self.cfg.proxy
+        if self.proxy:
+            params["proxy"] = self.proxy
 
         try:
             with YoutubeDL(params) as ydl:
@@ -115,11 +111,11 @@ class YtParser(BaseParser, register=False):
 class YtVideoParseResult(VideoParseResult):
     def __init__(
         self,
+        dl: "YtVideoInfo",
         title,
         video=None,
         content=None,
         raw_url=None,
-        dl: "YtVideoInfo" = None,
     ):
         """dl: yt-dlp解析结果"""
         self.dl = dl
@@ -129,10 +125,10 @@ class YtVideoParseResult(VideoParseResult):
         self,
         *,
         output_dir: str | Path,
-        callback: ProgressCallback = None,
+        callback: ProgressCallback | None = None,
         callback_args: tuple = (),
         proxy: str | None = None,
-        headers: dict = None,
+        headers: dict | None = None,
     ) -> "DownloadResult":
         paramss = self.dl.paramss.copy()
         if proxy:
@@ -140,9 +136,9 @@ class YtVideoParseResult(VideoParseResult):
 
         paramss["outtmpl"] = f"{output_dir.joinpath('ytdlp_%(id)s')}.%(ext)s"
 
-        if GlobalConfig.duration_limit and self.dl.duration > GlobalConfig.duration_limit:
-            # 视频超过限制时长，获取最低画质
-            paramss["format"] = "worstvideo* + worstaudio / worst"
+        # if GlobalConfig.duration_limit and self.dl.duration > GlobalConfig.duration_limit:
+        #     # 视频超过限制时长，获取最低画质
+        #     paramss["format"] = "worstvideo* + worstaudio / worst"
 
         if callback:
             await callback(0, 1, "count", *callback_args)
@@ -204,8 +200,8 @@ class YtVideoInfo:
     description: str
     thumbnail: str
     url: str
+    paramss: dict
     """Youtube 链接, 非视频下载链接"""
     duration: int = 0
     width: int = 0
     height: int = 0
-    paramss: dict = None

{parsehub-2.0.1 → parsehub-2.0.3}/src/parsehub/parsers/parser/bilibili.py

@@ -78,7 +78,7 @@ class BiliParse(YtParser):
 
     async def is_dynamic(self, url) -> str | None:
         """是动态"""
-        async with httpx.AsyncClient(proxy=self.cfg.proxy) as cli:
+        async with httpx.AsyncClient(proxy=self.proxy) as cli:
             url = str((await cli.get(url, follow_redirects=True, timeout=30)).url)
 
         if re.search(r"\b\d{18,19}\b", url):
@@ -86,17 +86,17 @@ class BiliParse(YtParser):
         return None
 
     async def get_dynamic_info(self, url: str) -> BiliDynamic:
-        async with BiliAPI(proxy=self.cfg.proxy) as bili:
+        async with BiliAPI(proxy=self.proxy) as bili:
             try:
-                dynamic_info = await bili.get_dynamic_info(url, cookie=self.cfg.cookie)
+                dynamic_info = await bili.get_dynamic_info(url, cookie=self.cookie)
             except Exception as e:
                 if "风控" in str(e):
-                    raise ParseError(f"账号风控\n使用的cookie: {cookie_ellipsis(self.cfg.cookie)}") from e
+                    raise ParseError(f"账号风控\n使用的cookie: {cookie_ellipsis(self.cookie)}") from e
                 raise ParseError(str(e)) from e
         return dynamic_info
 
     async def bili_api_parse(self, url) -> Union["BiliVideoParseResult", "ImageParseResult"]:
-        async with BiliAPI(proxy=self.cfg.proxy) as bili:
+        async with BiliAPI(proxy=self.proxy) as bili:
             video_info = await bili.get_video_info(url)
 
             if not (data := video_info.get("data")):
@@ -118,10 +118,11 @@ class BiliParse(YtParser):
                     dimension = page_info["dimension"]
 
             b3, b4 = await bili.get_buvid()
-            if GlobalConfig.duration_limit and duration > GlobalConfig.duration_limit:
-                video_playurl = await bili.get_video_playurl(url, cid, b3, b4, False)
-            else:
-                video_playurl = await bili.get_video_playurl(url, cid, b3, b4)
+            video_playurl = await bili.get_video_playurl(url, cid, b3, b4)
+            # if GlobalConfig.duration_limit and duration > GlobalConfig.duration_limit:
+            #     video_playurl = await bili.get_video_playurl(url, cid, b3, b4, False)
+            # else:
+            #     video_playurl = await bili.get_video_playurl(url, cid, b3, b4)
 
         durl = video_playurl["data"]["durl"][0]
         video_url = self.change_source(durl["backup_url"][0]) if durl.get("backup_url") else durl["url"]
@@ -140,13 +141,10 @@ class BiliParse(YtParser):
 
     async def ytp_parse(self, url) -> Union["YtVideoParseResult"]:
         result = await super()._do_parse(url)
-        _d = {
-            "title": result.title,
-            "raw_url": result.raw_url,
-            "dl": result.dl,
-        }
         return YtVideoParseResult(
-            **_d,
+            title=result.title,
+            raw_url=result.raw_url,
+            dl=result.dl,
             video=result.media,
         )
 
@@ -173,10 +171,10 @@ class BiliVideoParseResult(VideoParseResult):
         self,
         *,
         output_dir: str | Path,
-        callback: ProgressCallback = None,
+        callback: ProgressCallback | None = None,
         callback_args: tuple = (),
         proxy: str | None = None,
-        headers: dict = None,
+        headers: dict | None = None,
     ) -> "DownloadResult":
         headers = {"referer": "https://www.bilibili.com", "User-Agent": GlobalConfig.ua}
         return await super()._do_download(

{parsehub-2.0.1 → parsehub-2.0.3}/src/parsehub/parsers/parser/coolapk.py

@@ -29,7 +29,7 @@ class CoolapkParser(BaseParser):
     ) -> Union["CoolapkImageParseResult", "CoolapkRichTextParseResult", "CoolapkMultimediaParseResult"]:
         raw_url_ = clear_params(raw_url, ["s", "shareKey"])
         try:
-            coolapk = await Coolapk.parse(raw_url, proxy=self.cfg.proxy)
+            coolapk = await Coolapk.parse(raw_url, proxy=self.proxy)
         except Exception as e:
             raise ParseError(str(e)) from e
         media = [AniRef(url=i) if ".gif" in i else ImageRef(url=i) for i in coolapk.imgs]

{parsehub-2.0.1 → parsehub-2.0.3}/src/parsehub/parsers/parser/instagram.py

@@ -59,7 +59,7 @@ class InstagramParser(BaseParser):
             post = await asyncio.wait_for(
                 asyncio.to_thread(
                     MyPost.from_shortcode,
-                    MyInstaloaderContext(self.cfg.proxy, cookie),
+                    MyInstaloaderContext(self.proxy, cookie),
                     shortcode,
                 ),
                 30,
@@ -69,8 +69,8 @@ class InstagramParser(BaseParser):
         except BadResponseException as e:
             match str(e):
                 case "Fetching Post metadata failed.":
-                    if self.cfg.cookie and cookie is None:
-                        return await self._parse(url, shortcode, self.cfg.cookie)
+                    if self.cookie and cookie is None:
+                        return await self._parse(url, shortcode, self.cookie)
                     else:
                         raise ParseError("受限视频无法解析: 你必须年满 18 周岁才能观看这个视频") from e
                 case _:

{parsehub-2.0.1 → parsehub-2.0.3}/src/parsehub/parsers/parser/kuaishou.py

@@ -10,7 +10,7 @@ class KuaiShouParser(BaseParser):
     __redirect_keywords__ = ["v.kuaishou", "/f/"]
 
     async def _do_parse(self, raw_url: str) -> VideoParseResult:
-        ks = KuaiShouAPI(self.cfg.cookie)
+        ks = KuaiShouAPI(self.cookie)
         try:
             result = await ks.get_video_info(raw_url)
         except Exception as e:

{parsehub-2.0.1 → parsehub-2.0.3}/src/parsehub/parsers/parser/pipix.py

@@ -13,7 +13,7 @@ class PipixParser(BaseParser):
 
     async def _do_parse(self, raw_url: str) -> Union["ImageParseResult", "VideoParseResult"]:
         try:
-            ppx = await Pipix(self.cfg.proxy).parse(raw_url)
+            ppx = await Pipix(self.proxy).parse(raw_url)
         except Exception as e:
             raise ParseError("皮皮虾解析失败") from e
 

{parsehub-2.0.1 → parsehub-2.0.3}/src/parsehub/parsers/parser/threads.py

@@ -9,7 +9,7 @@ class ThreadsParser(BaseParser):
     __match__ = r"^(http(s)?://)?.+threads.com/@[\w.]+/post/.*"
 
     async def _do_parse(self, raw_url: str) -> "MultimediaParseResult":
-        post = await ThreadsAPI(proxy=self.cfg.proxy).parse(raw_url)
+        post = await ThreadsAPI(proxy=self.proxy).parse(raw_url)
         media = []
         if post.media:
             pm: list[ThreadsMedia] = post.media if isinstance(post.media, list) else [post.media]

{parsehub-2.0.1 → parsehub-2.0.3}/src/parsehub/parsers/parser/tieba.py

@@ -12,7 +12,7 @@ class TieBaParser(BaseParser):
 
     async def _do_parse(self, raw_url: str) -> Union["ImageParseResult", "VideoParseResult"]:
         try:
-            tb = await TieBa(self.cfg.proxy).parse(raw_url)
+            tb = await TieBa(self.proxy).parse(raw_url)
         except Exception as e:
             raise ParseError("贴吧解析失败") from e
 

{parsehub-2.0.1 → parsehub-2.0.3}/src/parsehub/parsers/parser/twitter.py

@@ -15,7 +15,7 @@ from ..base.base import BaseParser
 class TwitterParser(BaseParser):
     __platform__ = Platform.TWITTER
     __supported_type__ = ["视频", "图文"]
-    __match__ = r"^(http(s)?://)?.+(twitter|x).com/.*/status/\d+"
+    __match__ = r"^(http(s)?://)?.+(twitter|fixupx|x).com/.*/status/\d+"
 
     async def _do_parse(self, raw_url: str) -> "MultimediaParseResult":
         tweet = await self._parse(raw_url)
@@ -26,18 +26,18 @@ class TwitterParser(BaseParser):
         return str(urlunparse(urlparse(url)._replace(netloc="x.com")))
 
     async def _parse(self, url: str):
-        x = Twitter(self.cfg.proxy, cookie=None)
+        x = Twitter(self.proxy, cookie=None)
         try:
             tweet = await x.fetch_tweet(url)
         except Exception as e:
             if any(s in str(e) for s in ("error -2",)):
-                if self.cfg.cookie:
-                    x2 = Twitter(self.cfg.proxy, cookie=self.cfg.cookie)
+                if self.cookie:
+                    x2 = Twitter(self.proxy, cookie=self.cookie)
                     try:
                         tweet = await x2.fetch_tweet(url)
                     except Exception as e2:
                         raise ParseError(
-                            f"Twitter 账号可能已被封禁\n\n使用的Cookie: {cookie_ellipsis(self.cfg.cookie)}"
+                            f"Twitter 账号可能已被封禁\n\n使用的Cookie: {cookie_ellipsis(self.cookie)}"
                         ) from e2
                 else:
                     raise ParseError(str(e)) from e

{parsehub-2.0.1 → parsehub-2.0.3}/src/parsehub/parsers/parser/weibo.py

@@ -20,7 +20,7 @@ class WeiboParser(BaseParser):
     __match__ = r"^(http(s)?://)(m\.|)weibo.(com|cn)/(?!(u/)).+"
 
     async def _do_parse(self, raw_url: str) -> MultimediaParseResult | VideoParseResult | ImageParseResult:
-        weibo = await WeiboAPI(self.cfg.proxy).parse(raw_url)
+        weibo = await WeiboAPI(self.proxy).parse(raw_url)
         data = weibo.data
         text = self.f_text(data.content)
         media = []

{parsehub-2.0.1 → parsehub-2.0.3}/src/parsehub/parsers/parser/weixin.py

@@ -9,7 +9,7 @@ class WXParser(BaseParser):
     __match__ = r"^(http(s)?://)mp.weixin.qq.com/s/.*"
 
     async def _do_parse(self, raw_url: str) -> "RichTextParseResult":
-        wx = await WX.parse(raw_url, self.cfg.proxy)
+        wx = await WX.parse(raw_url, self.proxy)
         return RichTextParseResult(
             title=wx.title,
             media=[ImageRef(url=i) for i in wx.imgs],

{parsehub-2.0.1 → parsehub-2.0.3}/src/parsehub/parsers/parser/xhs.py

@@ -27,7 +27,7 @@ class XHSParser(BaseParser):
 
     async def _do_parse(self, raw_url: str) -> Union["VideoParseResult", "ImageParseResult", "MultimediaParseResult"]:
         raw_url_ = clear_params(raw_url, "xsec_token")
-        xhs = XHSAPI(proxy=self.cfg.proxy)
+        xhs = XHSAPI(proxy=self.proxy)
         result = await xhs.extract(raw_url)
 
         desc = self.hashtag_handler(result.desc)
@@ -63,7 +63,7 @@ class XHSParser(BaseParser):
                 raise ParseError("不支持的类型")
 
     async def get_ext_by_url(self, url: str):
-        async with httpx.AsyncClient(proxy=self.cfg.proxy) as client:
+        async with httpx.AsyncClient(proxy=self.proxy) as client:
             try:
                 response = await client.head(url, follow_redirects=True)
             except Exception:

{parsehub-2.0.1 → parsehub-2.0.3}/src/parsehub/parsers/parser/xiaoheihe.py

@@ -20,7 +20,7 @@ class XiaoHeiHeParser(BaseParser):
     __redirect_keywords__ = ["api.xiaoheihe"]
 
     async def _do_parse(self, raw_url: str) -> AnyParseResult:
-        xhh: XiaoHeiHePost = await XiaoHeiHeAPI(proxy=self.cfg.proxy).parse(raw_url)
+        xhh: XiaoHeiHePost = await XiaoHeiHeAPI(proxy=self.proxy).parse(raw_url)
         media = self.__parse_media(xhh)
         v = {"title": xhh.title, "content": xhh.content, "raw_url": raw_url}
         match xhh.type:

{parsehub-2.0.1 → parsehub-2.0.3}/src/parsehub/parsers/parser/youtube.py

@@ -20,8 +20,8 @@ class YtbParse(YtParser):
             # "subtitlesformat": "ttml", # 字幕格式
             # "subtitleslangs": ["en", "ja", "zh-CN"], # 字幕语言
         }
-        if self.cfg.cookie:
-            sub["cookiefile"] = io.StringIO(self.to_netscape_cookie(self.cfg.cookie, "youtube.com"))
+        if self.cookie:
+            sub["cookiefile"] = io.StringIO(self.to_netscape_cookie(self.cookie, "youtube.com"))
         p = sub | super().params
         return p
 

{parsehub-2.0.1 → parsehub-2.0.3}/src/parsehub/parsers/parser/zuiyou.py

@@ -10,7 +10,7 @@ class ZuiYouParser(BaseParser):
     __reserved_parameters__ = ["pid"]
 
     async def _do_parse(self, raw_url: str) -> MultimediaParseResult:
-        zy = await ZuiYou(self.cfg.proxy).parse(raw_url)
+        zy = await ZuiYou(self.proxy).parse(raw_url)
         return MultimediaParseResult(
             content=zy.content,
             media=[