p115client 0.0.5.9.1__py3-none-any.whl → 0.0.5.9.3__py3-none-any.whl

p115client/client.py

@@ -5427,7 +5427,7 @@ class P115Client(P115OpenClient):
                 headers["cookie"] = self.cookies_str
             for i in count(0):
                 try:
-                    if need_fetch_cert_first is None:
+                    if fetch_cert_headers is None:
                         if is_open_api:
                             cert: str = headers["authorization"]
                         else:

p115client/tool/pool.py

@@ -6,12 +6,12 @@ from __future__ import annotations
 __author__ = "ChenyangGao <https://chenyanggao.github.io>"
 __all__ = [
     "generate_auth_factory", "generate_cookies_factory", "generate_client_factory", 
-    "auth_pool", "cookies_pool", "client_pool", "call_wrap_with_pool", 
+    "make_pool", "auth_pool", "cookies_pool", "client_pool", "call_wrap_with_pool", 
 ]
 __doc__ = "这个模块提供了一些和 cookies 池有关的函数"
 
 from asyncio import Lock as AsyncLock
-from collections.abc import Callable, Iterable
+from collections.abc import Callable, Iterable, Mapping
 from functools import partial, total_ordering, update_wrapper
 from heapq import heappop, heappush, heapify
 from itertools import cycle, repeat
@@ -365,23 +365,33 @@ def call_wrap_with_pool(get_cert_headers: Callable, /, func: Callable) -> Callab
     :param get_cert_headers: 获取认证信息的请求头的函数
     :param func: 执行请求的函数
     """
-    def wrapper(*args, headers=None, async_: bool = False, **kwds):
+    def wrapper(
+        *args, 
+        headers: None | Mapping = None, 
+        async_: bool = False, 
+        **kwds, 
+    ):
         def gen_step():
             nonlocal headers
             while True:
                 if async_:
-                    cert_headers, revert = yield get_cert_headers(async_=True)
+                    cert, revert = yield get_cert_headers(async_=True)
                 else:
-                    cert_headers, revert = get_cert_headers()
-                if headers:
-                    headers = dict(headers, **cert_headers)
-                else:
-                    headers = cert_headers
+                    cert, revert = get_cert_headers()
                 try:
-                    if async_:
-                        resp = yield func(*args, headers=headers, async_=True, **kwds)
+                    if isinstance(cert, Mapping):
+                        if headers:
+                            headers = dict(headers, **cert)
+                        else:
+                            headers = cert
+                        if async_:
+                            resp = yield func(*args, headers=headers, async_=True, **kwds)
+                        else:
+                            resp = func(*args, headers=headers, **kwds)
+                    elif async_:
+                        resp = yield func(cert, *args, headers=headers, async_=True, **kwds)
                     else:
-                        resp = func(*args, headers=headers, **kwds)
+                        resp = func(cert, *args, headers=headers, **kwds)
                     if not isinstance(resp, dict) or resp.get("errno") != 40101004:
                         revert()
                     return resp

{p115client-0.0.5.9.1.dist-info → p115client-0.0.5.9.3.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: p115client
-Version: 0.0.5.9.1
+Version: 0.0.5.9.3
 Summary: Python 115 webdisk client.
 Home-page: https://github.com/ChenyangGao/p115client
 License: MIT

{p115client-0.0.5.9.1.dist-info → p115client-0.0.5.9.3.dist-info}/RECORD

@@ -1,7 +1,7 @@
 LICENSE,sha256=o5242_N2TgDsWwFhPn7yr8YJNF7XsJM5NxUMtcT97bc,1100
 p115client/__init__.py,sha256=1mx7njuAlqcuEWONTjSiiGnXyyNyqOcJyNX1FMHqQ-4,214
 p115client/_upload.py,sha256=DOckFLU_P7Fl0BNu_0-2od6pPsCnzroYY6zZE5_EMnM,30735
-p115client/client.py,sha256=XsOy9BVOqu2jof7rGIMUldVZSiuQNAku379kIiZPr-E,721350
+p115client/client.py,sha256=SMKSwnUdsiW1ARZQkvJm-echoCiRhf365UmmOaa4cog,721347
 p115client/const.py,sha256=maIZfJAiUuEnXIKc8TMAyW_UboDUJPwYpPS8LjPFp_U,4321
 p115client/exception.py,sha256=Ugjr__aSlYRDYwoOz7273ngV-gFX2z-ohsJmCba8nnQ,2657
 p115client/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -13,12 +13,12 @@ p115client/tool/fs_files.py,sha256=hkezLKrtTAGPDkPxwq6jMrm8s2-unHZQBR7cDvh41qs,1
 p115client/tool/history.py,sha256=2S26BH7uBNfVHlbYFNy-aNOLMcM-HrlR7TLHAZacUJI,7458
 p115client/tool/iterdir.py,sha256=T6bsD8A896nHgVxKYu2dkIo-5Az2svL4iLm2uHQWyHg,187517
 p115client/tool/life.py,sha256=9ncoB2dNibhgOjPb9mHr873fCZmb65ZeteVLH4Tsujc,17330
-p115client/tool/pool.py,sha256=_3eFHTHW5Bhs17AwF8awitE4n1UuvFGIkZUZ-saJ7zQ,14233
+p115client/tool/pool.py,sha256=eT_feALidGdvSFppivxC1f_ipR42fWav-X1sutdpkco,14608
 p115client/tool/request.py,sha256=SWsezW9EYZGS3R-TbZxMG-8bN3YWJ0-GzgvKlvRBSCM,7042
 p115client/tool/upload.py,sha256=qK1OQYxP-Faq2eMDhc5sBXJiSr8m8EZ_gb0O_iA2TrI,15915
 p115client/tool/xys.py,sha256=n89n9OLBXx6t20L61wJgfrP6V4jW3sHgyaQNBLdUwUQ,3578
 p115client/type.py,sha256=e4g9URQBE23XN2dGomldj8wC6NlDWBBSVC5Bmd8giBc,5993
-p115client-0.0.5.9.1.dist-info/LICENSE,sha256=o5242_N2TgDsWwFhPn7yr8YJNF7XsJM5NxUMtcT97bc,1100
-p115client-0.0.5.9.1.dist-info/METADATA,sha256=_NxUFNOa5O4B2Ek-NsKRlEFhR-sWQ5OUZT8G2Xe1nFY,8233
-p115client-0.0.5.9.1.dist-info/WHEEL,sha256=Nq82e9rUAnEjt98J6MlVmMCZb-t9cYE2Ir1kpBmnWfs,88
-p115client-0.0.5.9.1.dist-info/RECORD,,
+p115client-0.0.5.9.3.dist-info/LICENSE,sha256=o5242_N2TgDsWwFhPn7yr8YJNF7XsJM5NxUMtcT97bc,1100
+p115client-0.0.5.9.3.dist-info/METADATA,sha256=RbAiZhKxVWP0ZGX2gkMQgjYvuJsqzFy-Po66W_Wwd6Q,8233
+p115client-0.0.5.9.3.dist-info/WHEEL,sha256=Nq82e9rUAnEjt98J6MlVmMCZb-t9cYE2Ir1kpBmnWfs,88
+p115client-0.0.5.9.3.dist-info/RECORD,,