p115client 0.0.5.8.6__tar.gz → 0.0.5.8.7__tar.gz

{p115client-0.0.5.8.6 → p115client-0.0.5.8.7}/PKG-INFO

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

{p115client-0.0.5.8.6 → p115client-0.0.5.8.7}/p115client/client.py

@@ -1022,6 +1022,12 @@ class ClientRequestMixin:
             for cookie in cookies:
                 set_cookie(create_cookie("", cookie))
 
+    @cookies.deleter
+    def cookies(self, /):
+        """请求所用的 Cookies 对象（同步和异步共用）
+        """
+        self.cookies = None
+
     @property
     def cookiejar(self, /) -> CookieJar:
         """请求所用的 CookieJar 对象（同步和异步共用）
@@ -1765,7 +1771,7 @@ class ClientRequestMixin:
     def login_with_open(
         cls, 
         /, 
-        app_id: int | str, 
+        app_id: int | str = 100195993, 
         console_qrcode: bool = True, 
         *, 
         async_: Literal[False] = False, 
@@ -1777,7 +1783,7 @@ class ClientRequestMixin:
     def login_with_open(
         cls, 
         /, 
-        app_id: int | str, 
+        app_id: int | str = 100195993, 
         console_qrcode: bool = True, 
         *, 
         async_: Literal[True], 
@@ -1788,7 +1794,7 @@ class ClientRequestMixin:
     def login_with_open(
         cls, 
         /, 
-        app_id: int | str, 
+        app_id: int | str = 100195993, 
         console_qrcode: bool = True, 
         *, 
         async_: Literal[False, True] = False, 
@@ -2458,7 +2464,7 @@ class P115OpenClient(ClientRequestMixin):
 
     @access_token.setter
     def access_token(self, token, /):
-        self.headers["Authorization"] = "Bearer " + token
+        self.headers["authorization"] = "Bearer " + token
         self.__dict__["access_token"] = token
 
     @property
@@ -2470,6 +2476,11 @@ class P115OpenClient(ClientRequestMixin):
             token = self.__dict__["upload_token"] = resp["data"]
         return token
 
+    @locked_cacheproperty
+    def user_id(self, /) -> int:
+        resp = check_response(self.user_info_open())
+        return int(resp["data"]["user_id"])
+
     @overload
     def refresh_access_token(
         self, 
@@ -4220,11 +4231,20 @@ class P115Client(P115OpenClient):
         if not cookies_equal(cookies_old, cookies_new):
             self._write_cookies(cookies_new)
 
+    @cookies.deleter
+    def cookies(self, /):
+        """请求所用的 Cookies 对象（同步和异步共用）
+        """
+        self.cookies = None
+
     @locked_cacheproperty
     def user_id(self, /) -> int:
         cookie_uid = self.cookies.get("UID")
         if cookie_uid:
             return int(cookie_uid.split("_")[0])
+        elif "authorization" in self.headers:
+            resp = check_response(self.user_info_open())
+            return int(resp["data"]["user_id"])
         else:
             return 0
 
@@ -4914,9 +4934,9 @@ class P115Client(P115OpenClient):
     def login_another_open(
         self, 
         /, 
-        app_id: int | str, 
-        replace: Literal[True] | Self, 
+        app_id: int | str = 100195993, 
         *, 
+        replace: Literal[True] | Self, 
         async_: Literal[False] = False, 
         **request_kwargs, 
     ) -> Self:
@@ -4925,9 +4945,9 @@ class P115Client(P115OpenClient):
     def login_another_open(
         self, 
         /, 
-        app_id: int | str, 
-        replace: Literal[True] | Self, 
+        app_id: int | str = 100195993, 
         *, 
+        replace: Literal[True] | Self, 
         async_: Literal[True], 
         **request_kwargs, 
     ) -> Coroutine[Any, Any, Self]:
@@ -4936,9 +4956,9 @@ class P115Client(P115OpenClient):
     def login_another_open(
         self, 
         /, 
-        app_id: int | str, 
-        replace: Literal[False] = False, 
+        app_id: int | str = 100195993, 
         *, 
+        replace: Literal[False] = False, 
         async_: Literal[False] = False, 
         **request_kwargs, 
     ) -> P115OpenClient:
@@ -4947,9 +4967,9 @@ class P115Client(P115OpenClient):
     def login_another_open(
         self, 
         /, 
-        app_id: int | str, 
-        replace: Literal[False] = False, 
+        app_id: int | str = 100195993, 
         *, 
+        replace: Literal[False] = False, 
         async_: Literal[True], 
         **request_kwargs, 
     ) -> Coroutine[Any, Any, P115OpenClient]:
@@ -4957,9 +4977,9 @@ class P115Client(P115OpenClient):
     def login_another_open(
         self, 
         /, 
-        app_id: int | str, 
-        replace: bool | Self = False, 
+        app_id: int | str = 100195993, 
         *, 
+        replace: bool | Self = False, 
         async_: Literal[False, True] = False, 
         **request_kwargs, 
     ) -> P115OpenClient | Coroutine[Any, Any, P115OpenClient] | Self | Coroutine[Any, Any, Self]:

{p115client-0.0.5.8.6 → p115client-0.0.5.8.7}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "p115client"
-version = "0.0.5.8.6"
+version = "0.0.5.8.7"
 description = "Python 115 webdisk client."
 authors = ["ChenyangGao <wosiwujm@gmail.com>"]
 license = "MIT"