Skip to content

Commit e9f8dbb

Browse files
committed
Initiate _progress at download and upload commands if they need
1 parent 732f75a commit e9f8dbb

1 file changed

Lines changed: 10 additions & 2 deletions

File tree

baidupcs_py/app/app.py

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
from baidupcs_py.baidupcs.inner import PcsRapidUploadInfo
2222
from baidupcs_py.app.account import Account, AccountManager
2323
from baidupcs_py.commands.env import ACCOUNT_DATA_PATH, RAPIDUPLOADINFO_PATH
24-
from baidupcs_py.common.progress_bar import _progress
24+
from baidupcs_py.common.progress_bar import _progress, init_progress_bar
2525
from baidupcs_py.common.path import join_path
2626
from baidupcs_py.common.net import random_avail_port
2727
from baidupcs_py.common.io import EncryptType
@@ -126,7 +126,6 @@ def wrap(*args, **kwargs):
126126
console = Console()
127127
console.print_exception()
128128

129-
_teardown()
130129
except Exception as err:
131130
_exit_progress_bar()
132131

@@ -137,6 +136,8 @@ def wrap(*args, **kwargs):
137136
console = Console()
138137
console.print_exception()
139138

139+
finally:
140+
_exit_progress_bar()
140141
_teardown()
141142

142143
return wrap
@@ -1034,6 +1035,9 @@ def download(
10341035
else:
10351036
encrypt_password = encrypt_password or _encrypt_password(ctx)
10361037

1038+
if not quiet:
1039+
init_progress_bar()
1040+
10371041
_download(
10381042
api,
10391043
remotepaths,
@@ -1240,6 +1244,10 @@ def upload(
12401244
user_id, user_name = _recent_user_id_and_name(ctx)
12411245

12421246
from_to_list = from_tos(localpaths, remotedir)
1247+
1248+
if not no_show_progress:
1249+
init_progress_bar()
1250+
12431251
_upload(
12441252
api,
12451253
from_to_list,

0 commit comments

Comments
 (0)