p115client 0.0.5.14.3__tar.gz → 0.0.5.14.4__tar.gz

{p115client-0.0.5.14.3 → p115client-0.0.5.14.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: p115client
-Version: 0.0.5.14.3
+Version: 0.0.5.14.4
 Summary: Python 115 webdisk client.
 Home-page: https://github.com/ChenyangGao/p115client
 License: MIT
@@ -29,7 +29,7 @@ Requires-Dist: iter_collect (>=0.0.5.1)
 Requires-Dist: multidict
 Requires-Dist: orjson
 Requires-Dist: p115cipher (>=0.0.3)
-Requires-Dist: p115pickcode (>=0.0.4)
+Requires-Dist: p115pickcode (>=0.0.5)
 Requires-Dist: posixpatht (>=0.0.3)
 Requires-Dist: python-argtools (>=0.0.1)
 Requires-Dist: python-asynctools (>=0.1.3)

{p115client-0.0.5.14.3 → p115client-0.0.5.14.4}/p115client/client.py

@@ -693,7 +693,8 @@ def normalize_attr_web[D: dict[str, Any]](
         if "te" in info:
             attr["mtime"] = int(info["te"])
     else:
-        attr["pick_code"] = attr["pickcode"]
+        if "pickcode" in attr:
+            attr["pick_code"] = attr["pickcode"]
         attr["ico"] = info.get("ico", "folder" if is_dir else "")
         if "te" in info:
             attr["mtime"] = attr["user_utime"] = int(info["te"])
@@ -837,7 +838,8 @@ def normalize_attr_app[D: dict[str, Any]](
         if "upt" in info:
             attr["mtime"] = int(info["upt"])
     else:
-        attr["pick_code"] = attr["pickcode"]
+        if "pickcode" in attr:
+            attr["pick_code"] = attr["pickcode"]
         attr["ico"] = info.get("ico", "folder" if attr["is_dir"] else "")
         if "thumb" in info:
             thumb = info["thumb"]
@@ -980,7 +982,8 @@ def normalize_attr_app2[D: dict[str, Any]](
         if "user_ptime" in info:
             attr["mtime"] = int(info["user_ptime"])
     else:
-        attr["pick_code"] = attr["pickcode"]
+        if "pickcode" in attr:
+            attr["pick_code"] = attr["pickcode"]
         if is_dir:
             if "thumb_url" in info:
                 attr["thumb"] = info["thumb_url"]
@@ -1620,7 +1623,7 @@ class ClientRequestMixin:
         api = complete_api("/open/authorize", base_url=base_url)
         payload = {"response_type": "code", **payload}
         def parse(resp, content, /):
-            if resp.status_code == 302:
+            if get_status_code(resp) == 302:
                 return {
                     "state": True, 
                     "url": resp.headers["location"], 
@@ -2290,6 +2293,7 @@ class ClientRequestMixin:
 
         :param app: 扫二维码后绑定的 `app` （或者叫 `device`）
         :param console_qrcode: 在命令行输出二维码，否则在浏览器中打开
+        :param base_url: 接口的基地址
         :param async_: 是否异步
         :param request_kwargs: 其它请求参数
 

{p115client-0.0.5.14.3 → p115client-0.0.5.14.4}/p115client/tool/iterdir.py

@@ -2799,7 +2799,7 @@ def traverse_tree(
     async_: Literal[False, True] = False, 
     **request_kwargs, 
 ) -> Iterator[dict] | AsyncIterator[dict]:
-    """遍历目录树，获取文件信息
+    """遍历目录树，获取文件或目录节点的信息
 
     :param client: 115 客户端或 cookies
     :param cid: 目录 id 或 pickcode
@@ -2809,7 +2809,7 @@ def traverse_tree(
     :param async_: 是否异步
     :param request_kwargs: 其它请求参数
 
-    :return: 迭代器，返回此目录内的（仅文件）文件信息
+    :return: 迭代器，返回此目录内的文件或目录节点的信息
     """
     if isinstance(client, str):
         client = P115Client(client, check_for_relogin=True)
@@ -2896,7 +2896,7 @@ def traverse_tree_with_path(
     async_: Literal[False, True] = False, 
     **request_kwargs, 
 ) -> Iterator[dict] | AsyncIterator[dict]:
-    """遍历目录树，获取文件信息（包含 "path"，可选 "ancestors"）
+    """遍历目录树，获取文件或目录节点的信息（包含 "path"，可选 "ancestors"）
 
     :param client: 115 客户端或 cookies
     :param cid: 目录 id 或 pickcode
@@ -2914,7 +2914,7 @@ def traverse_tree_with_path(
     :param async_: 是否异步
     :param request_kwargs: 其它请求参数
 
-    :return: 迭代器，返回此目录内的（仅文件）文件信息
+    :return: 迭代器，返回此目录内的文件或目录节点的信息
     """
     if isinstance(client, str):
         client = P115Client(client, check_for_relogin=True)

{p115client-0.0.5.14.3 → p115client-0.0.5.14.4}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "p115client"
-version = "0.0.5.14.3"
+version = "0.0.5.14.4"
 description = "Python 115 webdisk client."
 authors = ["ChenyangGao <wosiwujm@gmail.com>"]
 license = "MIT"
@@ -37,7 +37,7 @@ iter_collect = ">=0.0.5.1"
 multidict = "*"
 orjson = "*"
 p115cipher = ">=0.0.3"
-p115pickcode = ">=0.0.4"
+p115pickcode = ">=0.0.5"
 posixpatht = ">=0.0.3"
 python-argtools = ">=0.0.1"
 python-asynctools = ">=0.1.3"