p115client 0.0.5.12.3__py3-none-any.whl → 0.0.5.13__py3-none-any.whl

p115client/tool/life.py

@@ -19,6 +19,7 @@ from iterutils import run_gen_step_iter, with_iter_next, Yield
 from p115client import check_response, P115Client
 
 
+# 115 生活操作事件，默认在迭代时会被忽略的一些事件（都是一些浏览而不是改动的操作）
 IGNORE_BEHAVIOR_TYPES: Final = frozenset((3, 4, 7, 8, 9, 10, 19))
 #: 115 生活操作事件名称到类型的映射
 BEHAVIOR_NAME_TO_TYPE: Final = {
@@ -181,6 +182,7 @@ def iter_life_behavior_once(
     from_time: int | float = 0, 
     from_id: int = 0, 
     type: str = "", 
+    ignore_types: None | Container[int] = IGNORE_BEHAVIOR_TYPES, 
     date: str = "", 
     first_batch_size = 0, 
     app: str = "web", 
@@ -196,6 +198,7 @@ def iter_life_behavior_once(
     from_time: int | float = 0, 
     from_id: int = 0, 
     type: str = "", 
+    ignore_types: None | Container[int] = IGNORE_BEHAVIOR_TYPES, 
     date: str = "", 
     first_batch_size = 0, 
     app: str = "web", 
@@ -210,6 +213,7 @@ def iter_life_behavior_once(
     from_time: int | float = 0, 
     from_id: int = 0, 
     type: str = "", 
+    ignore_types: None | Container[int] = IGNORE_BEHAVIOR_TYPES, 
     date: str = "", 
     first_batch_size = 0, 
     app: str = "web", 
@@ -229,6 +233,7 @@ def iter_life_behavior_once(
     :param from_time: 开始时间（含），若为 0 则从当前时间开始，若小于 0 则从最早开始
     :param from_id: 开始的事件 id （不含）
     :param type: 指定拉取的操作事件名称，若不指定则是全部
+    :param ignore_types: 一组要被忽略的操作事件类型代码，仅当 `type` 为空时生效
     :param date: 日期，格式为 YYYY-MM-DD，若指定则只拉取这一天的数据
     :param first_batch_size: 首批的拉取数目
     :param app: 使用某个 app （设备）的接口
@@ -262,7 +267,8 @@ def iter_life_behavior_once(
                     return
                 fid = event["file_id"]
                 if fid not in seen:
-                    yield Yield(event)
+                    if type or not ignore_types or event["type"] not in ignore_types:
+                        yield Yield(event)
                     seen_add(fid)
             offset += len(events)
             if offset >= int(resp["data"]["count"]):

p115client/tool/upload.py

@@ -34,6 +34,7 @@ from p115client._upload import (
     oss_multipart_part_iter, oss_multipart_upload_init, 
     oss_multipart_upload_url, oss_multipart_upload_complete, 
 )
+from p115pickcode import to_id
 from urlopen import urlopen
 from yarl import URL
 
@@ -45,12 +46,13 @@ from .util import determine_part_size
 ALIYUN_DOMAIN = "oss-cn-shenzhen.aliyuncs.com"
 
 
+# TODO: 支持 open 接口
 @overload
 def iter_115_to_115(
     from_client: P115Client, 
     to_client: P115Client, 
-    from_cid: int = 0, 
-    to_pid: int = 0, 
+    from_cid: int | str = 0, 
+    to_pid: int | str = 0, 
     max_workers: int = 8, 
     with_root: bool = True, 
     use_iter_files: bool = False, 
@@ -63,8 +65,8 @@ def iter_115_to_115(
 def iter_115_to_115(
     from_client: P115Client, 
     to_client: P115Client, 
-    from_cid: int = 0, 
-    to_pid: int = 0, 
+    from_cid: int | str = 0, 
+    to_pid: int | str = 0, 
     max_workers: int = 8, 
     with_root: bool = True, 
     use_iter_files: bool = False, 
@@ -76,8 +78,8 @@ def iter_115_to_115(
 def iter_115_to_115(
     from_client: P115Client, 
     to_client: P115Client, 
-    from_cid: int = 0, 
-    to_pid: int = 0, 
+    from_cid: int | str = 0, 
+    to_pid: int | str = 0, 
     max_workers: int = 8, 
     with_root: bool = True, 
     use_iter_files: bool = False, 
@@ -88,8 +90,8 @@ def iter_115_to_115(
 
     :param from_client: 来源 115 客户端对象
     :param to_client: 去向 115 客户端对象
-    :param from_cid: 来源 115 的目录 id
-    :param to_pid: 去向 115 的父目录 id
+    :param from_cid: 来源 115 的目录 id 或 pickcode
+    :param to_pid: 去向 115 的父目录 id 或 pickcode
     :param max_workers: 最大并发数
     :param with_root: 是否保留 `from_cid` 对应的目录名（如果为 False，则会少 1 级目录）
     :param use_iter_files: 如果为 True，则调用 iter_files_with_path，否则调用 iter_download_files
@@ -98,6 +100,8 @@ def iter_115_to_115(
 
     :return: 迭代器，产生转移结果，有 3 种类型："good"、"fail" 和 "skip"
     """
+    from_cid = to_id(from_cid)
+    to_pid = to_id(to_pid)
     @as_gen_step
     def upload(attr: dict, pid: int, /):
         @as_gen_step
@@ -218,12 +222,13 @@ def iter_115_to_115(
 
 
 # TODO: 支持一次性把所有文件找完，也支持慢慢处理（可能会风控）
+# TODO: 支持 open 接口
 @overload
 def iter_115_to_115_resume(
     from_client: P115Client, 
     to_client: P115Client, 
-    from_cid: int = 0, 
-    to_pid: int = 0, 
+    from_cid: int | str = 0, 
+    to_pid: int | str = 0, 
     max_workers: int = 8, 
     with_root: bool = True, 
     *, 
@@ -235,8 +240,8 @@ def iter_115_to_115_resume(
 def iter_115_to_115_resume(
     from_client: P115Client, 
     to_client: P115Client, 
-    from_cid: int = 0, 
-    to_pid: int = 0, 
+    from_cid: int | str = 0, 
+    to_pid: int | str = 0, 
     max_workers: int = 8, 
     with_root: bool = True, 
     *, 
@@ -247,8 +252,8 @@ def iter_115_to_115_resume(
 def iter_115_to_115_resume(
     from_client: P115Client, 
     to_client: P115Client, 
-    from_cid: int = 0, 
-    to_pid: int = 0, 
+    from_cid: int | str = 0, 
+    to_pid: int | str = 0, 
     max_workers: int = 8, 
     with_root: bool = True, 
     *, 
@@ -259,8 +264,8 @@ def iter_115_to_115_resume(
 
     :param from_client: 来源 115 客户端对象
     :param to_client: 去向 115 客户端对象
-    :param from_cid: 来源 115 的目录 id（文件数最好控制在 100 万以内，太多的话，里面多个子文件夹分别传即可）
-    :param to_pid: 去向 115 的父目录 id
+    :param from_cid: 来源 115 的目录 id 或 pickcode（文件数最好控制在 100 万以内，太多的话，里面多个子文件夹分别传即可）
+    :param to_pid: 去向 115 的父目录 id 或 pickcode
     :param max_workers: 最大并发数
     :param with_root: 是否保留 `from_cid` 对应的目录名（如果为 False，则会少 1 级目录）
     :param async_: 是否异步
@@ -268,6 +273,8 @@ def iter_115_to_115_resume(
 
     :return: 迭代器，产生转移结果，有 3 种类型："good"、"fail" 和 "skip"
     """
+    from_cid = to_id(from_cid)
+    to_pid = to_id(to_pid)
     @as_gen_step
     def upload(attr: dict, pid: int, /):
         @as_gen_step
@@ -463,7 +470,7 @@ def iter_115_to_115_resume(
 def multipart_upload_init(
     client: str | P115Client | P115OpenClient, 
     path: str | PathLike | URL | SupportsGeturl, 
-    pid: int = 0, 
+    pid: int | str = 0, 
     filename: str = "", 
     filesize: int = -1, 
     filesha1: str = "", 
@@ -480,7 +487,7 @@ def multipart_upload_init(
 def multipart_upload_init(
     client: str | P115Client | P115OpenClient, 
     path: str | PathLike | URL | SupportsGeturl, 
-    pid: int = 0, 
+    pid: int | str = 0, 
     filename: str = "", 
     filesize: int = -1, 
     filesha1: str = "", 
@@ -496,7 +503,7 @@ def multipart_upload_init(
 def multipart_upload_init(
     client: str | P115Client | P115OpenClient, 
     path: str | PathLike | URL | SupportsGeturl, 
-    pid: int = 0, 
+    pid: int | str = 0, 
     filename: str = "", 
     filesize: int = -1, 
     filesha1: str = "", 
@@ -512,7 +519,7 @@ def multipart_upload_init(
 
     :param client: 115 客户端或 cookies
     :param path: 路径 或 链接（仅支持 GET 请求，http(s)协议）
-    :param pid: 上传文件到此目录的 id
+    :param pid: 上传文件到此目录的 id 或 pickcode
     :param filename: 文件名，若为空则自动确定
     :param filesize: 文件大小，若为负数则自动计算
     :param filesha1: 文件的 sha1 摘要，若为空则自动计算
@@ -525,6 +532,7 @@ def multipart_upload_init(
 
     :return: 如果秒传成功，则返回响应信息（有 "status" 字段），否则返回上传配置信息（可用于断点续传）
     """
+    pid = to_id(pid)
     if not domain:
         domain = ALIYUN_DOMAIN
     if isinstance(client, str):

p115client/tool/util.py

@@ -3,24 +3,24 @@
 
 __author__ = "ChenyangGao <https://chenyanggao.github.io>"
 __all__ = [
-    "get_status_code", "is_timeouterror", "posix_escape_name", "reduce_image_url_layers", 
-    "share_extract_payload", "unescape_115_charref", "determine_part_size", 
+    "get_status_code", "is_timeouterror", "posix_escape_name", 
+    "reduce_image_url_layers", "share_extract_payload", 
+    "unescape_115_charref", "determine_part_size", 
 ]
 __doc__ = "这个模块提供了一些工具函数"
 
 from re import compile as re_compile
-from typing import cast, Final, TypedDict
-from urllib.parse import urlsplit
+from typing import cast, Final, NotRequired, TypedDict
+from urllib.parse import parse_qsl, urlsplit
 
 
 CRE_115_CHARREF_sub: Final = re_compile("\\[\x02([0-9]+)\\]").sub
-CRE_SHARE_LINK_search1 = re_compile(r"(?:/s/|share\.115\.com/)(?P<share_code>[a-z0-9]+)\?password=(?:(?P<receive_code>[a-z0-9]{4}))?").search
-CRE_SHARE_LINK_search2 = re_compile(r"(?P<share_code>[a-z0-9]+)(?:-(?P<receive_code>[a-z0-9]{4}))?").search
+CRE_SHARE_LINK_search = re_compile(r"(?:^|(?<=/))(?P<share_code>[a-z0-9]+)(?:-|\?|\?password=)(?P<receive_code>[a-z0-9]{4})").search
 
 
 class SharePayload(TypedDict):
     share_code: str
-    receive_code: None | str
+    receive_code: NotRequired[None | str]
 
 
 def get_status_code(e: BaseException, /) -> None | int:
@@ -78,20 +78,23 @@ def reduce_image_url_layers(url: str, /, size: str | int = "") -> str:
 
 def share_extract_payload(link: str, /) -> SharePayload:
     """从链接中提取 share_code 和 receive_code
-
-    .. hint::
-        `link` 支持 3 种形式（圆括号中的字符表示可有可无）：
-
-        1. http(s)://115.com/s/{share_code}?password={receive_code}(#) 或 http(s)://share.115.com/{share_code}?password={receive_code}(#)
-        2. (/){share_code}-{receive_code}(/)
-        3. {share_code}
     """
-    m = CRE_SHARE_LINK_search1(link)
-    if m is None:
-        m = CRE_SHARE_LINK_search2(link)
-    if m is None:
-        raise ValueError("not a valid 115 share link")
-    return cast(SharePayload, m.groupdict())
+    link = link.strip("/")
+    if link.isalnum():
+        return SharePayload(share_code=link)
+    elif m := CRE_SHARE_LINK_search(link):
+        return cast(SharePayload, m.groupdict())
+    urlp = urlsplit(link)
+    if urlp.path:
+        payload = SharePayload(share_code=urlp.path.rstrip("/").rpartition("/")[-1])
+        if urlp.query:
+            for k, v in parse_qsl(urlp.query):
+                if k == "password":
+                    payload["receive_code"] = v
+                    break
+        return payload
+    else:
+        raise ValueError("can't extract share_code for {link!r}")
 
 
 def unescape_115_charref(s: str, /) -> str:

p115client/tool/xys.py

@@ -391,5 +391,4 @@ def wish_aid_iter(
             payload["page"] += 1
     return run_gen_step_iter(gen_step, async_)
 
-
 # TODO: 再实现一个漂流瓶

p115client/type.py

@@ -81,6 +81,10 @@ class P115Cookies(str):
     def cid(self, /) -> str:
         return self.mapping["CID"]
 
+    @cached_property
+    def kid(self, /) -> str:
+        return self.mapping["KID"]
+
     @cached_property
     def seid(self, /) -> str:
         return self.mapping["SEID"]
@@ -113,9 +117,12 @@ class P115Cookies(str):
 
     @cached_property
     def cookies(self, /) -> str:
-        """115 登录的 cookies，包含 UID, CID 和 SEID 这 3 个字段
+        """115 登录的 cookies，包含 UID、CID、KID 和 SEID 这 4 个字段
         """
-        return f"UID={self.uid}; CID={self.cid}; SEID={self.seid}"
+        cookies = f"UID={self.uid}; CID={self.cid}; SEID={self.seid}"
+        if "KID" in self.mapping:
+            cookies += f"; KID={self.mapping['KID']}"
+        return cookies
 
     @classmethod
     def from_cookiejar(cls, cookiejar: CookieJar, /) -> Self:

{p115client-0.0.5.12.3.dist-info → p115client-0.0.5.13.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: p115client
-Version: 0.0.5.12.3
+Version: 0.0.5.13
 Summary: Python 115 webdisk client.
 Home-page: https://github.com/ChenyangGao/p115client
 License: MIT
@@ -29,10 +29,11 @@ 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.1)
 Requires-Dist: posixpatht (>=0.0.3)
 Requires-Dist: python-argtools (>=0.0.1)
-Requires-Dist: python-asynctools (>=0.1.2)
-Requires-Dist: python-concurrenttools (>=0.0.8.2)
+Requires-Dist: python-asynctools (>=0.1.3)
+Requires-Dist: python-concurrenttools (>=0.1.0)
 Requires-Dist: python-cookietools (>=0.0.2.2)
 Requires-Dist: python-dictattr (>=0.0.4)
 Requires-Dist: python-encode_uri (>=0.0.1)
@@ -40,7 +41,7 @@ Requires-Dist: python-filewrap (>=0.2.8)
 Requires-Dist: python-hashtools (>=0.0.3.3)
 Requires-Dist: python-http_request (>=0.0.6)
 Requires-Dist: python-httpfile (>=0.0.5.2)
-Requires-Dist: python-iterutils (>=0.2.4.1)
+Requires-Dist: python-iterutils (>=0.2.5)
 Requires-Dist: python-property (>=0.0.3)
 Requires-Dist: python-startfile (>=0.0.2)
 Requires-Dist: python-undefined (>=0.0.3)

p115client-0.0.5.13.dist-info/RECORD

@@ -0,0 +1,28 @@
+LICENSE,sha256=o5242_N2TgDsWwFhPn7yr8YJNF7XsJM5NxUMtcT97bc,1100
+p115client/__init__.py,sha256=1mx7njuAlqcuEWONTjSiiGnXyyNyqOcJyNX1FMHqQ-4,214
+p115client/_upload.py,sha256=199Hc9B9vUMphDdwh8vK3yCIPusIfeAzzOLpC-WZ8C8,31184
+p115client/client.py,sha256=CSbn1w0yRKTxE_wCq_VmB9FIknM20Zp_SchKXS5dED0,799905
+p115client/const.py,sha256=ZYtBtTFB0eljIR0tze21_52Gl0pQxvyqMmDwgB1bqNU,7803
+p115client/exception.py,sha256=4SZ8ubOLMRxtcqc0u1kNzXqH1a6wwXJFwGnRDURoEgQ,3708
+p115client/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+p115client/tool/__init__.py,sha256=IwwzbCQ7jpRoFGTQUCfGBx8zvjqjgSFs98yKpYyI46s,429
+p115client/tool/attr.py,sha256=G91V71EhsqIIPkhGDnv2z6nxVq7wgl6nNPDj3AKzw1I,3079
+p115client/tool/auth.py,sha256=qlRcfEjzebseiHR2dyBpOoPpxB4k8P6Tj729S2TLB1s,1672
+p115client/tool/download.py,sha256=JGw_AW4qe2Uor9tmbh2ve4wFGhKyO9n26bPG8lsJmpc,64980
+p115client/tool/edit.py,sha256=eAlINrXEAwAwliZFako5vrne_sLmxEyBr1Bk05YZsAc,17332
+p115client/tool/export_dir.py,sha256=jq097N2Crlz4JUFgbqTUZfq8pD3fNjxQOJxDPEMN31I,24491
+p115client/tool/fs_files.py,sha256=3t1R-bDUdIUGwLMZ-GhHMRpYnkYYLcsI3MzFhJzg8g8,15890
+p115client/tool/history.py,sha256=9pgF9l8VvQkpjsVgtIzNcrUQZzLH9tt4JysBwJ4yHsk,11636
+p115client/tool/iterdir.py,sha256=_oYETYMpeSEBW5t6A6RNMs0-owz4IjJEUV5Tw23zOPw,161383
+p115client/tool/life.py,sha256=dfwm5jKfo0K9pIUZKpZ32oPBrlcfrezflSJyyDIbX8E,17721
+p115client/tool/offline.py,sha256=6HaGkbsAAx3FPFvSr_7LZvrUw_fp3QRB2y2kVRHNgZ0,6291
+p115client/tool/pool.py,sha256=PImYG4fU7retZVFDPYib9e87J3RvJvugOW1mxX9jSU0,13831
+p115client/tool/request.py,sha256=rjXuQwRganE5Z-4rfgnyPFjE4jzdQSLdIs9s0cIDshU,7043
+p115client/tool/upload.py,sha256=dpww3TGSOyjqz1EogQEJDiZ9QWERd47izZOw9mNCCiA,32945
+p115client/tool/util.py,sha256=gvA-o-TcEAR3o754Kn82Bu6yggmnAhScUCrRpMVCI50,3934
+p115client/tool/xys.py,sha256=r9wzE5VgpR6ATYHM1uVZ06uIU4qqVeDyRTYU6W_N_Tc,10190
+p115client/type.py,sha256=h_pGKTlz07g64Y_93ylF-fUyC8g-HiQacMhu4KOXjYA,6457
+p115client-0.0.5.13.dist-info/LICENSE,sha256=o5242_N2TgDsWwFhPn7yr8YJNF7XsJM5NxUMtcT97bc,1100
+p115client-0.0.5.13.dist-info/METADATA,sha256=pOvhK7Guy2Pj3uLoq3e8EHWPeBc7RLqts8zENd9Q14k,8226
+p115client-0.0.5.13.dist-info/WHEEL,sha256=Nq82e9rUAnEjt98J6MlVmMCZb-t9cYE2Ir1kpBmnWfs,88
+p115client-0.0.5.13.dist-info/RECORD,,

p115client-0.0.5.12.3.dist-info/RECORD

@@ -1,28 +0,0 @@
-LICENSE,sha256=o5242_N2TgDsWwFhPn7yr8YJNF7XsJM5NxUMtcT97bc,1100
-p115client/__init__.py,sha256=1mx7njuAlqcuEWONTjSiiGnXyyNyqOcJyNX1FMHqQ-4,214
-p115client/_upload.py,sha256=199Hc9B9vUMphDdwh8vK3yCIPusIfeAzzOLpC-WZ8C8,31184
-p115client/client.py,sha256=KEn5zBVTx6qfc6LCA-1zY2CcwJuYqYgXW0TIx-z41i4,796153
-p115client/const.py,sha256=ZYtBtTFB0eljIR0tze21_52Gl0pQxvyqMmDwgB1bqNU,7803
-p115client/exception.py,sha256=4SZ8ubOLMRxtcqc0u1kNzXqH1a6wwXJFwGnRDURoEgQ,3708
-p115client/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-p115client/tool/__init__.py,sha256=IwwzbCQ7jpRoFGTQUCfGBx8zvjqjgSFs98yKpYyI46s,429
-p115client/tool/attr.py,sha256=8szVu_V3_s0DU4oL3wU_XpYBsBzJ3AAHZqX1oCTZlk0,2956
-p115client/tool/auth.py,sha256=qlRcfEjzebseiHR2dyBpOoPpxB4k8P6Tj729S2TLB1s,1672
-p115client/tool/download.py,sha256=_Kp5_AKNAFmBXsUvL0zm8XBkPVlJxC4n4vj6-E0t6BE,61009
-p115client/tool/edit.py,sha256=UCECvHYTy_GGpsaYbaNGtEBT0s5pMD4k1M-s8GG6iFI,17725
-p115client/tool/export_dir.py,sha256=WZAiRFqe984-oXTEgkVhwHi4MTrExVL_tGZIzWCkdL0,24364
-p115client/tool/fs_files.py,sha256=3t1R-bDUdIUGwLMZ-GhHMRpYnkYYLcsI3MzFhJzg8g8,15890
-p115client/tool/history.py,sha256=Hk7W1Qko6P68AoukNc-cYFoGV5XemtZBqWBEm4uKt5c,7416
-p115client/tool/iterdir.py,sha256=t17T5XTCof7ZAbPKAzTAyhpVzfknVsJFb4SK5giXdsI,199635
-p115client/tool/life.py,sha256=Ik8jdFM9_DiT5ivd5h2Hag4ViBVOY5WRCCrmbCqKnMY,17209
-p115client/tool/offline.py,sha256=6HaGkbsAAx3FPFvSr_7LZvrUw_fp3QRB2y2kVRHNgZ0,6291
-p115client/tool/pool.py,sha256=PImYG4fU7retZVFDPYib9e87J3RvJvugOW1mxX9jSU0,13831
-p115client/tool/request.py,sha256=rjXuQwRganE5Z-4rfgnyPFjE4jzdQSLdIs9s0cIDshU,7043
-p115client/tool/upload.py,sha256=z8eD5BAlw6SgWdaJBJ4VtyDMPr8xG3wz6oCxE6xxPTg,32568
-p115client/tool/util.py,sha256=pAa8gc4BcnVTpNcXbNZU4tBUMjSB04DGOpzDdzfbto8,3934
-p115client/tool/xys.py,sha256=Xx8sRh4h4jlowFhRMTDTtOhftgmhevehAU27jMsKh8s,10191
-p115client/type.py,sha256=7kOp98uLaYqcTTCgCrb3DRcl8ukMpn7ibsnVvtw2nG8,6250
-p115client-0.0.5.12.3.dist-info/LICENSE,sha256=o5242_N2TgDsWwFhPn7yr8YJNF7XsJM5NxUMtcT97bc,1100
-p115client-0.0.5.12.3.dist-info/METADATA,sha256=aJFJYIWgaAVDYRNfThXftTSdDHHoqEiSyiCVWQHmbwo,8194
-p115client-0.0.5.12.3.dist-info/WHEEL,sha256=Nq82e9rUAnEjt98J6MlVmMCZb-t9cYE2Ir1kpBmnWfs,88
-p115client-0.0.5.12.3.dist-info/RECORD,,