No initiate _progress at here. Let it handle outside

Author: PeterDing

baidupcs_py/commands/download.py

@@ -13,7 +13,11 @@
 from baidupcs_py.common import constant
 from baidupcs_py.common.io import to_decryptio, DecryptIO, READ_SIZE, MAX_CHUNK_SIZE
 from baidupcs_py.common.downloader import MeDownloader
-from baidupcs_py.common.progress_bar import _progress, progress_task_exists
+from baidupcs_py.common.progress_bar import (
+    _progress,
+    init_progress_bar,
+    progress_task_exists,
+)
 from baidupcs_py.commands.sifter import Sifter, sift
 from baidupcs_py.commands.log import get_logger
 from baidupcs_py.commands.display import display_blocked_remotepath
@@ -143,8 +147,7 @@ def _me_download(
 
         task_id: Optional[TaskID] = None
         if not downloadparams.quiet:
-            if not _progress.live._started:
-                _progress.start()
+            init_progress_bar()
             task_id = _progress.add_task("MeDownloader", start=False, title=localpath)
 
         def _wrap_done_callback(fut: Future):

baidupcs_py/commands/upload.py

@@ -339,25 +339,24 @@ def upload_one_by_one(
 ):
     """Upload files one by one with uploading the slices concurrently"""
 
-    with _progress:
-        for from_to in from_to_list:
-            task_id = None
-            if show_progress:
-                task_id = _progress.add_task("upload", start=False, title=from_to.from_)
-            upload_file_concurrently(
-                api,
-                from_to,
-                ondup,
-                max_workers=max_workers,
-                encrypt_password=encrypt_password,
-                encrypt_type=encrypt_type,
-                slice_size=slice_size,
-                ignore_existing=ignore_existing,
-                task_id=task_id,
-                user_id=user_id,
-                user_name=user_name,
-                check_md5=check_md5,
-            )
+    for from_to in from_to_list:
+        task_id = None
+        if show_progress:
+            task_id = _progress.add_task("upload", start=False, title=from_to.from_)
+        upload_file_concurrently(
+            api,
+            from_to,
+            ondup,
+            max_workers=max_workers,
+            encrypt_password=encrypt_password,
+            encrypt_type=encrypt_type,
+            slice_size=slice_size,
+            ignore_existing=ignore_existing,
+            task_id=task_id,
+            user_id=user_id,
+            user_name=user_name,
+            check_md5=check_md5,
+        )
 
     logger.debug("======== Uploading end ========")
 
@@ -570,44 +569,39 @@ def upload_many(
 
     excepts = {}
     semaphore = Semaphore(max_workers)
-    with _progress:
-        with ThreadPoolExecutor(max_workers=max_workers) as executor:
-            futs = {}
-            for idx, from_to in enumerate(from_to_list):
-                semaphore.acquire()
-                task_id = None
-                if show_progress:
-                    task_id = _progress.add_task(
-                        "upload", start=False, title=from_to.from_
-                    )
-
-                logger.debug(
-                    "`upload_many`: Upload: index: %s, task_id: %s", idx, task_id
-                )
+    with ThreadPoolExecutor(max_workers=max_workers) as executor:
+        futs = {}
+        for idx, from_to in enumerate(from_to_list):
+            semaphore.acquire()
+            task_id = None
+            if show_progress:
+                task_id = _progress.add_task("upload", start=False, title=from_to.from_)
 
-                fut = executor.submit(
-                    sure_release,
-                    semaphore,
-                    upload_file,
-                    api,
-                    from_to,
-                    ondup,
-                    encrypt_password=encrypt_password,
-                    encrypt_type=encrypt_type,
-                    slice_size=slice_size,
-                    ignore_existing=ignore_existing,
-                    task_id=task_id,
-                    user_id=user_id,
-                    user_name=user_name,
-                    check_md5=check_md5,
-                )
-                futs[fut] = from_to
+            logger.debug("`upload_many`: Upload: index: %s, task_id: %s", idx, task_id)
+
+            fut = executor.submit(
+                sure_release,
+                semaphore,
+                upload_file,
+                api,
+                from_to,
+                ondup,
+                encrypt_password=encrypt_password,
+                encrypt_type=encrypt_type,
+                slice_size=slice_size,
+                ignore_existing=ignore_existing,
+                task_id=task_id,
+                user_id=user_id,
+                user_name=user_name,
+                check_md5=check_md5,
+            )
+            futs[fut] = from_to
 
-            for fut in as_completed(futs):
-                e = fut.exception()
-                if e is not None:
-                    from_to = futs[fut]
-                    excepts[from_to] = e
+        for fut in as_completed(futs):
+            e = fut.exception()
+            if e is not None:
+                from_to = futs[fut]
+                excepts[from_to] = e
 
     logger.debug("======== Uploading end ========")