Version 0.7.4

* Add options for mypy
--implicit-optional --allow-redefinition --disable-error-code abstract

* Fix typings

Author: PeterDing

CHANGELOG.md

@@ -1,6 +1,16 @@
 # Changelog
 
-## v0.7.3 - 2022-10-31
+## v0.7.4 - 2022-11-10
+
+### Changed
+
+- 在下载和上传时，让调用者去初始化进度条。
+
+### Updated
+
+- 更新依赖。
+
+## v0.7.3 - 2022-11-09
 
 ### Updated
 

Makefile

@@ -1,5 +1,10 @@
 typecheck:
-	mypy -p baidupcs_py --ignore-missing-imports --warn-unreachable
+	mypy -p baidupcs_py \
+		--ignore-missing-imports \
+		--warn-unreachable \
+		--implicit-optional \
+		--allow-redefinition \
+		--disable-error-code abstract
 
 format-check:
 	black --check .
@@ -10,6 +15,8 @@ format:
 build-pyx:
 	python build.py build_ext --inplace
 
+test: build-pyx
+	pytest -s tests/test_common.py
 
 build: all
 	rm -fr dist

baidupcs_py/__init__.py

@@ -1,3 +1,3 @@
 from baidupcs_py.baidupcs import BaiduPCS, BaiduPCSApi
 
-__version__ = "0.7.3"
+__version__ = "0.7.4"

baidupcs_py/app/account.py

@@ -110,7 +110,7 @@ def cd(self, remotedir: str = "/"):
 
         assert account
 
-        pwd = join_path(account.pwd, remotedir)
+        pwd = join_path(Path(account.pwd), Path(remotedir))
         account = account._replace(pwd=pwd)
         self._accounts[self._who] = account
 

baidupcs_py/commands/log.py

@@ -1,13 +1,17 @@
+from typing import cast
 import os
 from pathlib import Path
 
-from baidupcs_py.common.log import LogLevels, get_logger as _get_logger
+from baidupcs_py.common.log import TLogLevel, LogLevels, get_logger as _get_logger
 from baidupcs_py.commands.env import LOG_LEVEL, LOG_PATH
 
 
 def get_logger(name: str):
     _LOG_PATH = Path(os.getenv("LOG_PATH") or LOG_PATH).expanduser()
-    _LOG_LEVEL = os.getenv("LOG_LEVEL", LOG_LEVEL).upper()
+    _LOG_LEVEL: TLogLevel = cast(
+        TLogLevel,
+        os.getenv("LOG_LEVEL", LOG_LEVEL).upper(),
+    )
     assert _LOG_LEVEL in LogLevels
 
     return _get_logger(name, filename=_LOG_PATH, level=_LOG_LEVEL)

baidupcs_py/commands/rapid_upload.py

@@ -1,5 +1,6 @@
 from typing import Optional, List, Dict, Any
 
+from pathlib import Path
 from threading import Semaphore
 from concurrent.futures import ThreadPoolExecutor, as_completed
 
@@ -176,7 +177,7 @@ def rapid_upload(
         content_crc32 = content_crc32 or 0
         filename = filename or _filename
 
-    remotepath = join_path(remotedir, filename)
+    remotepath = join_path(Path(remotedir), Path(filename))
 
     assert all(
         [slice_md5, content_md5, content_length]

baidupcs_py/commands/server.py

@@ -61,7 +61,7 @@ async def handle_request(
 
     remotepath = remotepath.strip("/")
 
-    _rp = join_path(_root_dir, remotepath)
+    _rp = join_path(Path(_root_dir), Path(remotepath))
 
     # Anti path traversal attack
     if not _rp.startswith(_root_dir):

baidupcs_py/commands/sync.py

@@ -66,12 +66,12 @@ def sync(
     fts: List[FromTo] = []
     check_list: List[Tuple[str, PcsFile]] = []
     all_localpaths = set()
-    for localpath in walk(localdir):
+    for localpath in walk(Path(localdir)):
         path = localpath[len(localdir) + 1 :]
         all_localpaths.add(path)
 
         if path not in all_pcs_files:
-            fts.append(FromTo(localpath, join_path(remotedir, path)))
+            fts.append(FromTo(localpath, join_path(Path(remotedir), Path(path))))
         else:
             check_list.append((localpath, all_pcs_files[path]))
 

baidupcs_py/commands/upload.py

@@ -75,15 +75,15 @@ def from_tos(localpaths: List[str], remotedir: str) -> List[FromTo]:
 
     ft: List[FromTo] = []
     for localpath in localpaths:
-        if not exists(localpath):
+        if not exists(Path(localpath)):
             continue
 
-        if is_file(localpath):
+        if is_file(Path(localpath)):
             remotepath = to_remotepath(os.path.basename(localpath), remotedir)
             ft.append(FromTo(localpath, remotepath))
         else:
             parents_num = max(len(Path(localpath).parts) - 1, 0)
-            for sub_path in walk(localpath):
+            for sub_path in walk(Path(localpath)):
                 relative_path = Path(*Path(sub_path).parts[parents_num:]).as_posix()
                 remotepath = to_remotepath(relative_path, remotedir)
                 ft.append(FromTo(sub_path, remotepath))

baidupcs_py/common/downloader.py

@@ -1,4 +1,4 @@
-from typing import Optional, Any, Callable
+from typing import Optional, List, Any, Callable
 from os import PathLike
 from pathlib import Path
 from threading import Semaphore
@@ -14,6 +14,10 @@
 
 
 class MeDownloader(RangeRequestIO):
+    _executor: ThreadPoolExecutor
+    _semaphore: Semaphore
+    _futures: List[Future]
+
     @classmethod
     def _set_executor(
         cls,